Moved json package to avoid class name conflicts, removed unnecessary classes