Renamed main class and stuff