Removing namespace Class, adding class ClassBuilder