Index: modules/rules/modules/rules_ui/rules_ui.routing.yml
===================================================================
--- modules/rules/modules/rules_ui/rules_ui.routing.yml	(date 1442969748000)
+++ modules/rules/modules/rules_ui/rules_ui.routing.yml	(date 1442969748000)
@@ -1,82 +0,0 @@
-# Declaration of Rules UI routings.
-
-
-### Rules settings form
-rules.ui.settings:
-  path: '/admin/config/workflow/rules/settings'
-  defaults:
-    _controller: '\Drupal\rules_ui\Controller\RulesUiController::settingsForm'
-    _title: 'Rules settings'
-  requirements:
-    _permission: 'administer rules'
-
-
-### Rules Reactions
-entity.rules_reaction_rule.collection:
-  path: '/admin/config/workflow/rules'
-  defaults:
-    _entity_list: 'rules_reaction_rule'
-    _title: 'Rules'
-  requirements:
-    _permission: 'administer rules+administer rules reactions'
-
-entity.rules_reaction_rule.add_form:
-  path: '/admin/config/workflow/rules/reactions/add'
-  defaults:
-    _entity_form: 'rules_reaction_rule.add'
-    _title: 'Add reaction rule'
-  requirements:
-    _permission: 'administer rules+administer rules reactions'
-
-entity.rules_reaction_rule.edit_form:
-  path: '/admin/config/workflow/rules/reactions/edit/{rules_reaction_rule}'
-  defaults:
-    _entity_form: 'rules_reaction_rule.edit'
-    _title: 'Edit reaction rule'
-  requirements:
-    _permission: 'administer rules+administer rules reactions'
-
-entity.rules_reaction_rule.delete_form:
-  path: '/admin/config/workflow/rules/reactions/delete/{rules_reaction_rule}'
-  defaults:
-    _entity_form: 'rules_reaction_rule.delete'
-    _title: 'Delete reaction rule'
-  requirements:
-    _permission: 'administer rules+administer rules reactions'
-
-
-### Rules Components
-entity.rules_component.collection:
-  path: '/admin/config/workflow/rules/components'
-  defaults:
-  # Calls the list controller, defined in the annotation of the rules component entity.
-    _entity_list: 'rules_component'
-    _title: 'Rules components'
-  requirements:
-    _permission: 'administer rules+administer rules components'
-
-entity.rules_component.add_form:
-  path: '/admin/config/workflow/rules/components/add'
-  defaults:
-    _entity_form: 'rules_component.add'
-    _title: 'Add component'
-  requirements:
-    _permission: 'administer rules+administer rules components'
-
-entity.rules_component.edit_form:
-  path: '/admin/config/workflow/rules/components/edit/{rules_component}'
-  defaults:
-    _entity_form: 'rules_component.edit'
-    _title: 'Edit component'
-  requirements:
-    _permission: 'administer rules+administer rules components'
-
-entity.rules_component.delete_form:
-  path: '/admin/config/workflow/rules/components/delete/{rules_component}'
-  defaults:
-    _entity_form: 'rules_component.delete'
-    _title: 'Delete component'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _permission: 'administer rules+administer rules components'
\ No newline at end of file
Index: modules/rules/modules/rules_ui/rules_ui.links.task.yml
===================================================================
--- modules/rules/modules/rules_ui/rules_ui.links.task.yml	(date 1442969748000)
+++ modules/rules/modules/rules_ui/rules_ui.links.task.yml	(date 1442969748000)
@@ -1,19 +0,0 @@
-# Menu tasks for Rules UI.
-
-rules.ui.reactions:
-  title: 'Reaction rules'
-  route_name: entity.rules_reaction_rule.collection
-  base_route: entity.rules_reaction_rule.collection
-  weight: 1
-
-rules.ui.components:
-  title: 'Components'
-  route_name: entity.rules_component.collection
-  base_route: entity.rules_reaction_rule.collection
-  weight: 2
-
-rules.ui.settings:
-  title: 'Settings'
-  route_name: rules.ui.settings
-  base_route: entity.rules_reaction_rule.collection
-  weight: 3
Index: modules/rules/modules/rules_ui/src/Controller/RulesUiController.php
===================================================================
--- modules/rules/modules/rules_ui/src/Controller/RulesUiController.php	(date 1442969748000)
+++ modules/rules/modules/rules_ui/src/Controller/RulesUiController.php	(date 1442969748000)
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * @file
- * Rules UI controller.
- */
-
-namespace Drupal\rules_ui\Controller;
-
-use Drupal\Core\Controller\ControllerBase;
-
-/**
- * Returns responses for Rules UI routes.
- */
-class RulesUiController extends ControllerBase {
-  /**
-   * Returns the settings page.
-   *
-   * @return array
-   *   Renderable array.
-   */
-  public function settingsForm() {
-    $element = [
-      '#markup' => 'Rules settings form is not implemented yet.',
-    ];
-    return $element;
-  }
-}
Index: modules/rules/rules.links.task.yml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- modules/rules/rules.links.task.yml	(revision )
+++ modules/rules/rules.links.task.yml	(revision )
@@ -0,0 +1,19 @@
+# Menu tasks for Rules.
+
+rules.ui.reactions:
+  title: 'Reaction rules'
+  route_name: entity.rules_reaction_rule.collection
+  base_route: entity.rules_reaction_rule.collection
+  weight: 1
+
+rules.ui.components:
+  title: 'Components'
+  route_name: entity.rules_component.collection
+  base_route: entity.rules_reaction_rule.collection
+  weight: 2
+
+rules.ui.settings:
+  title: 'Settings'
+  route_name: rules.ui.settings
+  base_route: entity.rules_reaction_rule.collection
+  weight: 3
Index: modules/rules/modules/rules_ui/rules_ui.module
===================================================================
--- modules/rules/modules/rules_ui/rules_ui.module	(date 1442969748000)
+++ modules/rules/modules/rules_ui/rules_ui.module	(date 1442969748000)
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * @file
- * Rules UI module hook implementations.
- */
-
-use Drupal\Core\Routing\RouteMatchInterface;
-
-/**
- * Implements hook_help().
- */
-function rules_ui_help($route_name, RouteMatchInterface $route_match) {
-  switch ($route_name) {
-    case 'entity.rules_reaction_rule.collection':
-      $output = t('Reaction rules, listed below, react on selected events on the site. Each reaction rule may fire any number of <em>actions</em>, and may have any number of <em>conditions</em> that must be met for the actions to be executed. You can also set up <a href="!url1">components</a> – stand-alone sets of Rules configuration that can be used in Rules and other parts of your site. See <a href="!url2">the online documentation</a> for an introduction on how to use Rules.', [
-        '!url1' => \Drupal::url('entity.rules_component.collection'),
-        '!url2' => 'http://drupal.org/node/298480',
-      ]);
-      return $output;
-  }
-}
Index: modules/rules/modules/rules_ui/rules_ui.links.menu.yml
===================================================================
--- modules/rules/modules/rules_ui/rules_ui.links.menu.yml	(date 1442969748000)
+++ modules/rules/modules/rules_ui/rules_ui.links.menu.yml	(date 1442969748000)
@@ -1,7 +0,0 @@
-# Menu links for Rules UI.
-
-rules.ui.reactions:
-  title: 'Rules'
-  route_name: entity.rules_reaction_rule.collection
-  parent: system.admin_config_workflow
-  description: 'Reaction rules administration overview.'
Index: modules/rules/rules.info.yml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- modules/rules/rules.info.yml	(date 1442969748000)
+++ modules/rules/rules.info.yml	(revision )
@@ -3,3 +3,4 @@
 description: 'React on events and conditionally evaluate actions.'
 package: Rules
 core: 8.x
+configure: entity.rules_reaction_rule.collection
\ No newline at end of file
Index: modules/rules/rules.links.action.yml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- modules/rules/rules.links.action.yml	(revision )
+++ modules/rules/rules.links.action.yml	(revision )
@@ -0,0 +1,15 @@
+# Action links for Rules.
+
+# Rules reaction related actions.
+rules_reaction_rule_add_action:
+  route_name: entity.rules_reaction_rule.add_form
+  title: 'Add reaction rule'
+  appears_on:
+    - entity.rules_reaction_rule.collection
+
+# Rules component related actions.
+rules_component_add_action:
+  route_name: entity.rules_component.add_form
+  title: 'Add component'
+  appears_on:
+    - entity.rules_component.collection
Index: modules/rules/rules.routing.yml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- modules/rules/rules.routing.yml	(date 1442969748000)
+++ modules/rules/rules.routing.yml	(revision )
@@ -1,1 +1,82 @@
-# Currently all routes are declared in Rules UI.
\ No newline at end of file
+# Declaration of Rules routings.
+
+
+### Rules settings form
+rules.ui.settings:
+  path: '/admin/config/workflow/rules/settings'
+  defaults:
+    _controller: '\Drupal\rules\Controller\RulesController::settingsForm'
+    _title: 'Rules settings'
+  requirements:
+    _permission: 'administer rules'
+
+
+### Rules Reactions
+entity.rules_reaction_rule.collection:
+  path: '/admin/config/workflow/rules'
+  defaults:
+    _entity_list: 'rules_reaction_rule'
+    _title: 'Rules'
+  requirements:
+    _permission: 'administer rules+administer rules reactions'
+
+entity.rules_reaction_rule.add_form:
+  path: '/admin/config/workflow/rules/reactions/add'
+  defaults:
+    _entity_form: 'rules_reaction_rule.add'
+    _title: 'Add reaction rule'
+  requirements:
+    _permission: 'administer rules+administer rules reactions'
+
+entity.rules_reaction_rule.edit_form:
+  path: '/admin/config/workflow/rules/reactions/edit/{rules_reaction_rule}'
+  defaults:
+    _entity_form: 'rules_reaction_rule.edit'
+    _title: 'Edit reaction rule'
+  requirements:
+    _permission: 'administer rules+administer rules reactions'
+
+entity.rules_reaction_rule.delete_form:
+  path: '/admin/config/workflow/rules/reactions/delete/{rules_reaction_rule}'
+  defaults:
+    _entity_form: 'rules_reaction_rule.delete'
+    _title: 'Delete reaction rule'
+  requirements:
+    _permission: 'administer rules+administer rules reactions'
+
+
+### Rules Components
+entity.rules_component.collection:
+  path: '/admin/config/workflow/rules/components'
+  defaults:
+  # Calls the list controller, defined in the annotation of the rules component entity.
+    _entity_list: 'rules_component'
+    _title: 'Rules components'
+  requirements:
+    _permission: 'administer rules+administer rules components'
+
+entity.rules_component.add_form:
+  path: '/admin/config/workflow/rules/components/add'
+  defaults:
+    _entity_form: 'rules_component.add'
+    _title: 'Add component'
+  requirements:
+    _permission: 'administer rules+administer rules components'
+
+entity.rules_component.edit_form:
+  path: '/admin/config/workflow/rules/components/edit/{rules_component}'
+  defaults:
+    _entity_form: 'rules_component.edit'
+    _title: 'Edit component'
+  requirements:
+    _permission: 'administer rules+administer rules components'
+
+entity.rules_component.delete_form:
+  path: '/admin/config/workflow/rules/components/delete/{rules_component}'
+  defaults:
+    _entity_form: 'rules_component.delete'
+    _title: 'Delete component'
+  options:
+    _admin_route: TRUE
+  requirements:
+    _permission: 'administer rules+administer rules components'
\ No newline at end of file
Index: modules/rules/rules.permissions.yml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- modules/rules/rules.permissions.yml	(date 1442969748000)
+++ modules/rules/rules.permissions.yml	(revision )
@@ -1,9 +1,6 @@
 # Most of the time administrators will be able to administer both reactions,
 # components and settings. But permissions are split up in such a way it
 # should be possible to have 'light' and 'root' rules administrators.
-#
-# Permissions are declared in Rules (not Rules UI) so other contrib modules
-# can make use of it.
 administer rules:
   title: 'Administer Rules'
   description: 'Administer all Rules configurations and settings.'
Index: modules/rules/modules/rules_ui/rules_ui.links.action.yml
===================================================================
--- modules/rules/modules/rules_ui/rules_ui.links.action.yml	(date 1442969748000)
+++ modules/rules/modules/rules_ui/rules_ui.links.action.yml	(date 1442969748000)
@@ -1,15 +0,0 @@
-# Action links for Rules UI.
-
-# Rules reaction related actions.
-rules_reaction_rule_add_action:
-  route_name: entity.rules_reaction_rule.add_form
-  title: 'Add reaction rule'
-  appears_on:
-    - entity.rules_reaction_rule.collection
-
-# Rules component related actions.
-rules_component_add_action:
-  route_name: entity.rules_component.add_form
-  title: 'Add component'
-  appears_on:
-    - entity.rules_component.collection
Index: modules/rules/rules.module
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- modules/rules/rules.module	(date 1442969748000)
+++ modules/rules/rules.module	(revision )
@@ -8,11 +8,26 @@
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\rules\Event\EntityEvent;
 use Drupal\rules\Event\UserLoginEvent;
 use Drupal\rules\Event\UserLogoutEvent;
 
 /**
+ * Implements hook_help().
+ */
+function rules_help($route_name, RouteMatchInterface $route_match) {
+  switch ($route_name) {
+    case 'entity.rules_reaction_rule.collection':
+      $output = t('Reaction rules, listed below, react on selected events on the site. Each reaction rule may fire any number of <em>actions</em>, and may have any number of <em>conditions</em> that must be met for the actions to be executed. You can also set up <a href="!url1">components</a> – stand-alone sets of Rules configuration that can be used in Rules and other parts of your site. See <a href="!url2">the online documentation</a> for an introduction on how to use Rules.', [
+        '!url1' => \Drupal::url('entity.rules_component.collection'),
+        '!url2' => 'http://drupal.org/node/298480',
+      ]);
+      return $output;
+  }
+}
+
+/**
  * Implements hook_user_login().
  */
 function rules_user_login($account) {
@@ -98,3 +113,4 @@
     $event_dispatcher->dispatch("rules_entity_update:$entity_type_id", $event);
   }
 }
+
Index: modules/rules/rules.links.menu.yml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- modules/rules/rules.links.menu.yml	(revision )
+++ modules/rules/rules.links.menu.yml	(revision )
@@ -0,0 +1,7 @@
+# Menu links for Rules.
+
+rules.ui.reactions:
+  title: 'Rules'
+  route_name: entity.rules_reaction_rule.collection
+  parent: system.admin_config_workflow
+  description: 'Reaction rules administration overview.'
Index: modules/rules/src/Controller/RulesController.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- modules/rules/src/Controller/RulesController.php	(revision )
+++ modules/rules/src/Controller/RulesController.php	(revision )
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * @file
+ * Rules controller.
+ */
+
+namespace Drupal\rules\Controller;
+
+use Drupal\Core\Controller\ControllerBase;
+
+/**
+ * Returns responses for Rules routes.
+ */
+class RulesController extends ControllerBase {
+  /**
+   * Returns the settings page.
+   *
+   * @return array
+   *   Renderable array.
+   */
+  public function settingsForm() {
+    $element = [
+      '#markup' => 'Rules settings form is not implemented yet.',
+    ];
+    return $element;
+  }
+}
Index: modules/rules/modules/rules_ui/rules_ui.info.yml
===================================================================
--- modules/rules/modules/rules_ui/rules_ui.info.yml	(date 1442969748000)
+++ modules/rules/modules/rules_ui/rules_ui.info.yml	(date 1442969748000)
@@ -1,8 +0,0 @@
-name: 'Rules UI'
-type: module
-description: 'Administration interface for Rules.'
-package: Rules
-core: 8.x
-dependencies:
-  - rules
-configure: entity.rules_reaction_rule.collection