Renamed controllers
Some renaming. Removed old methods
Continuing to refactor client side