changed the app structure