diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 4e0c91696cc2d9a2180079ec89e887ab29c50f31..2ea0c7d05be753260fa6a2e6f400c7e8aec325ef 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,7 @@
 
 Libraries 8.x-3.x, xxxx-xx-xx
 -----------------------------
+#2058371 by gordon: Re-port to Drupal 8 (.info.yml, controllers, cache service, ...)
 #1779714 by tstoeckler, klonos: Wrong filepath in README.txt and fix JS testing.
 #1167496 by tstoeckler: Remove leftover libraries.test file.
 #1167496 by tstoeckler, benshell: Port to Drupal 8.
diff --git a/lib/Drupal/libraries/Tests/LibrariesWebTest.php b/lib/Drupal/libraries/Tests/LibrariesWebTest.php
index 95a31a199d4f38ea36e129921f0eb15eab35c2e9..7b837594bf6810ec4b2eed90767de45a46d9c29a 100644
--- a/lib/Drupal/libraries/Tests/LibrariesWebTest.php
+++ b/lib/Drupal/libraries/Tests/LibrariesWebTest.php
@@ -107,11 +107,14 @@ class LibrariesWebTest extends WebTestBase {
    */
   function testLibrariesScanInfoFiles() {
     $expected = array('example_info_file' => (object) array(
-      'uri' => drupal_get_path('module', 'libraries') . '/tests/example/example_info_file.libraries.info',
-      'filename' => 'example_info_file.libraries.info',
-      'name' => 'example_info_file.libraries',
+      'uri' => drupal_get_path('module', 'libraries') . '/tests/example/example_info_file.libraries.info.yml',
+      'filename' => 'example_info_file.libraries.info.yml',
+      'name' => 'example_info_file.libraries.info',
     ));
-    $this->assertEqual(libraries_scan_info_files(), $expected, 'libraries_scan_info_files() correctly finds the example info file.');
+    $actual = libraries_scan_info_files();
+    $this->verbose('Expected:<pre>' . var_export($expected, TRUE) . '</pre>');
+    $this->verbose('Actual:<pre>' . var_export($actual, TRUE) . '</pre>');
+    $this->assertEqual($actual, $expected, 'libraries_scan_info_files() correctly finds the example info file.');
     $this->verbose('<pre>' . var_export(libraries_scan_info_files(), TRUE) . '</pre>');
   }
 
@@ -140,7 +143,7 @@ class LibrariesWebTest extends WebTestBase {
     // Test a library specified with an .info file gets detected.
     $expected = array(
       'name' => 'Example info file',
-      'info file' => drupal_get_path('module', 'libraries_test') . '/example/example_info_file.libraries.info',
+      'info file' => drupal_get_path('module', 'libraries') . '/tests/example/example_info_file.libraries.info.yml',
     );
     libraries_info_defaults($expected, 'example_info_file');
     $library = libraries_info('example_info_file');
@@ -451,7 +454,7 @@ class LibrariesWebTest extends WebTestBase {
     // DOM.
     $html = array(
       'js' => array('<script src="', '"></script>'),
-      'css' => array('@import url("', '");'),
+      'css' => array('<link rel="stylesheet" href="', '" media="all" />'),
       // PHP files do not get added to the DOM directly.
       // @see _libraries_test_load()
       'php' => array('<li>', '</li>'),
@@ -459,7 +462,7 @@ class LibrariesWebTest extends WebTestBase {
 
     foreach ($names as $name => $expected) {
       foreach ($extensions as $extension) {
-        $filepath = drupal_get_path('module', 'libraries_test') . "/example/$name.$extension";
+        $filepath = drupal_get_path('module', 'libraries') . "/tests/example/$name.$extension";
         // JavaScript and CSS files appear as full URLs and with an appended
         // query string.
         if (in_array($extension, array('js', 'css'))) {
@@ -477,5 +480,4 @@ class LibrariesWebTest extends WebTestBase {
       }
     }
   }
-
 }
diff --git a/libraries.info b/libraries.info
deleted file mode 100644
index 1a957104f866afd617836808a41d6be5c71ebe53..0000000000000000000000000000000000000000
--- a/libraries.info
+++ /dev/null
@@ -1,3 +0,0 @@
-name = Libraries
-description = Allows version-dependent and shared usage of external libraries.
-core = 8.x
diff --git a/libraries.info.yml b/libraries.info.yml
new file mode 100644
index 0000000000000000000000000000000000000000..1891a6ffb98379f684acce0c956333e14570a58e
--- /dev/null
+++ b/libraries.info.yml
@@ -0,0 +1,4 @@
+name: Libraries
+type: module
+description: Allows version-dependent and shared usage of external libraries.
+core: 8.x
diff --git a/libraries.install b/libraries.install
deleted file mode 100644
index 9d7dd00787915866d0d52d1bbe9ac28d7dac1082..0000000000000000000000000000000000000000
--- a/libraries.install
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * @file
- * Install, uninstall, and update functions for libraries.module.
- */
-
-/**
- * Implements hook_schema().
- */
-function libraries_schema() {
-  $schema['cache_libraries'] = drupal_get_schema_unprocessed('system', 'cache');
-  $schema['cache_libraries']['description'] = 'Cache table to store library information.';
-  return $schema;
-}
diff --git a/libraries.module b/libraries.module
index c3b291fd6b018d4532b0842fb38d9284b423c359..0e8f5a4697c1def4b3ef68ada17cd0d3e876b66e 100644
--- a/libraries.module
+++ b/libraries.module
@@ -128,7 +128,7 @@ function libraries_scan_info_files() {
   $files = array();
   foreach ($directories as $dir) {
     if (file_exists($dir)) {
-      $files = array_merge($files, file_scan_directory($dir, '@^[a-z0-9._-]+\.libraries\.info$@', array(
+      $files = array_merge($files, file_scan_directory($dir, '@^[a-z0-9._-]+\.libraries\.info\.yml$@', array(
         'key' => 'name',
         'recurse' => FALSE,
       )));
@@ -136,7 +136,7 @@ function libraries_scan_info_files() {
   }
 
   foreach ($files as $filename => $file) {
-    $files[basename($filename, '.libraries')] = $file;
+    $files[basename($filename, '.libraries.info')] = $file;
     unset($files[$filename]);
   }
 
@@ -276,7 +276,7 @@ function libraries_prepare_files(&$library, $version = NULL, $variant = NULL) {
 function libraries_detect_dependencies(&$library, $version = NULL, $variant = NULL) {
   if (isset($library['dependencies'])) {
     foreach ($library['dependencies'] as &$dependency_string) {
-      $dependency_info = drupal_parse_dependency($dependency_string);
+      $dependency_info = libraries_parse_dependency($dependency_string);
       $dependency = libraries_detect($dependency_info['name']);
       if (!$dependency['installed']) {
         $library['installed'] = FALSE;
@@ -683,7 +683,7 @@ function libraries_load_files($library) {
         $data = "$path/$data";
         // Apply the default group if the group isn't explicitly given.
         if (!isset($options['group'])) {
-          $options['group'] = ($type == 'js') ? JS_DEFAULT : CSS_DEFAULT;
+          $options['group'] = ($type == 'js') ? JS_DEFAULT : CSS_AGGREGATE_DEFAULT;
         }
         call_user_func('drupal_add_' . $type, $data, $options);
         $count++;
@@ -753,3 +753,60 @@ function libraries_get_version($library, $options) {
   }
   fclose($file);
 }
+
+/**
+ * Parses a dependency for comparison by drupal_check_incompatibility().
+ *
+ * @param $dependency
+ *   A dependency string, for example 'foo (>=7.x-4.5-beta5, 3.x)'.
+ *
+ * @return
+ *   An associative array with three keys:
+ *   - 'name' includes the name of the thing to depend on (e.g. 'foo').
+ *   - 'original_version' contains the original version string (which can be
+ *     used in the UI for reporting incompatibilities).
+ *   - 'versions' is a list of associative arrays, each containing the keys
+ *     'op' and 'version'. 'op' can be one of: '=', '==', '!=', '<>', '<',
+ *     '<=', '>', or '>='. 'version' is one piece like '4.5-beta3'.
+ *   Callers should pass this structure to drupal_check_incompatibility().
+ *
+ */
+function libraries_parse_dependency($dependency) {
+  // We use named subpatterns and support every op that version_compare
+  // supports. Also, op is optional and defaults to equals.
+  $p_op = '(?P<operation>!=|==|=|<|<=|>|>=|<>)?';
+  // Core version is always optional: 7.x-2.x and 2.x is treated the same.
+  $p_core = '(?:' . preg_quote(DRUPAL_CORE_COMPATIBILITY) . '-)?';
+  $p_major = '(?P<major>\d+)';
+  // By setting the minor version to x, branches can be matched.
+  $p_minor = '(?P<minor>(?:\d+|x)(?:-[A-Za-z]+\d+)?)';
+  $value = array();
+  $parts = explode('(', $dependency, 2);
+  $value['name'] = trim($parts[0]);
+  if (isset($parts[1])) {
+    $value['original_version'] = ' (' . $parts[1];
+    foreach (explode(',', $parts[1]) as $version) {
+      if (preg_match("/^\s*$p_op\s*$p_core$p_major\.$p_minor/", $version, $matches)) {
+        $op = !empty($matches['operation']) ? $matches['operation'] : '=';
+        if ($matches['minor'] == 'x') {
+          // Drupal considers "2.x" to mean any version that begins with
+          // "2" (e.g. 2.0, 2.9 are all "2.x"). PHP's version_compare(),
+          // on the other hand, treats "x" as a string; so to
+          // version_compare(), "2.x" is considered less than 2.0. This
+          // means that >=2.x and <2.x are handled by version_compare()
+          // as we need, but > and <= are not.
+          if ($op == '>' || $op == '<=') {
+            $matches['major']++;
+          }
+          // Equivalence can be checked by adding two restrictions.
+          if ($op == '=' || $op == '==') {
+            $value['versions'][] = array('op' => '<', 'version' => ($matches['major'] + 1) . '.x');
+            $op = '>=';
+          }
+        }
+        $value['versions'][] = array('op' => $op, 'version' => $matches['major'] . '.' . $matches['minor']);
+      }
+    }
+  }
+  return $value;
+}
diff --git a/libraries.services.yml b/libraries.services.yml
new file mode 100644
index 0000000000000000000000000000000000000000..3326cda4ec74f2d5efa9bf5309b9339b734cc3dd
--- /dev/null
+++ b/libraries.services.yml
@@ -0,0 +1,8 @@
+services:
+  cache.libraries:
+    class: Drupal\Core\Cache\CacheBackendInterface
+    tags:
+      - { name: cache.bin }
+    factory_method: get
+    factory_service: cache_factory
+    arguments: [library]
diff --git a/tests/example/example_info_file.libraries.info b/tests/example/example_info_file.libraries.info
deleted file mode 100644
index ec255d4cbd63d111543b030c73a0e458f835ffd7..0000000000000000000000000000000000000000
--- a/tests/example/example_info_file.libraries.info
+++ /dev/null
@@ -1,4 +0,0 @@
-
-; This is an example info file of a library used for testing purposes.
-name = Example info file
-
diff --git a/tests/example/example_info_file.libraries.info.yml b/tests/example/example_info_file.libraries.info.yml
new file mode 100644
index 0000000000000000000000000000000000000000..26086f4c74c60f9a4e1ad614fcf5df96b964f21f
--- /dev/null
+++ b/tests/example/example_info_file.libraries.info.yml
@@ -0,0 +1,4 @@
+
+# This is an example info file of a library used for testing purposes.
+name: Example info file
+
diff --git a/tests/libraries_test.info b/tests/libraries_test.info
deleted file mode 100644
index 0f34b66cb54137ec185b10268bd2904e64022dec..0000000000000000000000000000000000000000
--- a/tests/libraries_test.info
+++ /dev/null
@@ -1,5 +0,0 @@
-name = Libraries test module
-description = Tests library detection and loading.
-core = 8.x
-dependencies[] = libraries
-hidden = TRUE
diff --git a/tests/modules/libraries_test/lib/Drupal/libraries_test/Controller/ExampleController.php b/tests/modules/libraries_test/lib/Drupal/libraries_test/Controller/ExampleController.php
new file mode 100644
index 0000000000000000000000000000000000000000..ca013340e6650006cbf1d8461a84c664ca69b72a
--- /dev/null
+++ b/tests/modules/libraries_test/lib/Drupal/libraries_test/Controller/ExampleController.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * @file
+ * Provides any admin-specific functionality
+ */
+
+namespace Drupal\libraries_test\Controller;
+
+use Drupal\Core\Controller\ControllerInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+class ExampleController implements ControllerInterface {
+  /**
+   * Injects BookManager Service.
+   */
+  public static function create(ContainerInterface $container) {
+    return new static();
+  }
+
+  /**
+   * Loads a specified library (variant) for testing.
+   *
+   * JavaScript and CSS files can be checked directly by SimpleTest, so we only
+   * need to manually check for PHP files. We provide information about the loaded
+   * JavaScript and CSS files for easier debugging. See example/README.txt for
+   * more information.
+   */
+  private function buildPage($library, $variant = NULL) {
+    libraries_load($library, $variant);
+    // JavaScript and CSS files can be checked directly by SimpleTest, so we only
+    // need to manually check for PHP files.
+    $output = '';
+
+    // For easer debugging of JS loading, a text is shown that the JavaScript will
+    // replace.
+    $output .= '<h2>JavaScript</h2>';
+    $output .= '<div class="libraries-test-javascript">';
+    $output .= 'If this text shows up, no JavaScript test file was loaded.';
+    $output .= '</div>';
+
+    // For easier debugging of CSS loading, the loaded CSS files will color the
+    // following text.
+    $output .= '<h2>CSS</h2>';
+    $output .= '<div class="libraries-test-css">';
+    $output .= 'If one of the CSS test files has been loaded, this text will be colored:';
+    $output .= '<ul>';
+    // Do not reference the actual CSS files (i.e. including '.css'), because that
+    // breaks testing.
+    $output .= '<li>example_1: red</li>';
+    $output .= '<li>example_2: green</li>';
+    $output .= '<li>example_3: orange</li>';
+    $output .= '<li>example_4: blue</li>';
+    $output .= '<li>libraries_test: purple</li>';
+    $output .= '</ul>';
+    $output .= '</div>';
+
+    $output .= '<h2>PHP</h2>';
+    $output .= '<div class="libraries-test-php">';
+    $output .= 'The following is a list of all loaded test PHP files:';
+    $output .= '<ul>';
+    $files = get_included_files();
+    foreach ($files as $file) {
+      if ((strpos($file, 'libraries/test') || strpos($file, 'libraries_test')) && !strpos($file, 'libraries_test.module') && !strpos($file, 'lib/Drupal/libraries_test')) {
+        $output .= '<li>' . str_replace(DRUPAL_ROOT . '/', '', $file) . '</li>';
+      }
+    }
+    $output .= '</ul>';
+    $output .= '</div>';
+
+    return $output;
+  }
+
+  public function files() {
+    return $this->buildPage('example_files');
+  }
+
+  public function integration() {
+    return $this->buildPage('example_integration_files');
+  }
+
+  public function versions() {
+    return $this->buildPage('example_versions');
+  }
+
+  public function variant() {
+    return $this->buildPage('example_variant', 'example_variant');
+  }
+
+  public function versionsAndVariants() {
+    return $this->buildPage('example_versions_and_variants', 'example_variant_2');
+  }
+
+  public function cache() {
+    return $this->buildPage('example_callback');
+  }
+}
diff --git a/tests/libraries_test.css b/tests/modules/libraries_test/libraries_test.css
similarity index 100%
rename from tests/libraries_test.css
rename to tests/modules/libraries_test/libraries_test.css
diff --git a/tests/libraries_test.inc b/tests/modules/libraries_test/libraries_test.inc
similarity index 100%
rename from tests/libraries_test.inc
rename to tests/modules/libraries_test/libraries_test.inc
diff --git a/tests/modules/libraries_test/libraries_test.info.yml b/tests/modules/libraries_test/libraries_test.info.yml
new file mode 100644
index 0000000000000000000000000000000000000000..94f35c122b8bae94ef7edc60d65c2d6bf710a723
--- /dev/null
+++ b/tests/modules/libraries_test/libraries_test.info.yml
@@ -0,0 +1,7 @@
+name: Libraries test module
+type: module
+description: Tests library detection and loading.
+core: 8.x
+dependencies:
+  - libraries
+hidden: TRUE
diff --git a/tests/libraries_test.js b/tests/modules/libraries_test/libraries_test.js
similarity index 100%
rename from tests/libraries_test.js
rename to tests/modules/libraries_test/libraries_test.js
diff --git a/tests/libraries_test.module b/tests/modules/libraries_test/libraries_test.module
similarity index 85%
rename from tests/libraries_test.module
rename to tests/modules/libraries_test/libraries_test.module
index 67ed7f7b0b88857898accc09732804f7b2351873..5c25d028422b1b641458fd070a983171fd620d24 100644
--- a/tests/libraries_test.module
+++ b/tests/modules/libraries_test/libraries_test.module
@@ -289,7 +289,7 @@ function libraries_test_libraries_info() {
  * Implements hook_libraries_info_file_paths()
  */
 function libraries_test_libraries_info_file_paths() {
-  return array(drupal_get_path('module', 'libraries_test') . '/example');
+  return array(drupal_get_path('module', 'libraries') . '/tests/example');
 }
 
 /**
@@ -467,86 +467,29 @@ function _libraries_test_callback(&$library, $version, $variant, $group) {
  * Implements hook_menu().
  */
 function libraries_test_menu() {
-  $base = array(
-    'page callback' => '_libraries_test_load',
-    'access callback' => TRUE,
-  );
-  $items['libraries_test/files'] = $base + array(
+  $items['libraries_test/files'] = array(
     'title' => 'Test files',
-    'page arguments' => array('example_files'),
+    'route_name' => 'libraries_test_files',
   );
-  $items['libraries_test/integration_files'] = $base + array(
+  $items['libraries_test/integration_files'] = array(
     'title' => 'Test integration files',
-    'page arguments' => array('example_integration_files'),
+    'route_name' => 'libraries_test_integration_files',
   );
-  $items['libraries_test/versions'] = $base + array(
+  $items['libraries_test/versions'] = array(
     'title' => 'Test version loading',
-    'page arguments' => array('example_versions'),
+    'route_name' => 'libraries_test_versions',
   );
-  $items['libraries_test/variant'] = $base + array(
+  $items['libraries_test/variant'] = array(
     'title' => 'Test variant loading',
-    'page arguments' => array('example_variant', 'example_variant'),
+    'route_name' => 'libraries_test_variant',
   );
-  $items['libraries_test/versions_and_variants'] = $base + array(
+  $items['libraries_test/versions_and_variants'] = array(
     'title' => 'Test concurrent version and variant loading',
-    'page arguments' => array('example_versions_and_variants', 'example_variant_2'),
+    'route_name' => 'libraries_test_versions_and_variants',
   );
-  $items['libraries_test/cache'] = $base + array(
+  $items['libraries_test/cache'] = array(
     'title' => 'Test caching of library information',
-    'page arguments' => array('example_callback'),
+    'route_name' => 'libraries_test_cache',
   );
   return $items;
 }
-
-/**
- * Loads a specified library (variant) for testing.
- *
- * JavaScript and CSS files can be checked directly by SimpleTest, so we only
- * need to manually check for PHP files. We provide information about the loaded
- * JavaScript and CSS files for easier debugging. See example/README.txt for
- * more information.
- */
-function _libraries_test_load($library, $variant = NULL) {
-  libraries_load($library, $variant);
-  // JavaScript and CSS files can be checked directly by SimpleTest, so we only
-  // need to manually check for PHP files.
-  $output = '';
-
-  // For easer debugging of JS loading, a text is shown that the JavaScript will
-  // replace.
-  $output .= '<h2>JavaScript</h2>';
-  $output .= '<div class="libraries-test-javascript">';
-  $output .= 'If this text shows up, no JavaScript test file was loaded.';
-  $output .= '</div>';
-
-  // For easier debugging of CSS loading, the loaded CSS files will color the
-  // following text.
-  $output .= '<h2>CSS</h2>';
-  $output .= '<div class="libraries-test-css">';
-  $output .= 'If one of the CSS test files has been loaded, this text will be colored:';
-  $output .= '<ul>';
-  // Do not reference the actual CSS files (i.e. including '.css'), because that
-  // breaks testing.
-  $output .= '<li>example_1: red</li>';
-  $output .= '<li>example_2: green</li>';
-  $output .= '<li>example_3: orange</li>';
-  $output .= '<li>example_4: blue</li>';
-  $output .= '<li>libraries_test: purple</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-
-  $output .= '<h2>PHP</h2>';
-  $output .= '<div class="libraries-test-php">';
-  $output .= 'The following is a list of all loaded test PHP files:';
-  $output .= '<ul>';
-  $files = get_included_files();
-  foreach ($files as $file) {
-    if (strpos($file, 'libraries/test') && !strpos($file, 'libraries_test.module')) {
-      $output .= '<li>' . str_replace(DRUPAL_ROOT . '/', '', $file) . '</li>';
-    }
-  }
-  $output .= '</ul>';
-  $output .= '</div>';
-
-  return $output;
-}
diff --git a/tests/modules/libraries_test/libraries_test.routing.yml b/tests/modules/libraries_test/libraries_test.routing.yml
new file mode 100644
index 0000000000000000000000000000000000000000..fe7dac4d81d88d11d31fa8b7b88cdf9ec9953cda
--- /dev/null
+++ b/tests/modules/libraries_test/libraries_test.routing.yml
@@ -0,0 +1,36 @@
+libraries_test_files:
+  pattern: '/libraries_test/files'
+  defaults:
+    _content: Drupal\libraries_test\Controller\ExampleController::files
+  requirements:
+    _access: 'TRUE'
+libraries_test_integration_files:
+  pattern: '/libraries_test/integration_files'
+  defaults:
+    _content: Drupal\libraries_test\Controller\ExampleController::integration
+  requirements:
+    _access: 'TRUE'
+libraries_test_versions:
+  pattern: '/libraries_test/versions'
+  defaults:
+    _content: Drupal\libraries_test\Controller\ExampleController::versions
+  requirements:
+    _access: 'TRUE'
+libraries_test_variant:
+  pattern: '/libraries_test/variant'
+  defaults:
+    _content: Drupal\libraries_test\Controller\ExampleController::variant
+  requirements:
+    _access: 'TRUE'
+libraries_test_versions_and_variants:
+  pattern: '/libraries_test/versions_and_variants'
+  defaults:
+    _content: Drupal\libraries_test\Controller\ExampleController::versionsAndVariants
+  requirements:
+    _access: 'TRUE'
+libraries_test_cache:
+  pattern: '/libraries_test/cache'
+  defaults:
+    _content: Drupal\libraries_test\Controller\ExampleController::cache
+  requirements:
+    _access: 'TRUE'