Missing class CarrierModule
Fixing classes stored in wrong files