diff --git a/app/src/main/java/ru/dragonestia/picker/service/impl/collection/QueuedLinkedList.java b/app/src/main/java/ru/dragonestia/picker/repository/impl/collection/QueuedLinkedList.java
similarity index 93%
rename from app/src/main/java/ru/dragonestia/picker/service/impl/collection/QueuedLinkedList.java
rename to app/src/main/java/ru/dragonestia/picker/repository/impl/collection/QueuedLinkedList.java
index eac544e..f77b8e5 100644
--- a/app/src/main/java/ru/dragonestia/picker/service/impl/collection/QueuedLinkedList.java
+++ b/app/src/main/java/ru/dragonestia/picker/repository/impl/collection/QueuedLinkedList.java
@@ -1,4 +1,4 @@
-package ru.dragonestia.picker.service.impl.collection;
+package ru.dragonestia.picker.repository.impl.collection;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -26,6 +26,12 @@ public class QueuedLinkedList<ITEM extends QueuedLinkedList.Item> {
         itemMap.put(item.getId(), node);
     }
 
+    public void removeById(String id) {
+        if (!itemMap.containsKey(id)) return;
+
+        remove(itemMap.get(id).object);
+    }
+
     public void remove(ITEM item) {
         if (!itemMap.containsKey(item.getId())) return;
 
diff --git a/app/src/main/java/ru/dragonestia/picker/service/impl/picker/ItemWrapper.java b/app/src/main/java/ru/dragonestia/picker/repository/impl/picker/ItemWrapper.java
similarity index 86%
rename from app/src/main/java/ru/dragonestia/picker/service/impl/picker/ItemWrapper.java
rename to app/src/main/java/ru/dragonestia/picker/repository/impl/picker/ItemWrapper.java
index 029de6a..1fb8ef7 100644
--- a/app/src/main/java/ru/dragonestia/picker/service/impl/picker/ItemWrapper.java
+++ b/app/src/main/java/ru/dragonestia/picker/repository/impl/picker/ItemWrapper.java
@@ -1,10 +1,10 @@
-package ru.dragonestia.picker.service.impl.picker;
+package ru.dragonestia.picker.repository.impl.picker;
 
 import ru.dragonestia.picker.model.type.SlotLimit;
 
 public interface ItemWrapper<ITEM> {
 
-    String getIdentifier();
+    String getId();
 
     int countUnits();
 
diff --git a/app/src/main/java/ru/dragonestia/picker/service/impl/picker/Picker.java b/app/src/main/java/ru/dragonestia/picker/repository/impl/picker/Picker.java
similarity index 75%
rename from app/src/main/java/ru/dragonestia/picker/service/impl/picker/Picker.java
rename to app/src/main/java/ru/dragonestia/picker/repository/impl/picker/Picker.java
index 273011e..bae3a41 100644
--- a/app/src/main/java/ru/dragonestia/picker/service/impl/picker/Picker.java
+++ b/app/src/main/java/ru/dragonestia/picker/repository/impl/picker/Picker.java
@@ -1,4 +1,4 @@
-package ru.dragonestia.picker.service.impl.picker;
+package ru.dragonestia.picker.repository.impl.picker;
 
 import java.util.Collection;
 
diff --git a/app/src/main/java/ru/dragonestia/picker/service/impl/picker/RoomWrapper.java b/app/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoomWrapper.java
similarity index 76%
rename from app/src/main/java/ru/dragonestia/picker/service/impl/picker/RoomWrapper.java
rename to app/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoomWrapper.java
index 28a9f9c..c8093e0 100644
--- a/app/src/main/java/ru/dragonestia/picker/service/impl/picker/RoomWrapper.java
+++ b/app/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoomWrapper.java
@@ -1,10 +1,11 @@
-package ru.dragonestia.picker.service.impl.picker;
+package ru.dragonestia.picker.repository.impl.picker;
 
 import ru.dragonestia.picker.model.Room;
+import ru.dragonestia.picker.repository.impl.collection.QueuedLinkedList;
 
 import java.util.function.Supplier;
 
-public class RoomWrapper implements ItemWrapper<Room> {
+public class RoomWrapper implements ItemWrapper<Room>, QueuedLinkedList.Item {
 
     private final Room room;
     private final Supplier<Integer> userCountSupplier;
@@ -15,7 +16,7 @@ public class RoomWrapper implements ItemWrapper<Room> {
     }
 
     @Override
-    public String getIdentifier() {
+    public String getId() {
         return room.getId();
     }
 
diff --git a/app/src/main/java/ru/dragonestia/picker/service/impl/picker/SequentialFillingPicker.java b/app/src/main/java/ru/dragonestia/picker/repository/impl/picker/SequentialFillingPicker.java
similarity index 95%
rename from app/src/main/java/ru/dragonestia/picker/service/impl/picker/SequentialFillingPicker.java
rename to app/src/main/java/ru/dragonestia/picker/repository/impl/picker/SequentialFillingPicker.java
index c95b3dd..8d45787 100644
--- a/app/src/main/java/ru/dragonestia/picker/service/impl/picker/SequentialFillingPicker.java
+++ b/app/src/main/java/ru/dragonestia/picker/repository/impl/picker/SequentialFillingPicker.java
@@ -1,4 +1,4 @@
-package ru.dragonestia.picker.service.impl.picker;
+package ru.dragonestia.picker.repository.impl.picker;
 
 import ru.dragonestia.picker.model.Room;
 import ru.dragonestia.picker.model.User;
diff --git a/app/src/test/java/ru/dragonestia/picker/collection/QueuedLinkedListTests.java b/app/src/test/java/ru/dragonestia/picker/collection/QueuedLinkedListTests.java
index dc322eb..baf7a59 100644
--- a/app/src/test/java/ru/dragonestia/picker/collection/QueuedLinkedListTests.java
+++ b/app/src/test/java/ru/dragonestia/picker/collection/QueuedLinkedListTests.java
@@ -2,7 +2,7 @@ package ru.dragonestia.picker.collection;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import ru.dragonestia.picker.service.impl.collection.QueuedLinkedList;
+import ru.dragonestia.picker.repository.impl.collection.QueuedLinkedList;
 
 import java.util.HashSet;