better json handling of Website struct in addtion to consistent naming