No Url()s in json and some restructuring.