Added json dependency to pom.xml. Began refactoring of JSON classes