[kookamamie]

Fully agreed. The modules are an afterthought, and inevitably lead to a mess where we have both modules and includes all over the place.