Remove JavaFX controller class
Organize a hierarchy