Renamed main class & file