rearrage test/client/lib dir