Fix directory structure.
Update to 1.5.2.