diff --git a/example/custom/general/src/general/__init__.py b/example/custom/general/src/__init__.py
similarity index 100%
rename from example/custom/general/src/general/__init__.py
rename to example/custom/general/src/__init__.py
diff --git a/example/custom/general/src/general/application.py b/example/custom/general/src/application.py
similarity index 98%
rename from example/custom/general/src/general/application.py
rename to example/custom/general/src/application.py
index 5486060b..d88454ba 100644
--- a/example/custom/general/src/general/application.py
+++ b/example/custom/general/src/application.py
@@ -10,7 +10,7 @@ from cpl.core.log import LoggerABC
 from cpl.core.pipes import IPAddressPipe
 from cpl.mail import EMail, EMailClientABC
 from cpl.query import List
-from general.scoped_service import ScopedService
+from scoped_service import ScopedService
 from test_service import TestService
 from test_settings import TestSettings
 
diff --git a/example/custom/general/src/general/appsettings.development.json b/example/custom/general/src/appsettings.development.json
similarity index 100%
rename from example/custom/general/src/general/appsettings.development.json
rename to example/custom/general/src/appsettings.development.json
diff --git a/example/custom/general/src/general/appsettings.edrafts-lapi.json b/example/custom/general/src/appsettings.edrafts-lapi.json
similarity index 100%
rename from example/custom/general/src/general/appsettings.edrafts-lapi.json
rename to example/custom/general/src/appsettings.edrafts-lapi.json
diff --git a/example/custom/general/src/general/appsettings.edrafts-pc.json b/example/custom/general/src/appsettings.edrafts-pc.json
similarity index 100%
rename from example/custom/general/src/general/appsettings.edrafts-pc.json
rename to example/custom/general/src/appsettings.edrafts-pc.json
diff --git a/example/custom/general/src/general/appsettings.json b/example/custom/general/src/appsettings.json
similarity index 100%
rename from example/custom/general/src/general/appsettings.json
rename to example/custom/general/src/appsettings.json
diff --git a/example/custom/general/src/general/db/__init__.py b/example/custom/general/src/db/__init__.py
similarity index 100%
rename from example/custom/general/src/general/db/__init__.py
rename to example/custom/general/src/db/__init__.py
diff --git a/example/custom/general/src/general/general.json b/example/custom/general/src/general.json
similarity index 100%
rename from example/custom/general/src/general/general.json
rename to example/custom/general/src/general.json
diff --git a/example/custom/general/src/general/main.py b/example/custom/general/src/main.py
similarity index 100%
rename from example/custom/general/src/general/main.py
rename to example/custom/general/src/main.py
diff --git a/example/custom/general/src/general/scoped_service.py b/example/custom/general/src/scoped_service.py
similarity index 100%
rename from example/custom/general/src/general/scoped_service.py
rename to example/custom/general/src/scoped_service.py
diff --git a/example/custom/general/src/general/startup.py b/example/custom/general/src/startup.py
similarity index 94%
rename from example/custom/general/src/general/startup.py
rename to example/custom/general/src/startup.py
index 27e3ceba..a195c8ed 100644
--- a/example/custom/general/src/general/startup.py
+++ b/example/custom/general/src/startup.py
@@ -4,7 +4,7 @@ from cpl.core.configuration import Configuration
 from cpl.core.environment import Environment
 from cpl.core.pipes import IPAddressPipe
 from cpl.dependency import ServiceCollection
-from general.scoped_service import ScopedService
+from scoped_service import ScopedService
 from test_service import TestService
 
 
diff --git a/example/custom/general/src/general/test_extension.py b/example/custom/general/src/test_extension.py
similarity index 100%
rename from example/custom/general/src/general/test_extension.py
rename to example/custom/general/src/test_extension.py
diff --git a/example/custom/general/src/general/test_service.py b/example/custom/general/src/test_service.py
similarity index 100%
rename from example/custom/general/src/general/test_service.py
rename to example/custom/general/src/test_service.py
diff --git a/example/custom/general/src/general/test_settings.py b/example/custom/general/src/test_settings.py
similarity index 100%
rename from example/custom/general/src/general/test_settings.py
rename to example/custom/general/src/test_settings.py
diff --git a/example/custom/general/src/general/test_startup_extension.py b/example/custom/general/src/test_startup_extension.py
similarity index 100%
rename from example/custom/general/src/general/test_startup_extension.py
rename to example/custom/general/src/test_startup_extension.py