#246: reorgnise the app structure and put the admin back