changing structure and client, specs for client
fixing merge conflicts