Cleanup and rename modules to better reflect their usage and to
conform to standard naming conventions.