Merge pull request #46 from loqi/ngFileStruct

(cleanup) resolves more merge conflicts
(edit) adds new file structure
(edit) reflects latest progress
(edit) edits files lint free
Merge pull request #47 from gitSauced/dev2

(edits) latest revisions to files
(cleanup) cleans up index.html and fixes semicolon errors in JS files