Moved jython specific modules to subdirectory
Tidied up string quoting
Tidied up string quoting
Tidied up string quoting