Cleaned up classes and started Json

Signed-off-by: jeffrey <jr926@drexel.edu>