Split functionality into two classes
Renamed class files