refactor lib 2
Revert "refactor lib 2"

This reverts commit 5c798cb37a66b35ec1c98207c3f3442334253479.