reorganized app structure