diff --git a/modules/database/database-sql-hana/src/main/java/org/eclipse/dirigible/database/sql/dialects/hana/HanaConnectionEnhancer.java b/components/data/data-sources/src/main/java/org/eclipse/dirigible/components/data/sources/manager/HanaConnectionEnhancer.java
similarity index 96%
rename from modules/database/database-sql-hana/src/main/java/org/eclipse/dirigible/database/sql/dialects/hana/HanaConnectionEnhancer.java
rename to components/data/data-sources/src/main/java/org/eclipse/dirigible/components/data/sources/manager/HanaConnectionEnhancer.java
index aa11b733d20..f18f6797410 100644
--- a/modules/database/database-sql-hana/src/main/java/org/eclipse/dirigible/database/sql/dialects/hana/HanaConnectionEnhancer.java
+++ b/components/data/data-sources/src/main/java/org/eclipse/dirigible/components/data/sources/manager/HanaConnectionEnhancer.java
@@ -7,7 +7,7 @@
  *
  * SPDX-FileCopyrightText: Eclipse Dirigible contributors SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.dirigible.database.sql.dialects.hana;
+package org.eclipse.dirigible.components.data.sources.manager;
 
 import org.eclipse.dirigible.components.api.security.UserFacade;
 import org.eclipse.dirigible.components.database.ConnectionEnhancer;
diff --git a/modules/database/database-sql-hana/src/main/java/org/eclipse/dirigible/database/sql/dialects/hana/HanaDatabaseConfigurator.java b/components/data/data-sources/src/main/java/org/eclipse/dirigible/components/data/sources/manager/HanaDatabaseConfigurator.java
similarity index 94%
rename from modules/database/database-sql-hana/src/main/java/org/eclipse/dirigible/database/sql/dialects/hana/HanaDatabaseConfigurator.java
rename to components/data/data-sources/src/main/java/org/eclipse/dirigible/components/data/sources/manager/HanaDatabaseConfigurator.java
index 3d21fdbefdb..0d7f45197e1 100644
--- a/modules/database/database-sql-hana/src/main/java/org/eclipse/dirigible/database/sql/dialects/hana/HanaDatabaseConfigurator.java
+++ b/components/data/data-sources/src/main/java/org/eclipse/dirigible/components/data/sources/manager/HanaDatabaseConfigurator.java
@@ -7,7 +7,7 @@
  *
  * SPDX-FileCopyrightText: Eclipse Dirigible contributors SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.dirigible.database.sql.dialects.hana;
+package org.eclipse.dirigible.components.data.sources.manager;
 
 import com.zaxxer.hikari.HikariConfig;
 import org.eclipse.dirigible.components.database.DatabaseConfigurator;
diff --git a/components/ide/ide-logs/pom.xml b/components/ide/ide-logs/pom.xml
index 1266e80093f..f6aff800aa7 100644
--- a/components/ide/ide-logs/pom.xml
+++ b/components/ide/ide-logs/pom.xml
@@ -20,7 +20,16 @@
             <groupId>org.eclipse.dirigible</groupId>
             <artifactId>dirigible-components-core-base</artifactId>
         </dependency>
-        
+
+        <!-- Modules -->
+        <dependency>
+            <groupId>org.eclipse.dirigible</groupId>
+            <!-- ConsoleWebsocketHandler, which the console socket serves and the logging appender
+                feeds. The appender itself stays in that module: logback configuration names it by
+                fully qualified class name, downstream configurations included. -->
+            <artifactId>dirigible-commons-resources</artifactId>
+        </dependency>
+
         <!-- Test -->
         <dependency>
             <groupId>org.eclipse.dirigible</groupId>
diff --git a/modules/commons/commons-resources/src/main/java/org/eclipse/dirigible/commons/logging/ConsoleWebsocketConfig.java b/components/ide/ide-logs/src/main/java/org/eclipse/dirigible/components/ide/logs/endpoint/ConsoleWebsocketConfig.java
similarity index 92%
rename from modules/commons/commons-resources/src/main/java/org/eclipse/dirigible/commons/logging/ConsoleWebsocketConfig.java
rename to components/ide/ide-logs/src/main/java/org/eclipse/dirigible/components/ide/logs/endpoint/ConsoleWebsocketConfig.java
index ff7332ad98d..0b761ee1273 100644
--- a/modules/commons/commons-resources/src/main/java/org/eclipse/dirigible/commons/logging/ConsoleWebsocketConfig.java
+++ b/components/ide/ide-logs/src/main/java/org/eclipse/dirigible/components/ide/logs/endpoint/ConsoleWebsocketConfig.java
@@ -7,8 +7,9 @@
  *
  * SPDX-FileCopyrightText: Eclipse Dirigible contributors SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.dirigible.commons.logging;
+package org.eclipse.dirigible.components.ide.logs.endpoint;
 
+import org.eclipse.dirigible.commons.logging.ConsoleWebsocketHandler;
 import org.eclipse.dirigible.components.base.endpoint.BaseEndpoint;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.socket.WebSocketHandler;
diff --git a/modules/engines/engine-graalium/execution-core/src/main/java/org/eclipse/dirigible/graalium/core/modules/DirigibleSourceProvider.java b/modules/engines/engine-graalium/execution-core/src/main/java/org/eclipse/dirigible/graalium/core/modules/DirigibleSourceProvider.java
index 41f6fb57e3a..8f6aaaae1e8 100644
--- a/modules/engines/engine-graalium/execution-core/src/main/java/org/eclipse/dirigible/graalium/core/modules/DirigibleSourceProvider.java
+++ b/modules/engines/engine-graalium/execution-core/src/main/java/org/eclipse/dirigible/graalium/core/modules/DirigibleSourceProvider.java
@@ -17,7 +17,6 @@
 import org.eclipse.dirigible.repository.api.IResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
 
 import java.io.File;
 import java.io.IOException;
@@ -29,8 +28,11 @@
 
 /**
  * The Class DirigibleSourceProvider.
+ *
+ * <p>
+ * Deliberately not a Spring bean: every consumer constructs it directly, so the stereotype it used
+ * to carry only suggested an injection point that never existed.
  */
-@Component
 @CalledFromJS
 public class DirigibleSourceProvider implements JavascriptSourceProvider {