Module restructuring; breaks all wrapper scripts

Requires less module path mangling.  It's not needed to run
any services anymore.  It's only needed for running the
tests.