#21 Moved general code to project Jfx