Moved json package, removed unnecessary classes
(avoid class name conflicts)