Refactors app structure - wip