Move the admin part into its own controller
Adjust the unit-tests for the split of the admin controller