Added JavaClassChooserController and refactored ControlBuilder