Use current directory names

* Use new style directory names.
* Update composer.json