Change to new app structure
Merge pull request #1 from zquintana/master

Update app structure