decouple class_builder and object_builder

decouple class_builder and object_builder