Version 4.0 built from master.
Modified directory structure.