Fix app structure