Tinkering. Added 'lib' and moved client.