Complete revision of the project with an engine which is designed to use components.  Each system is attached to the engine as a component.