Reconfigure module structure to allow for multiple modules which reference each other