[^] updated app structure