Reshuffle app structure
Merge pull request #5 from pretenders/carles/dev

Reshuffle app structure