Finish page added
Refactoring of controllers and services to separate files