Refactor/app structure