Fix modules directory name, clean up comments