Pull module out of RC

This isn't ready for RC yet, waiting for the build to get some cleanup.