cleaned app structure