cleanup in the angular, seperating the controllers.
Merging with angularcleanup