Version 4.0 built from master.
Modified directory structure.
Merge v1 to v2.
Modified directory structure.
Modified directory structure.
Merge branch 'v2' into v3