Simplified sorting of module files
Use ModuleFiles to clean module directory