Updated folder structure.
Merge branch 'v2.1-wip1'