Started core restructuring for module support