Updated Client Lib layout