Removed multiple module loading
Renamed controllers