Removed "unnecassary" from all class and file names.