Merge pull request #44 from loqi/ngFileStruct

(cleanup) removes MainCtrl.js

changed file structure of public
Merge pull request #45 from loqi/ngFileStruct

(cleanup) resolves merge conflicts
(cleanup) resolves more merge conflicts