Adding angular.js and modifying the structure to controllers architecture
merge