Renamed classes and organized code.