Renamed classes for a more logical name structure