renammed more files to match class names