rename hub package sockets
move from Json to JSON
various cleanup