rename files and classes to mach