renamed main classes to respective type