Renamed some classes to more logical stuff