changed app structure