Revert "Revert "Libraries""

This reverts commit 962ce47b25c6c7ec175ff1706baf35812dfa8ea0.