fix app structure