switch to new style of client library folder layout