Restructure/repair admin functionality.