changed to new app structure