start building the app structure
fixed merge