structure modules better

[caitp]

I don't like the idea of wrapping each individual module, and concatenating wrapped modules. T'is a silly thing.

A better packaging routine is needed here.