Moved everything referenced from >= 2 modules to the domain module. Build no longer broken