diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/LimitPoller.java b/src/main/java/org/apache/sling/distribution/journal/impl/shared/LimitPoller.java
similarity index 98%
rename from src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/LimitPoller.java
rename to src/main/java/org/apache/sling/distribution/journal/impl/shared/LimitPoller.java
index d21edf1..2bb30b5 100644
--- a/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/LimitPoller.java
+++ b/src/main/java/org/apache/sling/distribution/journal/impl/shared/LimitPoller.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.distribution.journal.impl.queue.impl;
+package org.apache.sling.distribution.journal.impl.shared;
 
 import static org.apache.sling.distribution.journal.HandlerAdapter.create;
 
diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/shared/PackageBrowser.java b/src/main/java/org/apache/sling/distribution/journal/impl/shared/PackageBrowser.java
index 713537d..b9d1d2d 100644
--- a/src/main/java/org/apache/sling/distribution/journal/impl/shared/PackageBrowser.java
+++ b/src/main/java/org/apache/sling/distribution/journal/impl/shared/PackageBrowser.java
@@ -43,7 +43,6 @@
 import org.apache.sling.distribution.journal.FullMessage;
 import org.apache.sling.distribution.journal.JournalAvailable;
 import org.apache.sling.distribution.journal.MessagingProvider;
-import org.apache.sling.distribution.journal.impl.queue.impl.LimitPoller;
 import org.apache.sling.distribution.journal.messages.Messages.PackageMessage;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/LimitPollerTest.java b/src/test/java/org/apache/sling/distribution/journal/impl/shared/LimitPollerTest.java
similarity index 97%
rename from src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/LimitPollerTest.java
rename to src/test/java/org/apache/sling/distribution/journal/impl/shared/LimitPollerTest.java
index 15d2c1f..fed9fef 100644
--- a/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/LimitPollerTest.java
+++ b/src/test/java/org/apache/sling/distribution/journal/impl/shared/LimitPollerTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.distribution.journal.impl.queue.impl;
+package org.apache.sling.distribution.journal.impl.shared;
 
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.samePropertyValuesAs;
@@ -29,7 +29,7 @@
 import java.time.Duration;
 import java.util.List;
 
-import org.apache.sling.distribution.journal.impl.shared.TestMessageInfo;
+import org.apache.sling.distribution.journal.impl.shared.LimitPoller;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;