Renamed main class, fixed some settings