[DEV] start rework Lib