Moved files
Updated routes
Removed some controllers and set via map