added new folder structure
Merge branch 'r/0.1'