Tighten up spacing in module templates
Allow folders in module name