Switch some objects from class to struct