Refactory the controllers and the folders related in the view
Merge pull request #14 from jarmstrng/r_refactor_controllers

Refactory the controllers and the folders related in the view