Now using FXML - code is so much better! - but still not feature complete (relative to last commit). Reorganized structure in two packages.