Some renaming and moving of the shuck client
client works fine
client works fine
improved error handling