Cleanup
Restructure for AngularJS
Restructure
Changes
The fuck have I done