Allow modules to be in subdirectories.

And complain when the module name is wrong.