Update to Build Dev

Refactored the controller
Moving services controllers and filters to unique files .js