Merge "Allow creation of SCL modules to folders that are also module names"