Module name in source files, #373.
Module filenames, cleaned up sources, #373.