Add empty folders to scaffolding
Merge branch 'dev'