Placed classes on the correct packages and refactored some code.
Added a class to aid in the creation of the json output of multiple rows (CDA-like output)