Renamed controllers and some refactoring

Some of the dependencies fixing and renaming