Removed /admin, refactoring

Moved things out of /admin folder-  caused problems with header links.