diff --git a/eco-application/eco-application-example/src/main/kotlin/Application.kt b/eco-application/eco-application-example/src/main/kotlin/community/flock/eco/application/example/Application.kt
similarity index 100%
rename from eco-application/eco-application-example/src/main/kotlin/Application.kt
rename to eco-application/eco-application-example/src/main/kotlin/community/flock/eco/application/example/Application.kt
diff --git a/eco-application/eco-application-example/src/main/kotlin/ApplicationConfiguration.kt b/eco-application/eco-application-example/src/main/kotlin/community/flock/eco/application/example/ApplicationConfiguration.kt
similarity index 92%
rename from eco-application/eco-application-example/src/main/kotlin/ApplicationConfiguration.kt
rename to eco-application/eco-application-example/src/main/kotlin/community/flock/eco/application/example/ApplicationConfiguration.kt
index db4c4fd3..cba00962 100644
--- a/eco-application/eco-application-example/src/main/kotlin/ApplicationConfiguration.kt
+++ b/eco-application/eco-application-example/src/main/kotlin/community/flock/eco/application/example/ApplicationConfiguration.kt
@@ -1,9 +1,9 @@
 package community.flock.eco.application.example
 
-import LanguageIsoConfiguration
 import community.flock.eco.feature.member.MemberConfiguration
 import community.flock.eco.feature.user.UserConfiguration
 import community.flock.eco.feature.workspace.WorkspaceConfiguration
+import community.flock.eco.iso.language.LanguageIsoConfiguration
 import org.springframework.boot.autoconfigure.domain.EntityScan
 import org.springframework.context.annotation.ComponentScan
 import org.springframework.context.annotation.Configuration
diff --git a/eco-application/eco-application-example/src/main/kotlin/ApplicationData.kt b/eco-application/eco-application-example/src/main/kotlin/community/flock/eco/application/example/ApplicationData.kt
similarity index 76%
rename from eco-application/eco-application-example/src/main/kotlin/ApplicationData.kt
rename to eco-application/eco-application-example/src/main/kotlin/community/flock/eco/application/example/ApplicationData.kt
index 0d927bfc..25ce817b 100644
--- a/eco-application/eco-application-example/src/main/kotlin/ApplicationData.kt
+++ b/eco-application/eco-application-example/src/main/kotlin/community/flock/eco/application/example/ApplicationData.kt
@@ -1,6 +1,6 @@
 package community.flock.eco.application.example
 
-import community.flock.eco.feature.member.develop.data.MemberLoadData
+import community.flock.eco.feature.member.develop.MemberLoadData
 import community.flock.eco.feature.user.develop.data.UserLoadData
 import community.flock.eco.feature.user.forms.UserAccountPasswordForm
 import community.flock.eco.feature.user.services.UserAccountService
@@ -29,7 +29,14 @@ class ApplicationData(
                 .map { it.toName() }
                 .toSet()
         userAccountService
-            .createUserAccountPassword(UserAccountPasswordForm(name = "Test", email = "test@test.nl", password = "test", authorities = all))
+            .createUserAccountPassword(
+                UserAccountPasswordForm(
+                    name = "Test",
+                    email = "test@test.nl",
+                    password = "test",
+                    authorities = all,
+                ),
+            )
         userLoadData.load(10)
         memberLoadData.load(100)
         workspaceLoadData.load()
diff --git a/eco-application/eco-application-example/src/main/kotlin/authorities/ExampleAuthority.kt b/eco-application/eco-application-example/src/main/kotlin/community/flock/eco/application/example/authorities/ExampleAuthority.kt
similarity index 100%
rename from eco-application/eco-application-example/src/main/kotlin/authorities/ExampleAuthority.kt
rename to eco-application/eco-application-example/src/main/kotlin/community/flock/eco/application/example/authorities/ExampleAuthority.kt
diff --git a/eco-application/eco-application-example/src/main/kotlin/configuration/WebMvcConfig.kt b/eco-application/eco-application-example/src/main/kotlin/community/flock/eco/application/example/configuration/WebMvcConfig.kt
similarity index 100%
rename from eco-application/eco-application-example/src/main/kotlin/configuration/WebMvcConfig.kt
rename to eco-application/eco-application-example/src/main/kotlin/community/flock/eco/application/example/configuration/WebMvcConfig.kt
diff --git a/eco-application/eco-application-example/src/main/kotlin/configuration/WebSecurityConfig.kt b/eco-application/eco-application-example/src/main/kotlin/community/flock/eco/application/example/configuration/WebSecurityConfig.kt
similarity index 100%
rename from eco-application/eco-application-example/src/main/kotlin/configuration/WebSecurityConfig.kt
rename to eco-application/eco-application-example/src/main/kotlin/community/flock/eco/application/example/configuration/WebSecurityConfig.kt
diff --git a/eco-application/eco-application-example/src/main/kotlin/controllers/HealthController.kt b/eco-application/eco-application-example/src/main/kotlin/community/flock/eco/application/example/controllers/HealthController.kt
similarity index 100%
rename from eco-application/eco-application-example/src/main/kotlin/controllers/HealthController.kt
rename to eco-application/eco-application-example/src/main/kotlin/community/flock/eco/application/example/controllers/HealthController.kt
diff --git a/eco-application/eco-application-example/src/main/kotlin/providers/WorkspaceUserProviderImp.kt b/eco-application/eco-application-example/src/main/kotlin/community/flock/eco/application/example/providers/WorkspaceUserProviderImp.kt
similarity index 100%
rename from eco-application/eco-application-example/src/main/kotlin/providers/WorkspaceUserProviderImp.kt
rename to eco-application/eco-application-example/src/main/kotlin/community/flock/eco/application/example/providers/WorkspaceUserProviderImp.kt
diff --git a/eco-application/eco-application-multi_tenant/src/main/kotlin/Application.kt b/eco-application/eco-application-multi_tenant/src/main/kotlin/community/flock/eco/application/multitenant/Application.kt
similarity index 85%
rename from eco-application/eco-application-multi_tenant/src/main/kotlin/Application.kt
rename to eco-application/eco-application-multi_tenant/src/main/kotlin/community/flock/eco/application/multitenant/Application.kt
index e34c0aea..226ea42a 100644
--- a/eco-application/eco-application-multi_tenant/src/main/kotlin/Application.kt
+++ b/eco-application/eco-application-multi_tenant/src/main/kotlin/community/flock/eco/application/multitenant/Application.kt
@@ -1,7 +1,7 @@
 package community.flock.eco.application.multitenant
 
-import community.flock.eco.application.multitenant.config.WebMvcConfig
-import community.flock.eco.application.multitenant.config.WebSecurityConfig
+import community.flock.eco.application.multitenant.configuration.WebMvcConfig
+import community.flock.eco.application.multitenant.configuration.WebSecurityConfig
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration
diff --git a/eco-application/eco-application-multi_tenant/src/main/kotlin/ApplicationConfiguration.kt b/eco-application/eco-application-multi_tenant/src/main/kotlin/community/flock/eco/application/multitenant/ApplicationConfiguration.kt
similarity index 100%
rename from eco-application/eco-application-multi_tenant/src/main/kotlin/ApplicationConfiguration.kt
rename to eco-application/eco-application-multi_tenant/src/main/kotlin/community/flock/eco/application/multitenant/ApplicationConfiguration.kt
diff --git a/eco-application/eco-application-multi_tenant/src/main/kotlin/configuration/WebMvcConfig.kt b/eco-application/eco-application-multi_tenant/src/main/kotlin/community/flock/eco/application/multitenant/configuration/WebMvcConfig.kt
similarity index 89%
rename from eco-application/eco-application-multi_tenant/src/main/kotlin/configuration/WebMvcConfig.kt
rename to eco-application/eco-application-multi_tenant/src/main/kotlin/community/flock/eco/application/multitenant/configuration/WebMvcConfig.kt
index d7baa261..7597c295 100644
--- a/eco-application/eco-application-multi_tenant/src/main/kotlin/configuration/WebMvcConfig.kt
+++ b/eco-application/eco-application-multi_tenant/src/main/kotlin/community/flock/eco/application/multitenant/configuration/WebMvcConfig.kt
@@ -1,4 +1,4 @@
-package community.flock.eco.application.multitenant.config
+package community.flock.eco.application.multitenant.configuration
 
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
diff --git a/eco-application/eco-application-multi_tenant/src/main/kotlin/configuration/WebSecurityConfig.kt b/eco-application/eco-application-multi_tenant/src/main/kotlin/community/flock/eco/application/multitenant/configuration/WebSecurityConfig.kt
similarity index 97%
rename from eco-application/eco-application-multi_tenant/src/main/kotlin/configuration/WebSecurityConfig.kt
rename to eco-application/eco-application-multi_tenant/src/main/kotlin/community/flock/eco/application/multitenant/configuration/WebSecurityConfig.kt
index 3c56f57d..d975d7fc 100644
--- a/eco-application/eco-application-multi_tenant/src/main/kotlin/configuration/WebSecurityConfig.kt
+++ b/eco-application/eco-application-multi_tenant/src/main/kotlin/community/flock/eco/application/multitenant/configuration/WebSecurityConfig.kt
@@ -1,4 +1,4 @@
-package community.flock.eco.application.multitenant.config
+package community.flock.eco.application.multitenant.configuration
 
 import community.flock.eco.feature.multitenant.filters.MultiTenantFilter
 import community.flock.eco.feature.user.filters.UserKeyTokenFilter
diff --git a/eco-application/eco-application-multi_tenant/src/main/kotlin/controllers/RegistrationController.kt b/eco-application/eco-application-multi_tenant/src/main/kotlin/community/flock/eco/application/multitenant/controllers/RegistrationController.kt
similarity index 100%
rename from eco-application/eco-application-multi_tenant/src/main/kotlin/controllers/RegistrationController.kt
rename to eco-application/eco-application-multi_tenant/src/main/kotlin/community/flock/eco/application/multitenant/controllers/RegistrationController.kt
diff --git a/eco-application/eco-application-multi_tenant/src/test/kotlin/CreateMultiTenantTest.kt b/eco-application/eco-application-multi_tenant/src/test/kotlin/community/flock/eco/application/multitenant/CreateMultiTenantTest.kt
similarity index 100%
rename from eco-application/eco-application-multi_tenant/src/test/kotlin/CreateMultiTenantTest.kt
rename to eco-application/eco-application-multi_tenant/src/test/kotlin/community/flock/eco/application/multitenant/CreateMultiTenantTest.kt
diff --git a/eco-application/eco-application-multi_tenant/src/test/kotlin/CrossLoginTenantTest.kt b/eco-application/eco-application-multi_tenant/src/test/kotlin/community/flock/eco/application/multitenant/CrossLoginTenantTest.kt
similarity index 96%
rename from eco-application/eco-application-multi_tenant/src/test/kotlin/CrossLoginTenantTest.kt
rename to eco-application/eco-application-multi_tenant/src/test/kotlin/community/flock/eco/application/multitenant/CrossLoginTenantTest.kt
index 5d92d46d..9c4c9cd2 100644
--- a/eco-application/eco-application-multi_tenant/src/test/kotlin/CrossLoginTenantTest.kt
+++ b/eco-application/eco-application-multi_tenant/src/test/kotlin/community/flock/eco/application/multitenant/CrossLoginTenantTest.kt
@@ -1,4 +1,4 @@
-package community.flock.eco.application.multitenant
+package community.flock.eco.application.multitenant.community.flock.eco.application.multitenant
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import community.flock.eco.application.multitenant.controllers.RegistrationInput
@@ -11,7 +11,6 @@ import org.springframework.mock.web.MockHttpSession
 import org.springframework.test.web.servlet.MockMvc
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders
 import org.springframework.test.web.servlet.result.MockMvcResultHandlers
-import org.springframework.test.web.servlet.result.MockMvcResultMatchers.content
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
 import java.util.UUID
 
diff --git a/eco-application/eco-application-multi_tenant/src/test/kotlin/RegisterTenantTest.kt b/eco-application/eco-application-multi_tenant/src/test/kotlin/community/flock/eco/application/multitenant/RegisterTenantTest.kt
similarity index 95%
rename from eco-application/eco-application-multi_tenant/src/test/kotlin/RegisterTenantTest.kt
rename to eco-application/eco-application-multi_tenant/src/test/kotlin/community/flock/eco/application/multitenant/RegisterTenantTest.kt
index 7eb0ef0c..311d6262 100644
--- a/eco-application/eco-application-multi_tenant/src/test/kotlin/RegisterTenantTest.kt
+++ b/eco-application/eco-application-multi_tenant/src/test/kotlin/community/flock/eco/application/multitenant/RegisterTenantTest.kt
@@ -1,4 +1,4 @@
-package community.flock.eco.application.multitenant
+package community.flock.eco.application.multitenant.community.flock.eco.application.multitenant
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import community.flock.eco.application.multitenant.controllers.RegistrationInput
@@ -13,7 +13,6 @@ import org.springframework.test.web.servlet.MockMvc
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders
 import org.springframework.test.web.servlet.result.MockMvcResultHandlers
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers
-import org.springframework.test.web.servlet.result.MockMvcResultMatchers.content
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
 import java.util.UUID
 
diff --git a/eco-cloud/eco-cloud-aws/src/main/kotlin/AwsCloudConfiguration.kt b/eco-cloud/eco-cloud-aws/src/main/kotlin/community/flock/eco/cloud/aws/AwsCloudConfiguration.kt
similarity index 100%
rename from eco-cloud/eco-cloud-aws/src/main/kotlin/AwsCloudConfiguration.kt
rename to eco-cloud/eco-cloud-aws/src/main/kotlin/community/flock/eco/cloud/aws/AwsCloudConfiguration.kt
diff --git a/eco-cloud/eco-cloud-aws/src/main/kotlin/AwsCloudProperties.kt b/eco-cloud/eco-cloud-aws/src/main/kotlin/community/flock/eco/cloud/aws/AwsCloudProperties.kt
similarity index 100%
rename from eco-cloud/eco-cloud-aws/src/main/kotlin/AwsCloudProperties.kt
rename to eco-cloud/eco-cloud-aws/src/main/kotlin/community/flock/eco/cloud/aws/AwsCloudProperties.kt
diff --git a/eco-cloud/eco-cloud-aws/src/main/kotlin/services/AwsMailService.kt b/eco-cloud/eco-cloud-aws/src/main/kotlin/community/flock/eco/cloud/aws/services/AwsMailService.kt
similarity index 100%
rename from eco-cloud/eco-cloud-aws/src/main/kotlin/services/AwsMailService.kt
rename to eco-cloud/eco-cloud-aws/src/main/kotlin/community/flock/eco/cloud/aws/services/AwsMailService.kt
diff --git a/eco-cloud/eco-cloud-aws/src/main/kotlin/services/AwsStorageService.kt b/eco-cloud/eco-cloud-aws/src/main/kotlin/community/flock/eco/cloud/aws/services/AwsStorageService.kt
similarity index 100%
rename from eco-cloud/eco-cloud-aws/src/main/kotlin/services/AwsStorageService.kt
rename to eco-cloud/eco-cloud-aws/src/main/kotlin/community/flock/eco/cloud/aws/services/AwsStorageService.kt
diff --git a/eco-cloud/eco-cloud-gcp/src/main/kotlin/GcpMailConfiguration.kt b/eco-cloud/eco-cloud-gcp/src/main/kotlin/community/flock/eco/cloud/gcp/GcpMailConfiguration.kt
similarity index 100%
rename from eco-cloud/eco-cloud-gcp/src/main/kotlin/GcpMailConfiguration.kt
rename to eco-cloud/eco-cloud-gcp/src/main/kotlin/community/flock/eco/cloud/gcp/GcpMailConfiguration.kt
diff --git a/eco-cloud/eco-cloud-gcp/src/main/kotlin/GpcCloudProperties.kt b/eco-cloud/eco-cloud-gcp/src/main/kotlin/community/flock/eco/cloud/gcp/GpcCloudProperties.kt
similarity index 100%
rename from eco-cloud/eco-cloud-gcp/src/main/kotlin/GpcCloudProperties.kt
rename to eco-cloud/eco-cloud-gcp/src/main/kotlin/community/flock/eco/cloud/gcp/GpcCloudProperties.kt
diff --git a/eco-cloud/eco-cloud-gcp/src/main/kotlin/services/GpcMailService.kt b/eco-cloud/eco-cloud-gcp/src/main/kotlin/community/flock/eco/cloud/gcp/services/GpcMailService.kt
similarity index 100%
rename from eco-cloud/eco-cloud-gcp/src/main/kotlin/services/GpcMailService.kt
rename to eco-cloud/eco-cloud-gcp/src/main/kotlin/community/flock/eco/cloud/gcp/services/GpcMailService.kt
diff --git a/eco-cloud/eco-cloud-stub/src/main/kotlin/StubCloudConfiguration.kt b/eco-cloud/eco-cloud-stub/src/main/kotlin/community/flock/eco/cloud/stub/StubCloudConfiguration.kt
similarity index 100%
rename from eco-cloud/eco-cloud-stub/src/main/kotlin/StubCloudConfiguration.kt
rename to eco-cloud/eco-cloud-stub/src/main/kotlin/community/flock/eco/cloud/stub/StubCloudConfiguration.kt
diff --git a/eco-cloud/eco-cloud-stub/src/main/kotlin/StubCloudProperties.kt b/eco-cloud/eco-cloud-stub/src/main/kotlin/community/flock/eco/cloud/stub/StubCloudProperties.kt
similarity index 100%
rename from eco-cloud/eco-cloud-stub/src/main/kotlin/StubCloudProperties.kt
rename to eco-cloud/eco-cloud-stub/src/main/kotlin/community/flock/eco/cloud/stub/StubCloudProperties.kt
diff --git a/eco-cloud/eco-cloud-stub/src/main/kotlin/services/StubMailService.kt b/eco-cloud/eco-cloud-stub/src/main/kotlin/community/flock/eco/cloud/stub/services/StubMailService.kt
similarity index 100%
rename from eco-cloud/eco-cloud-stub/src/main/kotlin/services/StubMailService.kt
rename to eco-cloud/eco-cloud-stub/src/main/kotlin/community/flock/eco/cloud/stub/services/StubMailService.kt
diff --git a/eco-cloud/eco-cloud-stub/src/main/kotlin/services/StubStoreService.kt b/eco-cloud/eco-cloud-stub/src/main/kotlin/community/flock/eco/cloud/stub/services/StubStoreService.kt
similarity index 100%
rename from eco-cloud/eco-cloud-stub/src/main/kotlin/services/StubStoreService.kt
rename to eco-cloud/eco-cloud-stub/src/main/kotlin/community/flock/eco/cloud/stub/services/StubStoreService.kt
diff --git a/eco-cloud/eco-cloud-stub/src/test/kotlin/StubStorageServiceTest.kt b/eco-cloud/eco-cloud-stub/src/test/kotlin/community/flock/eco/cloud/stub/StubStorageServiceTest.kt
similarity index 100%
rename from eco-cloud/eco-cloud-stub/src/test/kotlin/StubStorageServiceTest.kt
rename to eco-cloud/eco-cloud-stub/src/test/kotlin/community/flock/eco/cloud/stub/StubStorageServiceTest.kt
diff --git a/eco-core/src/main/kotlin/authorities/Authority.kt b/eco-core/src/main/kotlin/community/community/flock/eco/core/authorities/Authority.kt
similarity index 100%
rename from eco-core/src/main/kotlin/authorities/Authority.kt
rename to eco-core/src/main/kotlin/community/community/flock/eco/core/authorities/Authority.kt
diff --git a/eco-core/src/main/kotlin/configurations/GraphqlConfiguration.kt b/eco-core/src/main/kotlin/community/community/flock/eco/core/configurations/GraphqlConfiguration.kt
similarity index 100%
rename from eco-core/src/main/kotlin/configurations/GraphqlConfiguration.kt
rename to eco-core/src/main/kotlin/community/community/flock/eco/core/configurations/GraphqlConfiguration.kt
diff --git a/eco-core/src/main/kotlin/data/LoadData.kt b/eco-core/src/main/kotlin/community/community/flock/eco/core/data/LoadData.kt
similarity index 100%
rename from eco-core/src/main/kotlin/data/LoadData.kt
rename to eco-core/src/main/kotlin/community/community/flock/eco/core/data/LoadData.kt
diff --git a/eco-core/src/main/kotlin/events/Event.kt b/eco-core/src/main/kotlin/community/community/flock/eco/core/events/Event.kt
similarity index 100%
rename from eco-core/src/main/kotlin/events/Event.kt
rename to eco-core/src/main/kotlin/community/community/flock/eco/core/events/Event.kt
diff --git a/eco-core/src/main/kotlin/events/EventEntityListeners.kt b/eco-core/src/main/kotlin/community/community/flock/eco/core/events/EventEntityListeners.kt
similarity index 100%
rename from eco-core/src/main/kotlin/events/EventEntityListeners.kt
rename to eco-core/src/main/kotlin/community/community/flock/eco/core/events/EventEntityListeners.kt
diff --git a/eco-core/src/main/kotlin/events/StoreEvents.kt b/eco-core/src/main/kotlin/community/community/flock/eco/core/events/StoreEvents.kt
similarity index 100%
rename from eco-core/src/main/kotlin/events/StoreEvents.kt
rename to eco-core/src/main/kotlin/community/community/flock/eco/core/events/StoreEvents.kt
diff --git a/eco-core/src/main/kotlin/exceptions/CannotConnectToObjectStore.kt b/eco-core/src/main/kotlin/community/community/flock/eco/core/exceptions/CannotConnectToObjectStore.kt
similarity index 100%
rename from eco-core/src/main/kotlin/exceptions/CannotConnectToObjectStore.kt
rename to eco-core/src/main/kotlin/community/community/flock/eco/core/exceptions/CannotConnectToObjectStore.kt
diff --git a/eco-core/src/main/kotlin/exceptions/FlockEcoException.kt b/eco-core/src/main/kotlin/community/community/flock/eco/core/exceptions/FlockEcoException.kt
similarity index 100%
rename from eco-core/src/main/kotlin/exceptions/FlockEcoException.kt
rename to eco-core/src/main/kotlin/community/community/flock/eco/core/exceptions/FlockEcoException.kt
diff --git a/eco-core/src/main/kotlin/extentions/PageableExtention.kt b/eco-core/src/main/kotlin/community/community/flock/eco/core/extentions/PageableExtention.kt
similarity index 100%
rename from eco-core/src/main/kotlin/extentions/PageableExtention.kt
rename to eco-core/src/main/kotlin/community/community/flock/eco/core/extentions/PageableExtention.kt
diff --git a/eco-core/src/main/kotlin/model/AbstractCodeEntity.kt b/eco-core/src/main/kotlin/community/community/flock/eco/core/model/AbstractCodeEntity.kt
similarity index 100%
rename from eco-core/src/main/kotlin/model/AbstractCodeEntity.kt
rename to eco-core/src/main/kotlin/community/community/flock/eco/core/model/AbstractCodeEntity.kt
diff --git a/eco-core/src/main/kotlin/model/AbstractEntity.kt b/eco-core/src/main/kotlin/community/community/flock/eco/core/model/AbstractEntity.kt
similarity index 100%
rename from eco-core/src/main/kotlin/model/AbstractEntity.kt
rename to eco-core/src/main/kotlin/community/community/flock/eco/core/model/AbstractEntity.kt
diff --git a/eco-core/src/main/kotlin/model/AbstractIdEntity.kt b/eco-core/src/main/kotlin/community/community/flock/eco/core/model/AbstractIdEntity.kt
similarity index 100%
rename from eco-core/src/main/kotlin/model/AbstractIdEntity.kt
rename to eco-core/src/main/kotlin/community/community/flock/eco/core/model/AbstractIdEntity.kt
diff --git a/eco-core/src/main/kotlin/model/MailMessage.kt b/eco-core/src/main/kotlin/community/community/flock/eco/core/model/MailMessage.kt
similarity index 100%
rename from eco-core/src/main/kotlin/model/MailMessage.kt
rename to eco-core/src/main/kotlin/community/community/flock/eco/core/model/MailMessage.kt
diff --git a/eco-core/src/main/kotlin/services/CrudService.kt b/eco-core/src/main/kotlin/community/community/flock/eco/core/services/CrudService.kt
similarity index 100%
rename from eco-core/src/main/kotlin/services/CrudService.kt
rename to eco-core/src/main/kotlin/community/community/flock/eco/core/services/CrudService.kt
diff --git a/eco-core/src/main/kotlin/services/MailService.kt b/eco-core/src/main/kotlin/community/community/flock/eco/core/services/MailService.kt
similarity index 100%
rename from eco-core/src/main/kotlin/services/MailService.kt
rename to eco-core/src/main/kotlin/community/community/flock/eco/core/services/MailService.kt
diff --git a/eco-core/src/main/kotlin/services/PropertyService.kt b/eco-core/src/main/kotlin/community/community/flock/eco/core/services/PropertyService.kt
similarity index 100%
rename from eco-core/src/main/kotlin/services/PropertyService.kt
rename to eco-core/src/main/kotlin/community/community/flock/eco/core/services/PropertyService.kt
diff --git a/eco-core/src/main/kotlin/services/StorageService.kt b/eco-core/src/main/kotlin/community/community/flock/eco/core/services/StorageService.kt
similarity index 100%
rename from eco-core/src/main/kotlin/services/StorageService.kt
rename to eco-core/src/main/kotlin/community/community/flock/eco/core/services/StorageService.kt
diff --git a/eco-core/src/main/kotlin/utils/ExtensionFunctions.kt b/eco-core/src/main/kotlin/community/community/flock/eco/core/utils/ExtensionFunctions.kt
similarity index 100%
rename from eco-core/src/main/kotlin/utils/ExtensionFunctions.kt
rename to eco-core/src/main/kotlin/community/community/flock/eco/core/utils/ExtensionFunctions.kt
diff --git a/eco-feature/eco-feature-mailchimp/src/main/kotlin/MailchimpConfiguration.kt b/eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/MailchimpConfiguration.kt
similarity index 100%
rename from eco-feature/eco-feature-mailchimp/src/main/kotlin/MailchimpConfiguration.kt
rename to eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/MailchimpConfiguration.kt
diff --git a/eco-feature/eco-feature-mailchimp/src/main/kotlin/authorities/MailchimpCampaignAuthority.kt b/eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/authorities/MailchimpCampaignAuthority.kt
similarity index 100%
rename from eco-feature/eco-feature-mailchimp/src/main/kotlin/authorities/MailchimpCampaignAuthority.kt
rename to eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/authorities/MailchimpCampaignAuthority.kt
diff --git a/eco-feature/eco-feature-mailchimp/src/main/kotlin/authorities/MailchimpMemberAuthority.kt b/eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/authorities/MailchimpMemberAuthority.kt
similarity index 100%
rename from eco-feature/eco-feature-mailchimp/src/main/kotlin/authorities/MailchimpMemberAuthority.kt
rename to eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/authorities/MailchimpMemberAuthority.kt
diff --git a/eco-feature/eco-feature-mailchimp/src/main/kotlin/authorities/MailchimpTemplateAuthority.kt b/eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/authorities/MailchimpTemplateAuthority.kt
similarity index 100%
rename from eco-feature/eco-feature-mailchimp/src/main/kotlin/authorities/MailchimpTemplateAuthority.kt
rename to eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/authorities/MailchimpTemplateAuthority.kt
diff --git a/eco-feature/eco-feature-mailchimp/src/main/kotlin/clients/MailchimpClient.kt b/eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/clients/MailchimpClient.kt
similarity index 100%
rename from eco-feature/eco-feature-mailchimp/src/main/kotlin/clients/MailchimpClient.kt
rename to eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/clients/MailchimpClient.kt
diff --git a/eco-feature/eco-feature-mailchimp/src/main/kotlin/controllers/MailchimpController.kt b/eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/controllers/MailchimpController.kt
similarity index 100%
rename from eco-feature/eco-feature-mailchimp/src/main/kotlin/controllers/MailchimpController.kt
rename to eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/controllers/MailchimpController.kt
diff --git a/eco-feature/eco-feature-mailchimp/src/main/kotlin/events/MailchimpWebhookEvent.kt b/eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/events/MailchimpWebhookEvent.kt
similarity index 100%
rename from eco-feature/eco-feature-mailchimp/src/main/kotlin/events/MailchimpWebhookEvent.kt
rename to eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/events/MailchimpWebhookEvent.kt
diff --git a/eco-feature/eco-feature-mailchimp/src/main/kotlin/exceptions/MailchimpFetchException.kt b/eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/exceptions/MailchimpFetchException.kt
similarity index 100%
rename from eco-feature/eco-feature-mailchimp/src/main/kotlin/exceptions/MailchimpFetchException.kt
rename to eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/exceptions/MailchimpFetchException.kt
diff --git a/eco-feature/eco-feature-mailchimp/src/main/kotlin/model/MailchimpCampaign.kt b/eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/model/MailchimpCampaign.kt
similarity index 100%
rename from eco-feature/eco-feature-mailchimp/src/main/kotlin/model/MailchimpCampaign.kt
rename to eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/model/MailchimpCampaign.kt
diff --git a/eco-feature/eco-feature-mailchimp/src/main/kotlin/model/MailchimpInterest.kt b/eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/model/MailchimpInterest.kt
similarity index 100%
rename from eco-feature/eco-feature-mailchimp/src/main/kotlin/model/MailchimpInterest.kt
rename to eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/model/MailchimpInterest.kt
diff --git a/eco-feature/eco-feature-mailchimp/src/main/kotlin/model/MailchimpInterestCategory.kt b/eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/model/MailchimpInterestCategory.kt
similarity index 100%
rename from eco-feature/eco-feature-mailchimp/src/main/kotlin/model/MailchimpInterestCategory.kt
rename to eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/model/MailchimpInterestCategory.kt
diff --git a/eco-feature/eco-feature-mailchimp/src/main/kotlin/model/MailchimpList.kt b/eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/model/MailchimpList.kt
similarity index 100%
rename from eco-feature/eco-feature-mailchimp/src/main/kotlin/model/MailchimpList.kt
rename to eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/model/MailchimpList.kt
diff --git a/eco-feature/eco-feature-mailchimp/src/main/kotlin/model/MailchimpMember.kt b/eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/model/MailchimpMember.kt
similarity index 100%
rename from eco-feature/eco-feature-mailchimp/src/main/kotlin/model/MailchimpMember.kt
rename to eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/model/MailchimpMember.kt
diff --git a/eco-feature/eco-feature-mailchimp/src/main/kotlin/model/MailchimpMemberStatus.kt b/eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/model/MailchimpMemberStatus.kt
similarity index 100%
rename from eco-feature/eco-feature-mailchimp/src/main/kotlin/model/MailchimpMemberStatus.kt
rename to eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/model/MailchimpMemberStatus.kt
diff --git a/eco-feature/eco-feature-mailchimp/src/main/kotlin/model/MailchimpTemplate.kt b/eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/model/MailchimpTemplate.kt
similarity index 100%
rename from eco-feature/eco-feature-mailchimp/src/main/kotlin/model/MailchimpTemplate.kt
rename to eco-feature/eco-feature-mailchimp/src/main/kotlin/community/flock/eco/feature/mailchimp/model/MailchimpTemplate.kt
diff --git a/eco-feature/eco-feature-mailchimp/src/test/kotlin/clients/MailchimpClientTest.kt b/eco-feature/eco-feature-mailchimp/src/test/kotlin/community/flock/eco/feature/mailchimp/clients/MailchimpClientTest.kt
similarity index 100%
rename from eco-feature/eco-feature-mailchimp/src/test/kotlin/clients/MailchimpClientTest.kt
rename to eco-feature/eco-feature-mailchimp/src/test/kotlin/community/flock/eco/feature/mailchimp/clients/MailchimpClientTest.kt
diff --git a/eco-feature/eco-feature-member/src/develop/kotlin/develop/data/MemberLoadData.kt b/eco-feature/eco-feature-member/src/develop/kotlin/community/flock/eco/feature/member/develop/MemberLoadData.kt
similarity index 98%
rename from eco-feature/eco-feature-member/src/develop/kotlin/develop/data/MemberLoadData.kt
rename to eco-feature/eco-feature-member/src/develop/kotlin/community/flock/eco/feature/member/develop/MemberLoadData.kt
index 532325b2..661a877b 100644
--- a/eco-feature/eco-feature-member/src/develop/kotlin/develop/data/MemberLoadData.kt
+++ b/eco-feature/eco-feature-member/src/develop/kotlin/community/flock/eco/feature/member/develop/MemberLoadData.kt
@@ -1,4 +1,4 @@
-package community.flock.eco.feature.member.develop.data
+package community.flock.eco.feature.member.develop
 
 import community.flock.eco.core.data.LoadData
 import community.flock.eco.feature.member.model.Member
diff --git a/eco-feature/eco-feature-member/src/main/kotlin/MemberConfiguration.kt b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/MemberConfiguration.kt
similarity index 95%
rename from eco-feature/eco-feature-member/src/main/kotlin/MemberConfiguration.kt
rename to eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/MemberConfiguration.kt
index 16be926a..92802193 100644
--- a/eco-feature/eco-feature-member/src/main/kotlin/MemberConfiguration.kt
+++ b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/MemberConfiguration.kt
@@ -1,6 +1,5 @@
 package community.flock.eco.feature.member
 
-import LanguageIsoConfiguration
 import community.flock.eco.core.configurations.GraphqlConfiguration
 import community.flock.eco.feature.member.controllers.MemberController
 import community.flock.eco.feature.member.controllers.MemberFieldController
@@ -11,6 +10,7 @@ import community.flock.eco.feature.member.services.MemberFieldService
 import community.flock.eco.feature.member.services.MemberGroupService
 import community.flock.eco.feature.member.services.MemberService
 import community.flock.eco.iso.country.CountryIsoConfiguration
+import community.flock.eco.iso.language.LanguageIsoConfiguration
 import org.springframework.boot.autoconfigure.domain.EntityScan
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Import
diff --git a/eco-feature/eco-feature-member/src/main/kotlin/authorities/MemberAuthority.kt b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/authorities/MemberAuthority.kt
similarity index 100%
rename from eco-feature/eco-feature-member/src/main/kotlin/authorities/MemberAuthority.kt
rename to eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/authorities/MemberAuthority.kt
diff --git a/eco-feature/eco-feature-member/src/main/kotlin/authorities/MemberFieldAuthority.kt b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/authorities/MemberFieldAuthority.kt
similarity index 100%
rename from eco-feature/eco-feature-member/src/main/kotlin/authorities/MemberFieldAuthority.kt
rename to eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/authorities/MemberFieldAuthority.kt
diff --git a/eco-feature/eco-feature-member/src/main/kotlin/authorities/MemberGroupAuthority.kt b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/authorities/MemberGroupAuthority.kt
similarity index 100%
rename from eco-feature/eco-feature-member/src/main/kotlin/authorities/MemberGroupAuthority.kt
rename to eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/authorities/MemberGroupAuthority.kt
diff --git a/eco-feature/eco-feature-member/src/main/kotlin/controllers/MemberController.kt b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/controllers/MemberController.kt
similarity index 100%
rename from eco-feature/eco-feature-member/src/main/kotlin/controllers/MemberController.kt
rename to eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/controllers/MemberController.kt
diff --git a/eco-feature/eco-feature-member/src/main/kotlin/controllers/MemberFieldController.kt b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/controllers/MemberFieldController.kt
similarity index 100%
rename from eco-feature/eco-feature-member/src/main/kotlin/controllers/MemberFieldController.kt
rename to eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/controllers/MemberFieldController.kt
diff --git a/eco-feature/eco-feature-member/src/main/kotlin/controllers/MemberGroupController.kt b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/controllers/MemberGroupController.kt
similarity index 100%
rename from eco-feature/eco-feature-member/src/main/kotlin/controllers/MemberGroupController.kt
rename to eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/controllers/MemberGroupController.kt
diff --git a/eco-feature/eco-feature-member/src/main/kotlin/events/MemberEvents.kt b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/events/MemberEvents.kt
similarity index 100%
rename from eco-feature/eco-feature-member/src/main/kotlin/events/MemberEvents.kt
rename to eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/events/MemberEvents.kt
diff --git a/eco-feature/eco-feature-member/src/main/kotlin/events/MemberFieldEvents.kt b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/events/MemberFieldEvents.kt
similarity index 100%
rename from eco-feature/eco-feature-member/src/main/kotlin/events/MemberFieldEvents.kt
rename to eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/events/MemberFieldEvents.kt
diff --git a/eco-feature/eco-feature-member/src/main/kotlin/events/MemberGroupEvents.kt b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/events/MemberGroupEvents.kt
similarity index 100%
rename from eco-feature/eco-feature-member/src/main/kotlin/events/MemberGroupEvents.kt
rename to eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/events/MemberGroupEvents.kt
diff --git a/eco-feature/eco-feature-member/src/main/kotlin/mapper/MemberGraphqlMapper.kt b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/mapper/MemberGraphqlMapper.kt
similarity index 100%
rename from eco-feature/eco-feature-member/src/main/kotlin/mapper/MemberGraphqlMapper.kt
rename to eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/mapper/MemberGraphqlMapper.kt
diff --git a/eco-feature/eco-feature-member/src/main/kotlin/model/Member.kt b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/model/Member.kt
similarity index 100%
rename from eco-feature/eco-feature-member/src/main/kotlin/model/Member.kt
rename to eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/model/Member.kt
diff --git a/eco-feature/eco-feature-member/src/main/kotlin/model/MemberField.kt b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/model/MemberField.kt
similarity index 100%
rename from eco-feature/eco-feature-member/src/main/kotlin/model/MemberField.kt
rename to eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/model/MemberField.kt
diff --git a/eco-feature/eco-feature-member/src/main/kotlin/model/MemberFieldType.kt b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/model/MemberFieldType.kt
similarity index 100%
rename from eco-feature/eco-feature-member/src/main/kotlin/model/MemberFieldType.kt
rename to eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/model/MemberFieldType.kt
diff --git a/eco-feature/eco-feature-member/src/main/kotlin/model/MemberGender.kt b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/model/MemberGender.kt
similarity index 100%
rename from eco-feature/eco-feature-member/src/main/kotlin/model/MemberGender.kt
rename to eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/model/MemberGender.kt
diff --git a/eco-feature/eco-feature-member/src/main/kotlin/model/MemberGroup.kt b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/model/MemberGroup.kt
similarity index 100%
rename from eco-feature/eco-feature-member/src/main/kotlin/model/MemberGroup.kt
rename to eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/model/MemberGroup.kt
diff --git a/eco-feature/eco-feature-member/src/main/kotlin/model/MemberStatus.kt b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/model/MemberStatus.kt
similarity index 100%
rename from eco-feature/eco-feature-member/src/main/kotlin/model/MemberStatus.kt
rename to eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/model/MemberStatus.kt
diff --git a/eco-feature/eco-feature-member/src/main/kotlin/repositories/MemberFieldRepository.kt b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/repositories/MemberFieldRepository.kt
similarity index 100%
rename from eco-feature/eco-feature-member/src/main/kotlin/repositories/MemberFieldRepository.kt
rename to eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/repositories/MemberFieldRepository.kt
diff --git a/eco-feature/eco-feature-member/src/main/kotlin/repositories/MemberGroupRepository.kt b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/repositories/MemberGroupRepository.kt
similarity index 100%
rename from eco-feature/eco-feature-member/src/main/kotlin/repositories/MemberGroupRepository.kt
rename to eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/repositories/MemberGroupRepository.kt
diff --git a/eco-feature/eco-feature-member/src/main/kotlin/repositories/MemberRepository.kt b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/repositories/MemberRepository.kt
similarity index 100%
rename from eco-feature/eco-feature-member/src/main/kotlin/repositories/MemberRepository.kt
rename to eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/repositories/MemberRepository.kt
diff --git a/eco-feature/eco-feature-member/src/main/kotlin/resolvers/MemberQueryResolver.kt b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/resolvers/MemberQueryResolver.kt
similarity index 100%
rename from eco-feature/eco-feature-member/src/main/kotlin/resolvers/MemberQueryResolver.kt
rename to eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/resolvers/MemberQueryResolver.kt
diff --git a/eco-feature/eco-feature-member/src/main/kotlin/services/MemberFieldService.kt b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/services/MemberFieldService.kt
similarity index 100%
rename from eco-feature/eco-feature-member/src/main/kotlin/services/MemberFieldService.kt
rename to eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/services/MemberFieldService.kt
diff --git a/eco-feature/eco-feature-member/src/main/kotlin/services/MemberGroupService.kt b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/services/MemberGroupService.kt
similarity index 100%
rename from eco-feature/eco-feature-member/src/main/kotlin/services/MemberGroupService.kt
rename to eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/services/MemberGroupService.kt
diff --git a/eco-feature/eco-feature-member/src/main/kotlin/services/MemberService.kt b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/services/MemberService.kt
similarity index 100%
rename from eco-feature/eco-feature-member/src/main/kotlin/services/MemberService.kt
rename to eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/services/MemberService.kt
diff --git a/eco-feature/eco-feature-member/src/main/kotlin/specifications/MemberSpecification.kt b/eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/specifications/MemberSpecification.kt
similarity index 100%
rename from eco-feature/eco-feature-member/src/main/kotlin/specifications/MemberSpecification.kt
rename to eco-feature/eco-feature-member/src/main/kotlin/community/flock/eco/feature/member/specifications/MemberSpecification.kt
diff --git a/eco-feature/eco-feature-member/src/test/kotlin/repositories/MemberRepositoryTest.kt b/eco-feature/eco-feature-member/src/test/kotlin/community/flock/eco/feature/member/repositories/MemberRepositoryTest.kt
similarity index 100%
rename from eco-feature/eco-feature-member/src/test/kotlin/repositories/MemberRepositoryTest.kt
rename to eco-feature/eco-feature-member/src/test/kotlin/community/flock/eco/feature/member/repositories/MemberRepositoryTest.kt
diff --git a/eco-feature/eco-feature-member/src/test/kotlin/services/MemberServiceTest.kt b/eco-feature/eco-feature-member/src/test/kotlin/community/flock/eco/feature/member/services/MemberServiceTest.kt
similarity index 96%
rename from eco-feature/eco-feature-member/src/test/kotlin/services/MemberServiceTest.kt
rename to eco-feature/eco-feature-member/src/test/kotlin/community/flock/eco/feature/member/services/MemberServiceTest.kt
index 39a11b6e..03308236 100644
--- a/eco-feature/eco-feature-member/src/test/kotlin/services/MemberServiceTest.kt
+++ b/eco-feature/eco-feature-member/src/test/kotlin/community/flock/eco/feature/member/services/MemberServiceTest.kt
@@ -1,9 +1,8 @@
-package services
+package community.flock.eco.feature.member.services
 
 import community.flock.eco.feature.member.events.UpdateMemberEvent
 import community.flock.eco.feature.member.model.Member
 import community.flock.eco.feature.member.repositories.MemberRepository
-import community.flock.eco.feature.member.services.MemberService
 import io.mockk.every
 import io.mockk.justRun
 import io.mockk.mockk
diff --git a/eco-feature/eco-feature-member/src/test/kotlin/specifications/MemberSpecificationTest.kt b/eco-feature/eco-feature-member/src/test/kotlin/community/flock/eco/feature/member/specifications/MemberSpecificationTest.kt
similarity index 98%
rename from eco-feature/eco-feature-member/src/test/kotlin/specifications/MemberSpecificationTest.kt
rename to eco-feature/eco-feature-member/src/test/kotlin/community/flock/eco/feature/member/specifications/MemberSpecificationTest.kt
index 6d5d0f06..99198860 100644
--- a/eco-feature/eco-feature-member/src/test/kotlin/specifications/MemberSpecificationTest.kt
+++ b/eco-feature/eco-feature-member/src/test/kotlin/community/flock/eco/feature/member/specifications/MemberSpecificationTest.kt
@@ -1,7 +1,7 @@
 package community.flock.eco.feature.member.specifications
 
 import community.flock.eco.feature.member.MemberConfiguration
-import community.flock.eco.feature.member.develop.data.MemberLoadData
+import community.flock.eco.feature.member.develop.MemberLoadData
 import community.flock.eco.feature.member.model.MemberStatus
 import community.flock.eco.feature.member.repositories.MemberRepository
 import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/eco-feature/eco-feature-multi_tenant/src/main/kotlin/MultiTenantConfiguration.kt b/eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/MultiTenantConfiguration.kt
similarity index 100%
rename from eco-feature/eco-feature-multi_tenant/src/main/kotlin/MultiTenantConfiguration.kt
rename to eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/MultiTenantConfiguration.kt
diff --git a/eco-feature/eco-feature-multi_tenant/src/main/kotlin/MultiTenantConnectionProvider.kt b/eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/MultiTenantConnectionProvider.kt
similarity index 100%
rename from eco-feature/eco-feature-multi_tenant/src/main/kotlin/MultiTenantConnectionProvider.kt
rename to eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/MultiTenantConnectionProvider.kt
diff --git a/eco-feature/eco-feature-multi_tenant/src/main/kotlin/MultiTenantConstants.kt b/eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/MultiTenantConstants.kt
similarity index 100%
rename from eco-feature/eco-feature-multi_tenant/src/main/kotlin/MultiTenantConstants.kt
rename to eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/MultiTenantConstants.kt
diff --git a/eco-feature/eco-feature-multi_tenant/src/main/kotlin/MultiTenantContext.kt b/eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/MultiTenantContext.kt
similarity index 100%
rename from eco-feature/eco-feature-multi_tenant/src/main/kotlin/MultiTenantContext.kt
rename to eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/MultiTenantContext.kt
diff --git a/eco-feature/eco-feature-multi_tenant/src/main/kotlin/MultiTenantSchemaResolver.kt b/eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/MultiTenantSchemaResolver.kt
similarity index 100%
rename from eco-feature/eco-feature-multi_tenant/src/main/kotlin/MultiTenantSchemaResolver.kt
rename to eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/MultiTenantSchemaResolver.kt
diff --git a/eco-feature/eco-feature-multi_tenant/src/main/kotlin/controllers/MultiTenantController.kt b/eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/controllers/MultiTenantController.kt
similarity index 100%
rename from eco-feature/eco-feature-multi_tenant/src/main/kotlin/controllers/MultiTenantController.kt
rename to eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/controllers/MultiTenantController.kt
diff --git a/eco-feature/eco-feature-multi_tenant/src/main/kotlin/events/MultiTenantCreateEvent.kt b/eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/events/MultiTenantCreateEvent.kt
similarity index 100%
rename from eco-feature/eco-feature-multi_tenant/src/main/kotlin/events/MultiTenantCreateEvent.kt
rename to eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/events/MultiTenantCreateEvent.kt
diff --git a/eco-feature/eco-feature-multi_tenant/src/main/kotlin/events/MultiTenantDeleteEvent.kt b/eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/events/MultiTenantDeleteEvent.kt
similarity index 100%
rename from eco-feature/eco-feature-multi_tenant/src/main/kotlin/events/MultiTenantDeleteEvent.kt
rename to eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/events/MultiTenantDeleteEvent.kt
diff --git a/eco-feature/eco-feature-multi_tenant/src/main/kotlin/events/MultiTenantEvent.kt b/eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/events/MultiTenantEvent.kt
similarity index 100%
rename from eco-feature/eco-feature-multi_tenant/src/main/kotlin/events/MultiTenantEvent.kt
rename to eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/events/MultiTenantEvent.kt
diff --git a/eco-feature/eco-feature-multi_tenant/src/main/kotlin/filters/MultiTenantFilter.kt b/eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/filters/MultiTenantFilter.kt
similarity index 100%
rename from eco-feature/eco-feature-multi_tenant/src/main/kotlin/filters/MultiTenantFilter.kt
rename to eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/filters/MultiTenantFilter.kt
diff --git a/eco-feature/eco-feature-multi_tenant/src/main/kotlin/model/MultiTenant.kt b/eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/model/MultiTenant.kt
similarity index 100%
rename from eco-feature/eco-feature-multi_tenant/src/main/kotlin/model/MultiTenant.kt
rename to eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/model/MultiTenant.kt
diff --git a/eco-feature/eco-feature-multi_tenant/src/main/kotlin/model/MultiTenantKeyValue.kt b/eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/model/MultiTenantKeyValue.kt
similarity index 100%
rename from eco-feature/eco-feature-multi_tenant/src/main/kotlin/model/MultiTenantKeyValue.kt
rename to eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/model/MultiTenantKeyValue.kt
diff --git a/eco-feature/eco-feature-multi_tenant/src/main/kotlin/repositories/MultiTenantKeyValueRepository.kt b/eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/repositories/MultiTenantKeyValueRepository.kt
similarity index 100%
rename from eco-feature/eco-feature-multi_tenant/src/main/kotlin/repositories/MultiTenantKeyValueRepository.kt
rename to eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/repositories/MultiTenantKeyValueRepository.kt
diff --git a/eco-feature/eco-feature-multi_tenant/src/main/kotlin/services/MultiTenantKeyValueService.kt b/eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/services/MultiTenantKeyValueService.kt
similarity index 100%
rename from eco-feature/eco-feature-multi_tenant/src/main/kotlin/services/MultiTenantKeyValueService.kt
rename to eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/services/MultiTenantKeyValueService.kt
diff --git a/eco-feature/eco-feature-multi_tenant/src/main/kotlin/services/MultiTenantSchemaService.kt b/eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/services/MultiTenantSchemaService.kt
similarity index 100%
rename from eco-feature/eco-feature-multi_tenant/src/main/kotlin/services/MultiTenantSchemaService.kt
rename to eco-feature/eco-feature-multi_tenant/src/main/kotlin/community/flock/eco/feature/multitenant/services/MultiTenantSchemaService.kt
diff --git a/eco-feature/eco-feature-payment/src/main/kotlin/PaymentConfiguration.kt b/eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/PaymentConfiguration.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/main/kotlin/PaymentConfiguration.kt
rename to eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/PaymentConfiguration.kt
diff --git a/eco-feature/eco-feature-payment/src/main/kotlin/authorities/PaymentMandateAuthority.kt b/eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/authorities/PaymentMandateAuthority.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/main/kotlin/authorities/PaymentMandateAuthority.kt
rename to eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/authorities/PaymentMandateAuthority.kt
diff --git a/eco-feature/eco-feature-payment/src/main/kotlin/authorities/PaymentTransactionAuthority.kt b/eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/authorities/PaymentTransactionAuthority.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/main/kotlin/authorities/PaymentTransactionAuthority.kt
rename to eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/authorities/PaymentTransactionAuthority.kt
diff --git a/eco-feature/eco-feature-payment/src/main/kotlin/controllers/PaymentBuckarooController.kt b/eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/controllers/PaymentBuckarooController.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/main/kotlin/controllers/PaymentBuckarooController.kt
rename to eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/controllers/PaymentBuckarooController.kt
diff --git a/eco-feature/eco-feature-payment/src/main/kotlin/controllers/PaymentMandateController.kt b/eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/controllers/PaymentMandateController.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/main/kotlin/controllers/PaymentMandateController.kt
rename to eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/controllers/PaymentMandateController.kt
diff --git a/eco-feature/eco-feature-payment/src/main/kotlin/controllers/PaymentTransactionController.kt b/eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/controllers/PaymentTransactionController.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/main/kotlin/controllers/PaymentTransactionController.kt
rename to eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/controllers/PaymentTransactionController.kt
diff --git a/eco-feature/eco-feature-payment/src/main/kotlin/data/PaymentLoadData.kt b/eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/data/PaymentLoadData.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/main/kotlin/data/PaymentLoadData.kt
rename to eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/data/PaymentLoadData.kt
diff --git a/eco-feature/eco-feature-payment/src/main/kotlin/event/PaymentFailureEvent.kt b/eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/event/PaymentFailureEvent.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/main/kotlin/event/PaymentFailureEvent.kt
rename to eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/event/PaymentFailureEvent.kt
diff --git a/eco-feature/eco-feature-payment/src/main/kotlin/event/PaymentSuccessEvent.kt b/eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/event/PaymentSuccessEvent.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/main/kotlin/event/PaymentSuccessEvent.kt
rename to eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/event/PaymentSuccessEvent.kt
diff --git a/eco-feature/eco-feature-payment/src/main/kotlin/exceptions/PaymentNotCreatedException.kt b/eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/exceptions/PaymentNotCreatedException.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/main/kotlin/exceptions/PaymentNotCreatedException.kt
rename to eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/exceptions/PaymentNotCreatedException.kt
diff --git a/eco-feature/eco-feature-payment/src/main/kotlin/model/PaymentBankAccount.kt b/eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/model/PaymentBankAccount.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/main/kotlin/model/PaymentBankAccount.kt
rename to eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/model/PaymentBankAccount.kt
diff --git a/eco-feature/eco-feature-payment/src/main/kotlin/model/PaymentFrequency.kt b/eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/model/PaymentFrequency.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/main/kotlin/model/PaymentFrequency.kt
rename to eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/model/PaymentFrequency.kt
diff --git a/eco-feature/eco-feature-payment/src/main/kotlin/model/PaymentMandate.kt b/eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/model/PaymentMandate.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/main/kotlin/model/PaymentMandate.kt
rename to eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/model/PaymentMandate.kt
diff --git a/eco-feature/eco-feature-payment/src/main/kotlin/model/PaymentTransaction.kt b/eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/model/PaymentTransaction.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/main/kotlin/model/PaymentTransaction.kt
rename to eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/model/PaymentTransaction.kt
diff --git a/eco-feature/eco-feature-payment/src/main/kotlin/model/PaymentTransactionStatus.kt b/eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/model/PaymentTransactionStatus.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/main/kotlin/model/PaymentTransactionStatus.kt
rename to eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/model/PaymentTransactionStatus.kt
diff --git a/eco-feature/eco-feature-payment/src/main/kotlin/model/PaymentType.kt b/eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/model/PaymentType.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/main/kotlin/model/PaymentType.kt
rename to eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/model/PaymentType.kt
diff --git a/eco-feature/eco-feature-payment/src/main/kotlin/repositories/PaymentMandateRepository.kt b/eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/repositories/PaymentMandateRepository.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/main/kotlin/repositories/PaymentMandateRepository.kt
rename to eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/repositories/PaymentMandateRepository.kt
diff --git a/eco-feature/eco-feature-payment/src/main/kotlin/repositories/PaymentTransactionRepository.kt b/eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/repositories/PaymentTransactionRepository.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/main/kotlin/repositories/PaymentTransactionRepository.kt
rename to eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/repositories/PaymentTransactionRepository.kt
diff --git a/eco-feature/eco-feature-payment/src/main/kotlin/services/PaymentBuckarooService.kt b/eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/services/PaymentBuckarooService.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/main/kotlin/services/PaymentBuckarooService.kt
rename to eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/services/PaymentBuckarooService.kt
diff --git a/eco-feature/eco-feature-payment/src/main/kotlin/services/PaymentSepaService.kt b/eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/services/PaymentSepaService.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/main/kotlin/services/PaymentSepaService.kt
rename to eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/services/PaymentSepaService.kt
diff --git a/eco-feature/eco-feature-payment/src/main/kotlin/services/PaymentSepaXmlService.kt b/eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/services/PaymentSepaXmlService.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/main/kotlin/services/PaymentSepaXmlService.kt
rename to eco-feature/eco-feature-payment/src/main/kotlin/community/flock/eco/feature/payment/services/PaymentSepaXmlService.kt
diff --git a/eco-feature/eco-feature-payment/src/test/kotlin/mapper/MapperTest.kt b/eco-feature/eco-feature-payment/src/test/kotlin/community/flock/eco/feature/payment/mapper/MapperTest.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/test/kotlin/mapper/MapperTest.kt
rename to eco-feature/eco-feature-payment/src/test/kotlin/community/flock/eco/feature/payment/mapper/MapperTest.kt
diff --git a/eco-feature/eco-feature-payment/src/test/kotlin/repositories/PaymentRepositoryTest.kt b/eco-feature/eco-feature-payment/src/test/kotlin/community/flock/eco/feature/payment/repositories/PaymentRepositoryTest.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/test/kotlin/repositories/PaymentRepositoryTest.kt
rename to eco-feature/eco-feature-payment/src/test/kotlin/community/flock/eco/feature/payment/repositories/PaymentRepositoryTest.kt
diff --git a/eco-feature/eco-feature-payment/src/test/kotlin/service/PaymentBuckarooServiceTest.kt b/eco-feature/eco-feature-payment/src/test/kotlin/community/flock/eco/feature/payment/service/PaymentBuckarooServiceTest.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/test/kotlin/service/PaymentBuckarooServiceTest.kt
rename to eco-feature/eco-feature-payment/src/test/kotlin/community/flock/eco/feature/payment/service/PaymentBuckarooServiceTest.kt
diff --git a/eco-feature/eco-feature-payment/src/test/kotlin/service/PaymentSepaServiceTest.kt b/eco-feature/eco-feature-payment/src/test/kotlin/community/flock/eco/feature/payment/service/PaymentSepaServiceTest.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/test/kotlin/service/PaymentSepaServiceTest.kt
rename to eco-feature/eco-feature-payment/src/test/kotlin/community/flock/eco/feature/payment/service/PaymentSepaServiceTest.kt
diff --git a/eco-feature/eco-feature-payment/src/test/kotlin/service/PaymentSepaXmlServiceTest.kt b/eco-feature/eco-feature-payment/src/test/kotlin/community/flock/eco/feature/payment/service/PaymentSepaXmlServiceTest.kt
similarity index 100%
rename from eco-feature/eco-feature-payment/src/test/kotlin/service/PaymentSepaXmlServiceTest.kt
rename to eco-feature/eco-feature-payment/src/test/kotlin/community/flock/eco/feature/payment/service/PaymentSepaXmlServiceTest.kt
diff --git a/eco-feature/eco-feature-user/src/develop/kotlin/develop/data/UserGroupLoadData.kt b/eco-feature/eco-feature-user/src/develop/kotlin/community/flock/eco/feature/user/develop/data/UserGroupLoadData.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/develop/kotlin/develop/data/UserGroupLoadData.kt
rename to eco-feature/eco-feature-user/src/develop/kotlin/community/flock/eco/feature/user/develop/data/UserGroupLoadData.kt
diff --git a/eco-feature/eco-feature-user/src/develop/kotlin/develop/data/UserLoadData.kt b/eco-feature/eco-feature-user/src/develop/kotlin/community/flock/eco/feature/user/develop/data/UserLoadData.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/develop/kotlin/develop/data/UserLoadData.kt
rename to eco-feature/eco-feature-user/src/develop/kotlin/community/flock/eco/feature/user/develop/data/UserLoadData.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/UserConfiguration.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/UserConfiguration.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/UserConfiguration.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/UserConfiguration.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/UserProperties.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/UserProperties.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/UserProperties.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/UserProperties.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/authorities/UserAuthority.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/authorities/UserAuthority.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/authorities/UserAuthority.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/authorities/UserAuthority.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/controllers/UserAccountController.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/controllers/UserAccountController.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/controllers/UserAccountController.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/controllers/UserAccountController.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/controllers/UserAuthorityController.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/controllers/UserAuthorityController.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/controllers/UserAuthorityController.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/controllers/UserAuthorityController.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/controllers/UserController.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/controllers/UserController.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/controllers/UserController.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/controllers/UserController.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/controllers/UserControllerAdvice.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/controllers/UserControllerAdvice.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/controllers/UserControllerAdvice.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/controllers/UserControllerAdvice.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/controllers/UserGroupController.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/controllers/UserGroupController.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/controllers/UserGroupController.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/controllers/UserGroupController.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/controllers/UserRegisterController.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/controllers/UserRegisterController.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/controllers/UserRegisterController.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/controllers/UserRegisterController.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/controllers/UserStatusController.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/controllers/UserStatusController.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/controllers/UserStatusController.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/controllers/UserStatusController.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/events/UserAccountEvent.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/events/UserAccountEvent.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/events/UserAccountEvent.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/events/UserAccountEvent.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/events/UserAccountNewPasswordEvent.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/events/UserAccountNewPasswordEvent.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/events/UserAccountNewPasswordEvent.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/events/UserAccountNewPasswordEvent.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/events/UserAccountPasswordResetEvent.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/events/UserAccountPasswordResetEvent.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/events/UserAccountPasswordResetEvent.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/events/UserAccountPasswordResetEvent.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/events/UserAccountResetCodeGeneratedEvent.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/events/UserAccountResetCodeGeneratedEvent.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/events/UserAccountResetCodeGeneratedEvent.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/events/UserAccountResetCodeGeneratedEvent.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/events/UserCreateEvent.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/events/UserCreateEvent.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/events/UserCreateEvent.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/events/UserCreateEvent.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/events/UserDeleteEvent.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/events/UserDeleteEvent.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/events/UserDeleteEvent.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/events/UserDeleteEvent.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/events/UserEvent.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/events/UserEvent.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/events/UserEvent.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/events/UserEvent.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/events/UserUpdateEvent.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/events/UserUpdateEvent.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/events/UserUpdateEvent.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/events/UserUpdateEvent.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/exceptions/EcoUserException.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/exceptions/EcoUserException.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/exceptions/EcoUserException.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/exceptions/EcoUserException.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/exceptions/UserAccounNewPasswordMatchesOldPasswordException.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/exceptions/UserAccounNewPasswordMatchesOldPasswordException.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/exceptions/UserAccounNewPasswordMatchesOldPasswordException.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/exceptions/UserAccounNewPasswordMatchesOldPasswordException.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/exceptions/UserAccountExistsException.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/exceptions/UserAccountExistsException.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/exceptions/UserAccountExistsException.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/exceptions/UserAccountExistsException.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/exceptions/UserAccountNotFoundForUserCode.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/exceptions/UserAccountNotFoundForUserCode.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/exceptions/UserAccountNotFoundForUserCode.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/exceptions/UserAccountNotFoundForUserCode.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/exceptions/UserAccountNotFoundForUserEmail.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/exceptions/UserAccountNotFoundForUserEmail.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/exceptions/UserAccountNotFoundForUserEmail.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/exceptions/UserAccountNotFoundForUserEmail.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/exceptions/UserAccountNotFoundWrongOldPasswordException.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/exceptions/UserAccountNotFoundWrongOldPasswordException.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/exceptions/UserAccountNotFoundWrongOldPasswordException.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/exceptions/UserAccountNotFoundWrongOldPasswordException.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/exceptions/UserCannotRemoveOwnAccount.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/exceptions/UserCannotRemoveOwnAccount.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/exceptions/UserCannotRemoveOwnAccount.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/exceptions/UserCannotRemoveOwnAccount.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/filters/UserKeyTokenFilter.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/filters/UserKeyTokenFilter.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/filters/UserKeyTokenFilter.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/filters/UserKeyTokenFilter.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/forms/UserAccountForm.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/forms/UserAccountForm.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/forms/UserAccountForm.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/forms/UserAccountForm.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/forms/UserAccountOauthForm.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/forms/UserAccountOauthForm.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/forms/UserAccountOauthForm.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/forms/UserAccountOauthForm.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/forms/UserAccountPasswordForm.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/forms/UserAccountPasswordForm.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/forms/UserAccountPasswordForm.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/forms/UserAccountPasswordForm.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/forms/UserForm.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/forms/UserForm.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/forms/UserForm.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/forms/UserForm.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/forms/UserGroupForm.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/forms/UserGroupForm.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/forms/UserGroupForm.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/forms/UserGroupForm.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/forms/UserKeyForm.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/forms/UserKeyForm.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/forms/UserKeyForm.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/forms/UserKeyForm.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/model/User.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/model/User.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/model/User.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/model/User.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/model/UserAccount.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/model/UserAccount.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/model/UserAccount.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/model/UserAccount.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/model/UserAccountKey.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/model/UserAccountKey.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/model/UserAccountKey.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/model/UserAccountKey.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/model/UserAccountOauth.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/model/UserAccountOauth.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/model/UserAccountOauth.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/model/UserAccountOauth.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/model/UserAccountOauthProvider.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/model/UserAccountOauthProvider.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/model/UserAccountOauthProvider.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/model/UserAccountOauthProvider.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/model/UserAccountPassword.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/model/UserAccountPassword.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/model/UserAccountPassword.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/model/UserAccountPassword.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/model/UserGroup.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/model/UserGroup.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/model/UserGroup.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/model/UserGroup.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/repositories/UserAccountKeyRepository.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/repositories/UserAccountKeyRepository.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/repositories/UserAccountKeyRepository.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/repositories/UserAccountKeyRepository.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/repositories/UserAccountOauthRepository.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/repositories/UserAccountOauthRepository.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/repositories/UserAccountOauthRepository.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/repositories/UserAccountOauthRepository.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/repositories/UserAccountPasswordRepository.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/repositories/UserAccountPasswordRepository.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/repositories/UserAccountPasswordRepository.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/repositories/UserAccountPasswordRepository.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/repositories/UserAccountRepository.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/repositories/UserAccountRepository.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/repositories/UserAccountRepository.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/repositories/UserAccountRepository.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/repositories/UserGroupRepository.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/repositories/UserGroupRepository.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/repositories/UserGroupRepository.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/repositories/UserGroupRepository.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/repositories/UserRepository.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/repositories/UserRepository.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/repositories/UserRepository.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/repositories/UserRepository.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/resolvers/UserQueryResolver.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/resolvers/UserQueryResolver.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/resolvers/UserQueryResolver.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/resolvers/UserQueryResolver.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/services/UserAccountService.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/services/UserAccountService.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/services/UserAccountService.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/services/UserAccountService.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/services/UserAuthorityService.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/services/UserAuthorityService.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/services/UserAuthorityService.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/services/UserAuthorityService.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/services/UserGroupService.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/services/UserGroupService.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/services/UserGroupService.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/services/UserGroupService.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/services/UserSecurityService.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/services/UserSecurityService.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/services/UserSecurityService.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/services/UserSecurityService.kt
diff --git a/eco-feature/eco-feature-user/src/main/kotlin/services/UserService.kt b/eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/services/UserService.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/main/kotlin/services/UserService.kt
rename to eco-feature/eco-feature-user/src/main/kotlin/community/flock/eco/feature/user/services/UserService.kt
diff --git a/eco-feature/eco-feature-user/src/test/kotlin/repositories/UserAccountPasswordRepositoryTest.kt b/eco-feature/eco-feature-user/src/test/kotlin/community/flock/eco/feature/user/repositories/UserAccountPasswordRepositoryTest.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/test/kotlin/repositories/UserAccountPasswordRepositoryTest.kt
rename to eco-feature/eco-feature-user/src/test/kotlin/community/flock/eco/feature/user/repositories/UserAccountPasswordRepositoryTest.kt
diff --git a/eco-feature/eco-feature-user/src/test/kotlin/repositories/UserGroupRepositoryTest.kt b/eco-feature/eco-feature-user/src/test/kotlin/community/flock/eco/feature/user/repositories/UserGroupRepositoryTest.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/test/kotlin/repositories/UserGroupRepositoryTest.kt
rename to eco-feature/eco-feature-user/src/test/kotlin/community/flock/eco/feature/user/repositories/UserGroupRepositoryTest.kt
diff --git a/eco-feature/eco-feature-user/src/test/kotlin/repositories/UserRepositoryTest.kt b/eco-feature/eco-feature-user/src/test/kotlin/community/flock/eco/feature/user/repositories/UserRepositoryTest.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/test/kotlin/repositories/UserRepositoryTest.kt
rename to eco-feature/eco-feature-user/src/test/kotlin/community/flock/eco/feature/user/repositories/UserRepositoryTest.kt
diff --git a/eco-feature/eco-feature-user/src/test/kotlin/services/UserAccountServiceTest.kt b/eco-feature/eco-feature-user/src/test/kotlin/community/flock/eco/feature/user/services/UserAccountServiceTest.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/test/kotlin/services/UserAccountServiceTest.kt
rename to eco-feature/eco-feature-user/src/test/kotlin/community/flock/eco/feature/user/services/UserAccountServiceTest.kt
diff --git a/eco-feature/eco-feature-user/src/test/kotlin/services/UserGroupServiceTest.kt b/eco-feature/eco-feature-user/src/test/kotlin/community/flock/eco/feature/user/services/UserGroupServiceTest.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/test/kotlin/services/UserGroupServiceTest.kt
rename to eco-feature/eco-feature-user/src/test/kotlin/community/flock/eco/feature/user/services/UserGroupServiceTest.kt
diff --git a/eco-feature/eco-feature-user/src/test/kotlin/services/UserServiceTest.kt b/eco-feature/eco-feature-user/src/test/kotlin/community/flock/eco/feature/user/services/UserServiceTest.kt
similarity index 100%
rename from eco-feature/eco-feature-user/src/test/kotlin/services/UserServiceTest.kt
rename to eco-feature/eco-feature-user/src/test/kotlin/community/flock/eco/feature/user/services/UserServiceTest.kt
diff --git a/eco-feature/eco-feature-workspace/src/develop/kotlin/develop.data/WorkspaceLoadData.kt b/eco-feature/eco-feature-workspace/src/develop/kotlin/community/flock/eco/feature/workspace/develop/data/WorkspaceLoadData.kt
similarity index 100%
rename from eco-feature/eco-feature-workspace/src/develop/kotlin/develop.data/WorkspaceLoadData.kt
rename to eco-feature/eco-feature-workspace/src/develop/kotlin/community/flock/eco/feature/workspace/develop/data/WorkspaceLoadData.kt
diff --git a/eco-feature/eco-feature-workspace/src/main/kotlin/WorkspaceConfiguration.kt b/eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/WorkspaceConfiguration.kt
similarity index 100%
rename from eco-feature/eco-feature-workspace/src/main/kotlin/WorkspaceConfiguration.kt
rename to eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/WorkspaceConfiguration.kt
diff --git a/eco-feature/eco-feature-workspace/src/main/kotlin/authorities/WorkspaceAuthority.kt b/eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/authorities/WorkspaceAuthority.kt
similarity index 100%
rename from eco-feature/eco-feature-workspace/src/main/kotlin/authorities/WorkspaceAuthority.kt
rename to eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/authorities/WorkspaceAuthority.kt
diff --git a/eco-feature/eco-feature-workspace/src/main/kotlin/controllers/WorkspaceController.kt b/eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/controllers/WorkspaceController.kt
similarity index 100%
rename from eco-feature/eco-feature-workspace/src/main/kotlin/controllers/WorkspaceController.kt
rename to eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/controllers/WorkspaceController.kt
diff --git a/eco-feature/eco-feature-workspace/src/main/kotlin/controllers/WorkspaceRoleController.kt b/eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/controllers/WorkspaceRoleController.kt
similarity index 100%
rename from eco-feature/eco-feature-workspace/src/main/kotlin/controllers/WorkspaceRoleController.kt
rename to eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/controllers/WorkspaceRoleController.kt
diff --git a/eco-feature/eco-feature-workspace/src/main/kotlin/controllers/WorkspaceUserController.kt b/eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/controllers/WorkspaceUserController.kt
similarity index 100%
rename from eco-feature/eco-feature-workspace/src/main/kotlin/controllers/WorkspaceUserController.kt
rename to eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/controllers/WorkspaceUserController.kt
diff --git a/eco-feature/eco-feature-workspace/src/main/kotlin/mappers/WorkspaceGraphqlMapper.kt b/eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/mappers/WorkspaceGraphqlMapper.kt
similarity index 100%
rename from eco-feature/eco-feature-workspace/src/main/kotlin/mappers/WorkspaceGraphqlMapper.kt
rename to eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/mappers/WorkspaceGraphqlMapper.kt
diff --git a/eco-feature/eco-feature-workspace/src/main/kotlin/model/Workspace.kt b/eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/model/Workspace.kt
similarity index 100%
rename from eco-feature/eco-feature-workspace/src/main/kotlin/model/Workspace.kt
rename to eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/model/Workspace.kt
diff --git a/eco-feature/eco-feature-workspace/src/main/kotlin/model/WorkspaceImage.kt b/eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/model/WorkspaceImage.kt
similarity index 100%
rename from eco-feature/eco-feature-workspace/src/main/kotlin/model/WorkspaceImage.kt
rename to eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/model/WorkspaceImage.kt
diff --git a/eco-feature/eco-feature-workspace/src/main/kotlin/model/WorkspaceUserRole.kt b/eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/model/WorkspaceUserRole.kt
similarity index 100%
rename from eco-feature/eco-feature-workspace/src/main/kotlin/model/WorkspaceUserRole.kt
rename to eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/model/WorkspaceUserRole.kt
diff --git a/eco-feature/eco-feature-workspace/src/main/kotlin/providers/WorkspaceUserProvider.kt b/eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/providers/WorkspaceUserProvider.kt
similarity index 100%
rename from eco-feature/eco-feature-workspace/src/main/kotlin/providers/WorkspaceUserProvider.kt
rename to eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/providers/WorkspaceUserProvider.kt
diff --git a/eco-feature/eco-feature-workspace/src/main/kotlin/repositories/WorkspaceRepository.kt b/eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/repositories/WorkspaceRepository.kt
similarity index 100%
rename from eco-feature/eco-feature-workspace/src/main/kotlin/repositories/WorkspaceRepository.kt
rename to eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/repositories/WorkspaceRepository.kt
diff --git a/eco-feature/eco-feature-workspace/src/main/kotlin/resolvers/WorkspaceQueryResolver.kt b/eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/resolvers/WorkspaceQueryResolver.kt
similarity index 100%
rename from eco-feature/eco-feature-workspace/src/main/kotlin/resolvers/WorkspaceQueryResolver.kt
rename to eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/resolvers/WorkspaceQueryResolver.kt
diff --git a/eco-feature/eco-feature-workspace/src/main/kotlin/services/WorkspaceService.kt b/eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/services/WorkspaceService.kt
similarity index 100%
rename from eco-feature/eco-feature-workspace/src/main/kotlin/services/WorkspaceService.kt
rename to eco-feature/eco-feature-workspace/src/main/kotlin/community/flock/eco/feature/workspace/services/WorkspaceService.kt
diff --git a/eco-iso/eco-iso-country/src/main/kotlin/CountryIsoConfiguration.kt b/eco-iso/eco-iso-country/src/main/kotlin/community/flock/eco/iso/country/CountryIsoConfiguration.kt
similarity index 100%
rename from eco-iso/eco-iso-country/src/main/kotlin/CountryIsoConfiguration.kt
rename to eco-iso/eco-iso-country/src/main/kotlin/community/flock/eco/iso/country/CountryIsoConfiguration.kt
diff --git a/eco-iso/eco-iso-country/src/main/kotlin/controllers/CountryIsoController.kt b/eco-iso/eco-iso-country/src/main/kotlin/community/flock/eco/iso/country/controllers/CountryIsoController.kt
similarity index 100%
rename from eco-iso/eco-iso-country/src/main/kotlin/controllers/CountryIsoController.kt
rename to eco-iso/eco-iso-country/src/main/kotlin/community/flock/eco/iso/country/controllers/CountryIsoController.kt
diff --git a/eco-iso/eco-iso-country/src/main/kotlin/model/Country.kt b/eco-iso/eco-iso-country/src/main/kotlin/community/flock/eco/iso/country/model/Country.kt
similarity index 100%
rename from eco-iso/eco-iso-country/src/main/kotlin/model/Country.kt
rename to eco-iso/eco-iso-country/src/main/kotlin/community/flock/eco/iso/country/model/Country.kt
diff --git a/eco-iso/eco-iso-country/src/main/kotlin/resolvers/CountryIsoQueryResolver.kt b/eco-iso/eco-iso-country/src/main/kotlin/community/flock/eco/iso/country/resolvers/CountryIsoQueryResolver.kt
similarity index 100%
rename from eco-iso/eco-iso-country/src/main/kotlin/resolvers/CountryIsoQueryResolver.kt
rename to eco-iso/eco-iso-country/src/main/kotlin/community/flock/eco/iso/country/resolvers/CountryIsoQueryResolver.kt
diff --git a/eco-iso/eco-iso-country/src/main/kotlin/services/CountryIsoService.kt b/eco-iso/eco-iso-country/src/main/kotlin/community/flock/eco/iso/country/services/CountryIsoService.kt
similarity index 100%
rename from eco-iso/eco-iso-country/src/main/kotlin/services/CountryIsoService.kt
rename to eco-iso/eco-iso-country/src/main/kotlin/community/flock/eco/iso/country/services/CountryIsoService.kt
diff --git a/eco-iso/eco-iso-country/src/test/kotlin/services/CountryIsoServiceTest.kt b/eco-iso/eco-iso-country/src/test/kotlin/community/flock/eco/iso/country/services/CountryIsoServiceTest.kt
similarity index 100%
rename from eco-iso/eco-iso-country/src/test/kotlin/services/CountryIsoServiceTest.kt
rename to eco-iso/eco-iso-country/src/test/kotlin/community/flock/eco/iso/country/services/CountryIsoServiceTest.kt
diff --git a/eco-iso/eco-iso-language/src/main/kotlin/LanguageIsoConfiguration.kt b/eco-iso/eco-iso-language/src/main/kotlin/community/flock/eco/iso/language/LanguageIsoConfiguration.kt
similarity index 93%
rename from eco-iso/eco-iso-language/src/main/kotlin/LanguageIsoConfiguration.kt
rename to eco-iso/eco-iso-language/src/main/kotlin/community/flock/eco/iso/language/LanguageIsoConfiguration.kt
index ad24d33c..40037385 100644
--- a/eco-iso/eco-iso-language/src/main/kotlin/LanguageIsoConfiguration.kt
+++ b/eco-iso/eco-iso-language/src/main/kotlin/community/flock/eco/iso/language/LanguageIsoConfiguration.kt
@@ -1,3 +1,5 @@
+package community.flock.eco.iso.language
+
 import community.flock.eco.core.configurations.GraphqlConfiguration
 import community.flock.eco.iso.language.controllers.LanguageIsoController
 import community.flock.eco.iso.language.resolvers.LanguageIsoQueryResolver
diff --git a/eco-iso/eco-iso-language/src/main/kotlin/controllers/LanguageIsoController.kt b/eco-iso/eco-iso-language/src/main/kotlin/community/flock/eco/iso/language/controllers/LanguageIsoController.kt
similarity index 100%
rename from eco-iso/eco-iso-language/src/main/kotlin/controllers/LanguageIsoController.kt
rename to eco-iso/eco-iso-language/src/main/kotlin/community/flock/eco/iso/language/controllers/LanguageIsoController.kt
diff --git a/eco-iso/eco-iso-language/src/main/kotlin/model/Language.kt b/eco-iso/eco-iso-language/src/main/kotlin/community/flock/eco/iso/language/model/Language.kt
similarity index 100%
rename from eco-iso/eco-iso-language/src/main/kotlin/model/Language.kt
rename to eco-iso/eco-iso-language/src/main/kotlin/community/flock/eco/iso/language/model/Language.kt
diff --git a/eco-iso/eco-iso-language/src/main/kotlin/resolvers/LanguageIsoQueryResolver.kt b/eco-iso/eco-iso-language/src/main/kotlin/community/flock/eco/iso/language/resolvers/LanguageIsoQueryResolver.kt
similarity index 100%
rename from eco-iso/eco-iso-language/src/main/kotlin/resolvers/LanguageIsoQueryResolver.kt
rename to eco-iso/eco-iso-language/src/main/kotlin/community/flock/eco/iso/language/resolvers/LanguageIsoQueryResolver.kt
diff --git a/eco-iso/eco-iso-language/src/main/kotlin/services/LanguageIsoService.kt b/eco-iso/eco-iso-language/src/main/kotlin/community/flock/eco/iso/language/services/LanguageIsoService.kt
similarity index 100%
rename from eco-iso/eco-iso-language/src/main/kotlin/services/LanguageIsoService.kt
rename to eco-iso/eco-iso-language/src/main/kotlin/community/flock/eco/iso/language/services/LanguageIsoService.kt
diff --git a/eco-iso/eco-iso-language/src/test/kotlin/services/LanguageIsoServiceTest.kt b/eco-iso/eco-iso-language/src/test/kotlin/community/flock/eco/iso/language/services/LanguageIsoServiceTest.kt
similarity index 93%
rename from eco-iso/eco-iso-language/src/test/kotlin/services/LanguageIsoServiceTest.kt
rename to eco-iso/eco-iso-language/src/test/kotlin/community/flock/eco/iso/language/services/LanguageIsoServiceTest.kt
index b9136dbc..d4c1e7c8 100644
--- a/eco-iso/eco-iso-language/src/test/kotlin/services/LanguageIsoServiceTest.kt
+++ b/eco-iso/eco-iso-language/src/test/kotlin/community/flock/eco/iso/language/services/LanguageIsoServiceTest.kt
@@ -1,6 +1,6 @@
 package community.flock.eco.iso.language.services
 
-import LanguageIsoConfiguration
+import community.flock.eco.iso.language.LanguageIsoConfiguration
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.autoconfigure.web.client.AutoConfigureWebClient
diff --git a/pom.xml b/pom.xml
index ebabb345..10d674e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -181,7 +181,6 @@
                 <artifactId>flock-eco-feature-user</artifactId>
                 <version>${project.parent.version}</version>
                 <classifier>develop</classifier>
-                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>community.flock.flock-eco</groupId>
@@ -193,14 +192,12 @@
                 <artifactId>flock-eco-feature-workspace</artifactId>
                 <version>${project.parent.version}</version>
                 <classifier>develop</classifier>
-                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>community.flock.flock-eco</groupId>
                 <artifactId>flock-eco-feature-member</artifactId>
                 <version>${project.parent.version}</version>
                 <classifier>develop</classifier>
-                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>community.flock.flock-eco</groupId>
@@ -521,6 +518,18 @@
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>3.2.0</version>
                 <executions>
+                    <execution>
+                        <id>default-jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <excludes>
+                                <exclude>community/flock/eco/**/develop/**</exclude>
+                            </excludes>
+                        </configuration>
+                    </execution>
                     <execution>
                         <phase>package</phase>
                         <goals>
@@ -529,7 +538,7 @@
                         <configuration>
                             <classifier>develop</classifier>
                             <includes>
-                                <include>**/develop/data/*</include>
+                                <include>community/flock/eco/**/develop/**</include>
                             </includes>
                             <skipIfEmpty>true</skipIfEmpty>
                         </configuration>