More code tidy before mass Java refactoring
File reorganisation, with a bit more code tidy
Tidied up makefile, should now run.
Makefile being weird