Reorganize the app structure