Cleanup naming & order in admin controller

no issue

 There seemed to be no convention or order to the functions in the admin controller, so I have:
 - organised them
 - reordered them
 - added a small doc-block
 - reordered some routes
 - updated tests accordingly
Merge pull request #2258 from ErisDS/admin-ctrl-cleanup

Cleanup naming & order in admin controller