renamed files to fix compiler errors

Class names didn't match file names