More refactoring

Java doesn't seem to find json lib now... Worked before switching to
JEE.