#130 - Move some admin controllers

Doing this for @srinivasupadhya. His earlier pull request had some other commits in, by mistake.