Also for version1, cleaned up module definitions and usage by exporting constructor function directly.