added basic folder structure
Merge branch 'dev'