revert to simple app structure