Rename modules, and re-organize code.