Merge pull request #228 from theponti/feature/category-directive

Feature/category directive
Merge pull request #229 from theponti/master

Merge from master
Create app folder in main dir and move controllers, models, and views into it
Fix tests for new app dir structure
Merge pull request #231 from theponti/refactor/add-app-folder

Create app folder in main dir and move controllers, models, and views in to it