Renamed the module along with some minor cleanups