Template ModuleLoader fix for template folders/packages and files/names with dashes, which of course make invalid import statements. They are now replaced reliably with underscores.