New working folder structure
Merge branch 'master' into new-folder-structure