Cleaning up relationships, adding ModuleGroups
Adding controls for modules