Renamed a few files and classes