Re-added libraries, but now in the proper place.