Re org

Pushing to master - admin section completed as first pass