Revert "Libraries and Data"

This reverts commit fcdcc6596505c3cef53781f39c351af99d96e189.
Revert "Revert "Libraries and Data""

This reverts commit 6996f37dcdad81d5a6a9c2324d32bbae7a1a85ac.