Refactoring done for javafx package