diff --git a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/Activator.java b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/Activator.java
index 221ba95..c80be7a 100644
--- a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/Activator.java
+++ b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/Activator.java
@@ -28,6 +28,7 @@
 import org.apache.aries.rsa.topologymanager.exporter.DefaultExportPolicy;
 import org.apache.aries.rsa.topologymanager.exporter.EndpointListenerNotifier;
 import org.apache.aries.rsa.topologymanager.exporter.TopologyManagerExport;
+import org.apache.aries.rsa.topologymanager.importer.NamedThreadFactory;
 import org.apache.aries.rsa.topologymanager.importer.TopologyManagerImport;
 import org.apache.aries.rsa.topologymanager.importer.local.EndpointListenerManager;
 import org.osgi.annotation.bundle.Capability;
diff --git a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/NamedThreadFactory.java b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/NamedThreadFactory.java
similarity index 96%
rename from topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/NamedThreadFactory.java
rename to topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/NamedThreadFactory.java
index 724bede..e0e2360 100644
--- a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/NamedThreadFactory.java
+++ b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/NamedThreadFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.rsa.topologymanager;
+package org.apache.aries.rsa.topologymanager.importer;
 
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
index 5e4baf8..896f1e0 100644
--- a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
+++ b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
@@ -26,7 +26,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Stream;
 
-import org.apache.aries.rsa.topologymanager.NamedThreadFactory;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.remoteserviceadmin.EndpointDescription;
 import org.osgi.service.remoteserviceadmin.EndpointEvent;