Changed folder structure
Working on structure of admin section
Merge branch 'master' into gh-pages