Refactor packages and add simple json support based on Jaxb