Added Reformatted Class Names and new builder classes for constructing the objects