Moved files in /template to the right places
Merge branch 'master' of https://github.com/whatapigdoes/Bexcellent-Theme