Everything in ModuleCore now!

Removed the crummy structure.