Fix structure
Add javafx for test