arranged entities in new package and rename professionalclasses in settings-classes