Included BaseScheme (className/superClassName props) and EndJoint. Refactoring all classes