Refactor directory structure
Fix JS/LESS errors introduced by refactor
Merge branch 'dev' into master