adjusted app structure for testing