removed old client layer; engine renamed to client