Rearanged classes. yes, again