diff --git a/layoutparser-service/layoutparser-service-server/src/main/java/com/knecon/fforesight/service/layoutparser/server/queue/TenantQueueConfig.java b/layoutparser-service/layoutparser-service-server/src/main/java/com/knecon/fforesight/service/layoutparser/server/configuration/TenantMessagingConfiguration.java
similarity index 84%
rename from layoutparser-service/layoutparser-service-server/src/main/java/com/knecon/fforesight/service/layoutparser/server/queue/TenantQueueConfig.java
rename to layoutparser-service/layoutparser-service-server/src/main/java/com/knecon/fforesight/service/layoutparser/server/configuration/TenantMessagingConfiguration.java
index 5e42559..7683f52 100644
--- a/layoutparser-service/layoutparser-service-server/src/main/java/com/knecon/fforesight/service/layoutparser/server/queue/TenantQueueConfig.java
+++ b/layoutparser-service/layoutparser-service-server/src/main/java/com/knecon/fforesight/service/layoutparser/server/configuration/TenantMessagingConfiguration.java
@@ -1,4 +1,4 @@
-package com.knecon.fforesight.service.layoutparser.server.queue;
+package com.knecon.fforesight.service.layoutparser.server.configuration;
 
 import java.util.Set;
 
@@ -6,11 +6,12 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingQueueNames;
+import com.knecon.fforesight.service.layoutparser.server.queue.MessageHandler;
 import com.knecon.fforesight.tenantcommons.model.TenantQueueConfiguration;
 import com.knecon.fforesight.tenantcommons.model.TenantQueueProvider;
 
 @Configuration
-public class TenantQueueConfig {
+public class TenantMessagingConfiguration {
 
     @Bean
     protected TenantQueueProvider getTenantQueueConfigs() {
diff --git a/layoutparser-service/layoutparser-service-server/src/main/java/com/knecon/fforesight/service/layoutparser/server/configuration/TenantMessagingConfigurationImpl.java b/layoutparser-service/layoutparser-service-server/src/main/java/com/knecon/fforesight/service/layoutparser/server/configuration/TenantMessagingConfigurationImpl.java
deleted file mode 100644
index 9389a9b..0000000
--- a/layoutparser-service/layoutparser-service-server/src/main/java/com/knecon/fforesight/service/layoutparser/server/configuration/TenantMessagingConfigurationImpl.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.server.configuration;
-
-import org.springframework.context.annotation.Configuration;
-
-import com.knecon.fforesight.tenantcommons.queue.TenantMessagingConfiguration;
-
-@Configuration
-public class TenantMessagingConfigurationImpl extends TenantMessagingConfiguration {
-
-
-}