Added ability to map file names to module names