Converted all non-nested classes in Entity