Merge pull request #50 from streetlight/master

Fairly large restructure and cleanup
fix for admin