Fix the broken JSON tests
Refactore into various Maven packages. Got rid of Ant