Done some cleaning
Tried a new way to organize controllers