restucturing app structure