Revert "Revert "two libs""

This reverts commit c31b5e7da4e6e7f40b45615907fd6e1e7e56e51a.