- Merge JavaFX changes from Matt's
- re-organise directories (ie., move resources to the correct location)