Refactory the controllers and the folders related in the view

Organize the code