Changes to structure for future expansion, seperation of modules