Refactoring
Rename dir name
Refactoring
Use choicebox instead of textfield
Use ComboBox instead of ChoiceBox
Merge branch 'master' into demonstration