REFACTOR: client/libs
DEV
DEV
DEV
DEV
DEV
UPGRADE: for client/lib
UPGRADE: for client/lib