converter to Builder() pattern
converter to Builder() pattern - new files
rename base classes, adjust JNI code to new class names