fixing app structure