diff --git a/core/modules/tour/css/joyride-2.0.3.css b/core/assets/vendor/jquery-joyride/joyride-2.0.3.css
similarity index 100%
rename from core/modules/tour/css/joyride-2.0.3.css
rename to core/assets/vendor/jquery-joyride/joyride-2.0.3.css
diff --git a/core/modules/tour/js/jquery.joyride-2.0.3.js b/core/assets/vendor/jquery-joyride/jquery.joyride-2.0.3.js
similarity index 100%
rename from core/modules/tour/js/jquery.joyride-2.0.3.js
rename to core/assets/vendor/jquery-joyride/jquery.joyride-2.0.3.js
diff --git a/core/modules/picture/picturefill/picturefill.js b/core/assets/vendor/picturefill/picturefill.js
similarity index 100%
rename from core/modules/picture/picturefill/picturefill.js
rename to core/assets/vendor/picturefill/picturefill.js
diff --git a/core/core.libraries.yml b/core/core.libraries.yml
index bb76de0..7b9ff78 100644
--- a/core/core.libraries.yml
+++ b/core/core.libraries.yml
@@ -324,6 +324,18 @@ jquery.intrinsic:
   dependencies:
     - core/jquery
 
+jquery.joyride:
+  remote: https://github.com/zurb/joyride
+  version: v2.0.3
+  js:
+    assets/vendor/jquery-joyride/jquery.joyride-2.0.3.js: {}
+  css:
+    component:
+      assets/vendor/jquery-joyride/joyride-2.0.3.css: { media: screen }
+  dependencies:
+    - core/jquery
+    - core/jquery.cookie
+
 jquery.once:
   remote: https://github.com/RobLoach/jquery-once
   version: 1.2.3
@@ -670,6 +682,16 @@ normalize:
     base:
       assets/vendor/normalize-css/normalize.css: { every_page: true, weight: -20 }
 
+picturefill:
+  remote: https://github.com/scottjehl/picturefill
+  # @todo Contribute upstream and/or replace with upstream version.
+  # @see https://drupal.org/node/1775530
+  version: VERSION
+  js:
+    assets/vendor/picturefill/picturefill.js: { weight: -10 }
+  dependencies:
+    - core/matchmedia
+
 underscore:
   remote: https://github.com/jashkenas/underscore
   version: 1.5.2
diff --git a/core/modules/picture/lib/Drupal/picture/Plugin/Field/FieldFormatter/PictureFormatter.php b/core/modules/picture/lib/Drupal/picture/Plugin/Field/FieldFormatter/PictureFormatter.php
index eb1864d..403cf52 100644
--- a/core/modules/picture/lib/Drupal/picture/Plugin/Field/FieldFormatter/PictureFormatter.php
+++ b/core/modules/picture/lib/Drupal/picture/Plugin/Field/FieldFormatter/PictureFormatter.php
@@ -172,7 +172,7 @@ public function viewElements(FieldItemListInterface $items) {
       $elements[$delta] = array(
         '#theme' => 'picture_formatter',
         '#attached' => array('library' => array(
-          array('picture', 'picturefill'),
+          array('core', 'picturefill'),
         )),
         '#item' => $item,
         '#image_style' => $fallback_image_style,
diff --git a/core/modules/picture/picture.libraries.yml b/core/modules/picture/picture.libraries.yml
deleted file mode 100644
index 695fae7..0000000
--- a/core/modules/picture/picture.libraries.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# @todo Move into /core/assets and core.library.yml.
-picturefill:
-  remote: https://github.com/scottjehl/picturefill
-  # @todo Contribute upstream and/or replace with upstream version.
-  # @see https://drupal.org/node/1775530
-  version: VERSION
-  js:
-    picturefill/picturefill.js: { weight: -10 }
-  dependencies:
-    - core/matchmedia
diff --git a/core/modules/tour/tour.libraries.yml b/core/modules/tour/tour.libraries.yml
index 92dd861..9df894c 100644
--- a/core/modules/tour/tour.libraries.yml
+++ b/core/modules/tour/tour.libraries.yml
@@ -6,7 +6,7 @@ tour:
     - core/jquery
     - core/drupal
     - core/backbone
-    - tour/jquery.joyride
+    - core/jquery.joyride
     - tour/tour-styling
 
 tour-styling:
@@ -14,16 +14,3 @@ tour-styling:
   css:
     component:
       css/tour.module.css: { media: screen }
-
-# @todo Move into /core/assets and core.library.yml.
-jquery.joyride:
-  remote: https://github.com/zurb/joyride
-  version: v2.0.3
-  js:
-    js/jquery.joyride-2.0.3.js: {}
-  css:
-    component:
-      css/joyride-2.0.3.css: { media: screen }
-  dependencies:
-    - core/jquery
-    - core/jquery.cookie