Created main class
Renamed classes