Rename modules.
Add implicit argument constructors.