Begin rewriting of module layout

Currently doesn't touch any of the current EMT files except the config
and a single line in the base class to uncomment when testing.