Comment about ModuleManager
Moved some things around, more support for ModuleManager; Todo: fix classnames