diff --git a/wax-prosemirror-services/src/AnnotationService/tools/BulletList.js b/wax-prosemirror-services/src/ListsService/BulletListService/BulletList.js
similarity index 100%
rename from wax-prosemirror-services/src/AnnotationService/tools/BulletList.js
rename to wax-prosemirror-services/src/ListsService/BulletListService/BulletList.js
diff --git a/wax-prosemirror-services/src/ListsService/BulletListService/BulletListService.js b/wax-prosemirror-services/src/ListsService/BulletListService/BulletListService.js
new file mode 100644
index 0000000000000000000000000000000000000000..2048f5a8c23ab6094eb6fc7e4eedd61767d89228
--- /dev/null
+++ b/wax-prosemirror-services/src/ListsService/BulletListService/BulletListService.js
@@ -0,0 +1,12 @@
+import Service from "wax-prosemirror-core/src/services/Service";
+import BulletList from "./BulletList";
+
+class BulletListService extends Service {
+  boot() {}
+
+  register() {
+    this.container.bind("BulletList").to(BulletList);
+  }
+}
+
+export default BulletListService;
diff --git a/wax-prosemirror-services/src/ListsService/JoinUpService/JoinUp.js b/wax-prosemirror-services/src/ListsService/JoinUpService/JoinUp.js
new file mode 100644
index 0000000000000000000000000000000000000000..0e5907bd1df9856bfab4e5e0c48945455deeddcc
--- /dev/null
+++ b/wax-prosemirror-services/src/ListsService/JoinUpService/JoinUp.js
@@ -0,0 +1,22 @@
+import { joinUp } from "prosemirror-commands";
+import Tools from "../../lib/Tools";
+import { injectable } from "inversify";
+import { icons } from "wax-prosemirror-components";
+
+@injectable()
+export default class JoinUp extends Tools {
+  title = "Join with above block";
+  content = icons.join_up;
+
+  get run() {
+    return joinUp;
+  }
+
+  get enable() {
+    return joinUp;
+  }
+
+  select(state) {
+    return joinUp(state);
+  }
+}
diff --git a/wax-prosemirror-services/src/ListsService/JoinUpService/JoinUpService.js b/wax-prosemirror-services/src/ListsService/JoinUpService/JoinUpService.js
new file mode 100644
index 0000000000000000000000000000000000000000..04912d389038edfb176ef6a529567b299764f53c
--- /dev/null
+++ b/wax-prosemirror-services/src/ListsService/JoinUpService/JoinUpService.js
@@ -0,0 +1,12 @@
+import Service from "wax-prosemirror-core/src/services/Service";
+import JoinUp from "./JoinUp";
+
+class JoinUpService extends Service {
+  boot() {}
+
+  register() {
+    this.container.bind("JoinUp").to(JoinUp);
+  }
+}
+
+export default JoinUpService;
diff --git a/wax-prosemirror-services/src/AnnotationService/tools/Lift.js b/wax-prosemirror-services/src/ListsService/LiftService/Lift.js
similarity index 100%
rename from wax-prosemirror-services/src/AnnotationService/tools/Lift.js
rename to wax-prosemirror-services/src/ListsService/LiftService/Lift.js
diff --git a/wax-prosemirror-services/src/ListsService/LiftService/LiftService.js b/wax-prosemirror-services/src/ListsService/LiftService/LiftService.js
new file mode 100644
index 0000000000000000000000000000000000000000..19e42ad303ba7ea8215d1b9afbdc9f3e31ae8b77
--- /dev/null
+++ b/wax-prosemirror-services/src/ListsService/LiftService/LiftService.js
@@ -0,0 +1,12 @@
+import Service from "wax-prosemirror-core/src/services/Service";
+import Lift from "./Lift";
+
+class LiftService extends Service {
+  boot() {}
+
+  register() {
+    this.container.bind("Lift").to(Lift);
+  }
+}
+
+export default LiftService;
diff --git a/wax-prosemirror-services/src/ListsService/ListsSerivce.js b/wax-prosemirror-services/src/ListsService/ListsSerivce.js
new file mode 100644
index 0000000000000000000000000000000000000000..6a8e560fd1896b742e79e0dcf4527b120a396b0f
--- /dev/null
+++ b/wax-prosemirror-services/src/ListsService/ListsSerivce.js
@@ -0,0 +1,10 @@
+import ListsServices from "./index";
+import Service from "wax-prosemirror-core/src/services/Service";
+
+class ListsService extends Service {
+  register() {
+    this.config.pushToArray("services", ListsServices);
+  }
+}
+
+export default ListsService;
diff --git a/wax-prosemirror-services/src/AnnotationService/tools/OrderedList.js b/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedList.js
similarity index 100%
rename from wax-prosemirror-services/src/AnnotationService/tools/OrderedList.js
rename to wax-prosemirror-services/src/ListsService/OrderedListService/OrderedList.js
diff --git a/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedListService.js b/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedListService.js
new file mode 100644
index 0000000000000000000000000000000000000000..3594004f0a241613e0289fb5cab6212efeb08973
--- /dev/null
+++ b/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedListService.js
@@ -0,0 +1,12 @@
+import Service from "wax-prosemirror-core/src/services/Service";
+import OrderedList from "./OrderedList";
+
+class OrderedListService extends Service {
+  boot() {}
+
+  register() {
+    this.container.bind("OrderedList").to(OrderedList);
+  }
+}
+
+export default OrderedListService;
diff --git a/wax-prosemirror-services/src/ListsService/index.js b/wax-prosemirror-services/src/ListsService/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..47b0485da39c6b3298ef701e01c03b2550e956c2
--- /dev/null
+++ b/wax-prosemirror-services/src/ListsService/index.js
@@ -0,0 +1,11 @@
+import BulletListService from "./BulletListService/BulletListService";
+import OrderedListService from "./OrderedListService/OrderedListService";
+import JoinUpService from "./JoinUpService/JoinUpService";
+import LiftService from "./LiftService/LiftService";
+
+export default [
+  new BulletListService(),
+  new OrderedListService(),
+  new JoinUpService(),
+  new LiftService()
+];