Revert "Moved libraries"

This reverts commit 6f31ccc27dc9d3fd461e251183629c7f61da2e99.