Reorganize
to_json added
Finished up