Restructured admin stuff
Merge branch 'admin' of https://github.com/JGScruggs91/test into admin