Refactoring

Refactored
All Controllers
All Views