- cleanups
- Added ModuleManager