flock-community · ZzAve · Jan 22, 2024 · Jan 22, 2024 · Jan 22, 2024 · Jan 22, 2024
diff --git a/...on-example/src/main/kotlin/Application.kt → ...ck/eco/application/example/Application.kt b/...on-example/src/main/kotlin/Application.kt → ...ck/eco/application/example/Application.kt
diff --git a/...c/main/kotlin/ApplicationConfiguration.kt → ...ation/example/ApplicationConfiguration.kt b/...c/main/kotlin/ApplicationConfiguration.kt → ...ation/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/...xample/src/main/kotlin/ApplicationData.kt → ...co/application/example/ApplicationData.kt b/...xample/src/main/kotlin/ApplicationData.kt → ...co/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 = "[email protected]", password = "test", authorities = all))
+            .createUserAccountPassword(
+                UserAccountPasswordForm(
+                    name = "Test",
+                    email = "[email protected]",
+                    password = "test",
+                    authorities = all,
+                ),
+            )
         userLoadData.load(10)
         memberLoadData.load(100)
         workspaceLoadData.load()

diff --git a/...in/kotlin/authorities/ExampleAuthority.kt → ...n/example/authorities/ExampleAuthority.kt b/...in/kotlin/authorities/ExampleAuthority.kt → ...n/example/authorities/ExampleAuthority.kt
diff --git a/...main/kotlin/configuration/WebMvcConfig.kt → ...ion/example/configuration/WebMvcConfig.kt b/...main/kotlin/configuration/WebMvcConfig.kt → ...ion/example/configuration/WebMvcConfig.kt
diff --git a/...kotlin/configuration/WebSecurityConfig.kt → ...xample/configuration/WebSecurityConfig.kt b/...kotlin/configuration/WebSecurityConfig.kt → ...xample/configuration/WebSecurityConfig.kt
diff --git a/...in/kotlin/controllers/HealthController.kt → ...n/example/controllers/HealthController.kt b/...in/kotlin/controllers/HealthController.kt → ...n/example/controllers/HealthController.kt
diff --git a/...lin/providers/WorkspaceUserProviderImp.kt → ...ple/providers/WorkspaceUserProviderImp.kt b/...lin/providers/WorkspaceUserProviderImp.kt → ...ple/providers/WorkspaceUserProviderImp.kt
diff --git a/...lti_tenant/src/main/kotlin/Application.kt → ...co/application/multitenant/Application.kt b/...lti_tenant/src/main/kotlin/Application.kt → ...co/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/...c/main/kotlin/ApplicationConfiguration.kt → ...n/multitenant/ApplicationConfiguration.kt b/...c/main/kotlin/ApplicationConfiguration.kt → ...n/multitenant/ApplicationConfiguration.kt
diff --git a/...main/kotlin/configuration/WebMvcConfig.kt → ...multitenant/configuration/WebMvcConfig.kt b/...main/kotlin/configuration/WebMvcConfig.kt → ...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/...kotlin/configuration/WebSecurityConfig.kt → ...tenant/configuration/WebSecurityConfig.kt b/...kotlin/configuration/WebSecurityConfig.kt → ...tenant/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/...lin/controllers/RegistrationController.kt → ...ant/controllers/RegistrationController.kt b/...lin/controllers/RegistrationController.kt → ...ant/controllers/RegistrationController.kt
diff --git a/.../src/test/kotlin/CreateMultiTenantTest.kt → ...tion/multitenant/CreateMultiTenantTest.kt b/.../src/test/kotlin/CreateMultiTenantTest.kt → ...tion/multitenant/CreateMultiTenantTest.kt
diff --git a/...t/src/test/kotlin/CrossLoginTenantTest.kt → ...ation/multitenant/CrossLoginTenantTest.kt b/...t/src/test/kotlin/CrossLoginTenantTest.kt → ...ation/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/...ant/src/test/kotlin/RegisterTenantTest.kt → ...ication/multitenant/RegisterTenantTest.kt b/...ant/src/test/kotlin/RegisterTenantTest.kt → ...ication/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/.../src/main/kotlin/AwsCloudConfiguration.kt → ...ck/eco/cloud/aws/AwsCloudConfiguration.kt b/.../src/main/kotlin/AwsCloudConfiguration.kt → ...ck/eco/cloud/aws/AwsCloudConfiguration.kt
diff --git a/...aws/src/main/kotlin/AwsCloudProperties.kt → ...flock/eco/cloud/aws/AwsCloudProperties.kt b/...aws/src/main/kotlin/AwsCloudProperties.kt → ...flock/eco/cloud/aws/AwsCloudProperties.kt
diff --git a/...rc/main/kotlin/services/AwsMailService.kt → .../eco/cloud/aws/services/AwsMailService.kt b/...rc/main/kotlin/services/AwsMailService.kt → .../eco/cloud/aws/services/AwsMailService.kt
diff --git a/...main/kotlin/services/AwsStorageService.kt → ...o/cloud/aws/services/AwsStorageService.kt b/...main/kotlin/services/AwsStorageService.kt → ...o/cloud/aws/services/AwsStorageService.kt
diff --git a/...p/src/main/kotlin/GcpMailConfiguration.kt → ...ock/eco/cloud/gcp/GcpMailConfiguration.kt b/...p/src/main/kotlin/GcpMailConfiguration.kt → ...ock/eco/cloud/gcp/GcpMailConfiguration.kt
diff --git a/...gcp/src/main/kotlin/GpcCloudProperties.kt → ...flock/eco/cloud/gcp/GpcCloudProperties.kt b/...gcp/src/main/kotlin/GpcCloudProperties.kt → ...flock/eco/cloud/gcp/GpcCloudProperties.kt
diff --git a/...rc/main/kotlin/services/GpcMailService.kt → .../eco/cloud/gcp/services/GpcMailService.kt b/...rc/main/kotlin/services/GpcMailService.kt → .../eco/cloud/gcp/services/GpcMailService.kt
diff --git a/...src/main/kotlin/StubCloudConfiguration.kt → .../eco/cloud/stub/StubCloudConfiguration.kt b/...src/main/kotlin/StubCloudConfiguration.kt → .../eco/cloud/stub/StubCloudConfiguration.kt
diff --git a/...ub/src/main/kotlin/StubCloudProperties.kt → ...ock/eco/cloud/stub/StubCloudProperties.kt b/...ub/src/main/kotlin/StubCloudProperties.kt → ...ock/eco/cloud/stub/StubCloudProperties.kt
diff --git a/...c/main/kotlin/services/StubMailService.kt → ...co/cloud/stub/services/StubMailService.kt b/...c/main/kotlin/services/StubMailService.kt → ...co/cloud/stub/services/StubMailService.kt
diff --git a/.../main/kotlin/services/StubStoreService.kt → ...o/cloud/stub/services/StubStoreService.kt b/.../main/kotlin/services/StubStoreService.kt → ...o/cloud/stub/services/StubStoreService.kt
diff --git a/...src/test/kotlin/StubStorageServiceTest.kt → .../eco/cloud/stub/StubStorageServiceTest.kt b/...src/test/kotlin/StubStorageServiceTest.kt → .../eco/cloud/stub/StubStorageServiceTest.kt
diff --git a/.../src/main/kotlin/authorities/Authority.kt → ...y/flock/eco/core/authorities/Authority.kt b/.../src/main/kotlin/authorities/Authority.kt → ...y/flock/eco/core/authorities/Authority.kt
diff --git a/...in/configurations/GraphqlConfiguration.kt → ...re/configurations/GraphqlConfiguration.kt b/...in/configurations/GraphqlConfiguration.kt → ...re/configurations/GraphqlConfiguration.kt
diff --git a/eco-core/src/main/kotlin/data/LoadData.kt → ...community/flock/eco/core/data/LoadData.kt b/eco-core/src/main/kotlin/data/LoadData.kt → ...community/flock/eco/core/data/LoadData.kt
diff --git a/eco-core/src/main/kotlin/events/Event.kt → .../community/flock/eco/core/events/Event.kt b/eco-core/src/main/kotlin/events/Event.kt → .../community/flock/eco/core/events/Event.kt
diff --git a/...ain/kotlin/events/EventEntityListeners.kt → ...k/eco/core/events/EventEntityListeners.kt b/...ain/kotlin/events/EventEntityListeners.kt → ...k/eco/core/events/EventEntityListeners.kt
diff --git a/...ore/src/main/kotlin/events/StoreEvents.kt → ...nity/flock/eco/core/events/StoreEvents.kt b/...ore/src/main/kotlin/events/StoreEvents.kt → ...nity/flock/eco/core/events/StoreEvents.kt
diff --git a/.../exceptions/CannotConnectToObjectStore.kt → .../exceptions/CannotConnectToObjectStore.kt b/.../exceptions/CannotConnectToObjectStore.kt → .../exceptions/CannotConnectToObjectStore.kt
diff --git a/...in/kotlin/exceptions/FlockEcoException.kt → .../eco/core/exceptions/FlockEcoException.kt b/...in/kotlin/exceptions/FlockEcoException.kt → .../eco/core/exceptions/FlockEcoException.kt
diff --git a/...in/kotlin/extentions/PageableExtention.kt → .../eco/core/extentions/PageableExtention.kt b/...in/kotlin/extentions/PageableExtention.kt → .../eco/core/extentions/PageableExtention.kt
diff --git a/...c/main/kotlin/model/AbstractCodeEntity.kt → ...lock/eco/core/model/AbstractCodeEntity.kt b/...c/main/kotlin/model/AbstractCodeEntity.kt → ...lock/eco/core/model/AbstractCodeEntity.kt
diff --git a/...e/src/main/kotlin/model/AbstractEntity.kt → ...ty/flock/eco/core/model/AbstractEntity.kt b/...e/src/main/kotlin/model/AbstractEntity.kt → ...ty/flock/eco/core/model/AbstractEntity.kt
diff --git a/...src/main/kotlin/model/AbstractIdEntity.kt → .../flock/eco/core/model/AbstractIdEntity.kt b/...src/main/kotlin/model/AbstractIdEntity.kt → .../flock/eco/core/model/AbstractIdEntity.kt
diff --git a/...core/src/main/kotlin/model/MailMessage.kt → ...unity/flock/eco/core/model/MailMessage.kt b/...core/src/main/kotlin/model/MailMessage.kt → ...unity/flock/eco/core/model/MailMessage.kt
diff --git a/...e/src/main/kotlin/services/CrudService.kt → ...ty/flock/eco/core/services/CrudService.kt b/...e/src/main/kotlin/services/CrudService.kt → ...ty/flock/eco/core/services/CrudService.kt
diff --git a/...e/src/main/kotlin/services/MailService.kt → ...ty/flock/eco/core/services/MailService.kt b/...e/src/main/kotlin/services/MailService.kt → ...ty/flock/eco/core/services/MailService.kt
diff --git a/...c/main/kotlin/services/PropertyService.kt → ...lock/eco/core/services/PropertyService.kt b/...c/main/kotlin/services/PropertyService.kt → ...lock/eco/core/services/PropertyService.kt
diff --git a/...rc/main/kotlin/services/StorageService.kt → ...flock/eco/core/services/StorageService.kt b/...rc/main/kotlin/services/StorageService.kt → ...flock/eco/core/services/StorageService.kt
diff --git a/...c/main/kotlin/utils/ExtensionFunctions.kt → ...lock/eco/core/utils/ExtensionFunctions.kt b/...c/main/kotlin/utils/ExtensionFunctions.kt → ...lock/eco/core/utils/ExtensionFunctions.kt
diff --git a/...src/main/kotlin/MailchimpConfiguration.kt → ...ature/mailchimp/MailchimpConfiguration.kt b/...src/main/kotlin/MailchimpConfiguration.kt → ...ature/mailchimp/MailchimpConfiguration.kt
diff --git a/...authorities/MailchimpCampaignAuthority.kt → ...authorities/MailchimpCampaignAuthority.kt b/...authorities/MailchimpCampaignAuthority.kt → ...authorities/MailchimpCampaignAuthority.kt
diff --git a/...n/authorities/MailchimpMemberAuthority.kt → ...p/authorities/MailchimpMemberAuthority.kt b/...n/authorities/MailchimpMemberAuthority.kt → ...p/authorities/MailchimpMemberAuthority.kt
diff --git a/...authorities/MailchimpTemplateAuthority.kt → ...authorities/MailchimpTemplateAuthority.kt b/...authorities/MailchimpTemplateAuthority.kt → ...authorities/MailchimpTemplateAuthority.kt
diff --git a/...rc/main/kotlin/clients/MailchimpClient.kt → ...ture/mailchimp/clients/MailchimpClient.kt b/...rc/main/kotlin/clients/MailchimpClient.kt → ...ture/mailchimp/clients/MailchimpClient.kt
diff --git a/...kotlin/controllers/MailchimpController.kt → ...lchimp/controllers/MailchimpController.kt b/...kotlin/controllers/MailchimpController.kt → ...lchimp/controllers/MailchimpController.kt
diff --git a/...in/kotlin/events/MailchimpWebhookEvent.kt → ...mailchimp/events/MailchimpWebhookEvent.kt b/...in/kotlin/events/MailchimpWebhookEvent.kt → ...mailchimp/events/MailchimpWebhookEvent.kt
diff --git a/...lin/exceptions/MailchimpFetchException.kt → ...imp/exceptions/MailchimpFetchException.kt b/...lin/exceptions/MailchimpFetchException.kt → ...imp/exceptions/MailchimpFetchException.kt
diff --git a/...rc/main/kotlin/model/MailchimpCampaign.kt → ...ture/mailchimp/model/MailchimpCampaign.kt b/...rc/main/kotlin/model/MailchimpCampaign.kt → ...ture/mailchimp/model/MailchimpCampaign.kt
diff --git a/...rc/main/kotlin/model/MailchimpInterest.kt → ...ture/mailchimp/model/MailchimpInterest.kt b/...rc/main/kotlin/model/MailchimpInterest.kt → ...ture/mailchimp/model/MailchimpInterest.kt
diff --git a/...kotlin/model/MailchimpInterestCategory.kt → ...lchimp/model/MailchimpInterestCategory.kt b/...kotlin/model/MailchimpInterestCategory.kt → ...lchimp/model/MailchimpInterestCategory.kt
diff --git a/...mp/src/main/kotlin/model/MailchimpList.kt → .../feature/mailchimp/model/MailchimpList.kt b/...mp/src/main/kotlin/model/MailchimpList.kt → .../feature/mailchimp/model/MailchimpList.kt
diff --git a/.../src/main/kotlin/model/MailchimpMember.kt → ...eature/mailchimp/model/MailchimpMember.kt b/.../src/main/kotlin/model/MailchimpMember.kt → ...eature/mailchimp/model/MailchimpMember.kt
diff --git a/...ain/kotlin/model/MailchimpMemberStatus.kt → .../mailchimp/model/MailchimpMemberStatus.kt b/...ain/kotlin/model/MailchimpMemberStatus.kt → .../mailchimp/model/MailchimpMemberStatus.kt
diff --git a/...rc/main/kotlin/model/MailchimpTemplate.kt → ...ture/mailchimp/model/MailchimpTemplate.kt b/...rc/main/kotlin/model/MailchimpTemplate.kt → ...ture/mailchimp/model/MailchimpTemplate.kt
diff --git a/...est/kotlin/clients/MailchimpClientTest.kt → .../mailchimp/clients/MailchimpClientTest.kt b/...est/kotlin/clients/MailchimpClientTest.kt → .../mailchimp/clients/MailchimpClientTest.kt
diff --git a/...lop/kotlin/develop/data/MemberLoadData.kt → .../feature/member/develop/MemberLoadData.kt b/...lop/kotlin/develop/data/MemberLoadData.kt → .../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/...er/src/main/kotlin/MemberConfiguration.kt → ...eco/feature/member/MemberConfiguration.kt b/...er/src/main/kotlin/MemberConfiguration.kt → ...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/...ain/kotlin/authorities/MemberAuthority.kt → ...ure/member/authorities/MemberAuthority.kt b/...ain/kotlin/authorities/MemberAuthority.kt → ...ure/member/authorities/MemberAuthority.kt
diff --git a/...otlin/authorities/MemberFieldAuthority.kt → ...ember/authorities/MemberFieldAuthority.kt b/...otlin/authorities/MemberFieldAuthority.kt → ...ember/authorities/MemberFieldAuthority.kt
diff --git a/...otlin/authorities/MemberGroupAuthority.kt → ...ember/authorities/MemberGroupAuthority.kt b/...otlin/authorities/MemberGroupAuthority.kt → ...ember/authorities/MemberGroupAuthority.kt
diff --git a/...in/kotlin/controllers/MemberController.kt → ...re/member/controllers/MemberController.kt b/...in/kotlin/controllers/MemberController.kt → ...re/member/controllers/MemberController.kt
diff --git a/...tlin/controllers/MemberFieldController.kt → ...mber/controllers/MemberFieldController.kt b/...tlin/controllers/MemberFieldController.kt → ...mber/controllers/MemberFieldController.kt
diff --git a/...tlin/controllers/MemberGroupController.kt → ...mber/controllers/MemberGroupController.kt b/...tlin/controllers/MemberGroupController.kt → ...mber/controllers/MemberGroupController.kt
diff --git a/...er/src/main/kotlin/events/MemberEvents.kt → ...eco/feature/member/events/MemberEvents.kt b/...er/src/main/kotlin/events/MemberEvents.kt → ...eco/feature/member/events/MemberEvents.kt
diff --git a/...c/main/kotlin/events/MemberFieldEvents.kt → ...eature/member/events/MemberFieldEvents.kt b/...c/main/kotlin/events/MemberFieldEvents.kt → ...eature/member/events/MemberFieldEvents.kt
diff --git a/...c/main/kotlin/events/MemberGroupEvents.kt → ...eature/member/events/MemberGroupEvents.kt b/...c/main/kotlin/events/MemberGroupEvents.kt → ...eature/member/events/MemberGroupEvents.kt
diff --git a/...main/kotlin/mapper/MemberGraphqlMapper.kt → ...ture/member/mapper/MemberGraphqlMapper.kt b/...main/kotlin/mapper/MemberGraphqlMapper.kt → ...ture/member/mapper/MemberGraphqlMapper.kt
diff --git a/...re-member/src/main/kotlin/model/Member.kt → .../flock/eco/feature/member/model/Member.kt b/...re-member/src/main/kotlin/model/Member.kt → .../flock/eco/feature/member/model/Member.kt
diff --git a/...mber/src/main/kotlin/model/MemberField.kt → ...k/eco/feature/member/model/MemberField.kt b/...mber/src/main/kotlin/model/MemberField.kt → ...k/eco/feature/member/model/MemberField.kt
diff --git a/.../src/main/kotlin/model/MemberFieldType.kt → ...o/feature/member/model/MemberFieldType.kt b/.../src/main/kotlin/model/MemberFieldType.kt → ...o/feature/member/model/MemberFieldType.kt
diff --git a/...ber/src/main/kotlin/model/MemberGender.kt → .../eco/feature/member/model/MemberGender.kt b/...ber/src/main/kotlin/model/MemberGender.kt → .../eco/feature/member/model/MemberGender.kt
diff --git a/...mber/src/main/kotlin/model/MemberGroup.kt → ...k/eco/feature/member/model/MemberGroup.kt b/...mber/src/main/kotlin/model/MemberGroup.kt → ...k/eco/feature/member/model/MemberGroup.kt
diff --git a/...ber/src/main/kotlin/model/MemberStatus.kt → .../eco/feature/member/model/MemberStatus.kt b/...ber/src/main/kotlin/model/MemberStatus.kt → .../eco/feature/member/model/MemberStatus.kt
diff --git a/...lin/repositories/MemberFieldRepository.kt → ...ber/repositories/MemberFieldRepository.kt b/...lin/repositories/MemberFieldRepository.kt → ...ber/repositories/MemberFieldRepository.kt
diff --git a/...lin/repositories/MemberGroupRepository.kt → ...ber/repositories/MemberGroupRepository.kt b/...lin/repositories/MemberGroupRepository.kt → ...ber/repositories/MemberGroupRepository.kt
diff --git a/...n/kotlin/repositories/MemberRepository.kt → ...e/member/repositories/MemberRepository.kt b/...n/kotlin/repositories/MemberRepository.kt → ...e/member/repositories/MemberRepository.kt
diff --git a/...n/kotlin/resolvers/MemberQueryResolver.kt → ...e/member/resolvers/MemberQueryResolver.kt b/...n/kotlin/resolvers/MemberQueryResolver.kt → ...e/member/resolvers/MemberQueryResolver.kt
diff --git a/...ain/kotlin/services/MemberFieldService.kt → ...ure/member/services/MemberFieldService.kt b/...ain/kotlin/services/MemberFieldService.kt → ...ure/member/services/MemberFieldService.kt
diff --git a/...ain/kotlin/services/MemberGroupService.kt → ...ure/member/services/MemberGroupService.kt b/...ain/kotlin/services/MemberGroupService.kt → ...ure/member/services/MemberGroupService.kt
diff --git a/...src/main/kotlin/services/MemberService.kt → .../feature/member/services/MemberService.kt b/...src/main/kotlin/services/MemberService.kt → .../feature/member/services/MemberService.kt
diff --git a/...lin/specifications/MemberSpecification.kt → ...ber/specifications/MemberSpecification.kt b/...lin/specifications/MemberSpecification.kt → ...ber/specifications/MemberSpecification.kt
diff --git a/...tlin/repositories/MemberRepositoryTest.kt → ...mber/repositories/MemberRepositoryTest.kt b/...tlin/repositories/MemberRepositoryTest.kt → ...mber/repositories/MemberRepositoryTest.kt
diff --git a/...test/kotlin/services/MemberServiceTest.kt → ...ture/member/services/MemberServiceTest.kt b/...test/kotlin/services/MemberServiceTest.kt → ...ture/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/...specifications/MemberSpecificationTest.kt → ...specifications/MemberSpecificationTest.kt b/...specifications/MemberSpecificationTest.kt → ...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/...c/main/kotlin/MultiTenantConfiguration.kt → ...e/multitenant/MultiTenantConfiguration.kt b/...c/main/kotlin/MultiTenantConfiguration.kt → ...e/multitenant/MultiTenantConfiguration.kt
diff --git a/...n/kotlin/MultiTenantConnectionProvider.kt → ...titenant/MultiTenantConnectionProvider.kt b/...n/kotlin/MultiTenantConnectionProvider.kt → ...titenant/MultiTenantConnectionProvider.kt
diff --git a/...t/src/main/kotlin/MultiTenantConstants.kt → ...ature/multitenant/MultiTenantConstants.kt b/...t/src/main/kotlin/MultiTenantConstants.kt → ...ature/multitenant/MultiTenantConstants.kt
diff --git a/...ant/src/main/kotlin/MultiTenantContext.kt → ...feature/multitenant/MultiTenantContext.kt b/...ant/src/main/kotlin/MultiTenantContext.kt → ...feature/multitenant/MultiTenantContext.kt
diff --git a/.../main/kotlin/MultiTenantSchemaResolver.kt → .../multitenant/MultiTenantSchemaResolver.kt b/.../main/kotlin/MultiTenantSchemaResolver.kt → .../multitenant/MultiTenantSchemaResolver.kt
diff --git a/...tlin/controllers/MultiTenantController.kt → ...nant/controllers/MultiTenantController.kt b/...tlin/controllers/MultiTenantController.kt → ...nant/controllers/MultiTenantController.kt
diff --git a/...n/kotlin/events/MultiTenantCreateEvent.kt → ...titenant/events/MultiTenantCreateEvent.kt b/...n/kotlin/events/MultiTenantCreateEvent.kt → ...titenant/events/MultiTenantCreateEvent.kt
diff --git a/...n/kotlin/events/MultiTenantDeleteEvent.kt → ...titenant/events/MultiTenantDeleteEvent.kt b/...n/kotlin/events/MultiTenantDeleteEvent.kt → ...titenant/events/MultiTenantDeleteEvent.kt
diff --git a/...rc/main/kotlin/events/MultiTenantEvent.kt → ...re/multitenant/events/MultiTenantEvent.kt b/...rc/main/kotlin/events/MultiTenantEvent.kt → ...re/multitenant/events/MultiTenantEvent.kt
diff --git a/.../main/kotlin/filters/MultiTenantFilter.kt → .../multitenant/filters/MultiTenantFilter.kt b/.../main/kotlin/filters/MultiTenantFilter.kt → .../multitenant/filters/MultiTenantFilter.kt
diff --git a/...nant/src/main/kotlin/model/MultiTenant.kt → .../feature/multitenant/model/MultiTenant.kt b/...nant/src/main/kotlin/model/MultiTenant.kt → .../feature/multitenant/model/MultiTenant.kt
diff --git a/.../main/kotlin/model/MultiTenantKeyValue.kt → .../multitenant/model/MultiTenantKeyValue.kt b/.../main/kotlin/model/MultiTenantKeyValue.kt → .../multitenant/model/MultiTenantKeyValue.kt
diff --git a/...sitories/MultiTenantKeyValueRepository.kt → ...sitories/MultiTenantKeyValueRepository.kt b/...sitories/MultiTenantKeyValueRepository.kt → ...sitories/MultiTenantKeyValueRepository.kt
diff --git a/...in/services/MultiTenantKeyValueService.kt → ...nt/services/MultiTenantKeyValueService.kt b/...in/services/MultiTenantKeyValueService.kt → ...nt/services/MultiTenantKeyValueService.kt
diff --git a/...tlin/services/MultiTenantSchemaService.kt → ...nant/services/MultiTenantSchemaService.kt b/...tlin/services/MultiTenantSchemaService.kt → ...nant/services/MultiTenantSchemaService.kt
diff --git a/...t/src/main/kotlin/PaymentConfiguration.kt → ...o/feature/payment/PaymentConfiguration.kt b/...t/src/main/kotlin/PaymentConfiguration.kt → ...o/feature/payment/PaymentConfiguration.kt
diff --git a/...in/authorities/PaymentMandateAuthority.kt → ...nt/authorities/PaymentMandateAuthority.kt b/...in/authorities/PaymentMandateAuthority.kt → ...nt/authorities/PaymentMandateAuthority.kt
diff --git a/...uthorities/PaymentTransactionAuthority.kt → ...uthorities/PaymentTransactionAuthority.kt b/...uthorities/PaymentTransactionAuthority.kt → ...uthorities/PaymentTransactionAuthority.kt
diff --git a/.../controllers/PaymentBuckarooController.kt → .../controllers/PaymentBuckarooController.kt b/.../controllers/PaymentBuckarooController.kt → .../controllers/PaymentBuckarooController.kt
diff --git a/...n/controllers/PaymentMandateController.kt → ...t/controllers/PaymentMandateController.kt b/...n/controllers/PaymentMandateController.kt → ...t/controllers/PaymentMandateController.kt
diff --git a/...ntrollers/PaymentTransactionController.kt → ...ntrollers/PaymentTransactionController.kt b/...ntrollers/PaymentTransactionController.kt → ...ntrollers/PaymentTransactionController.kt
diff --git a/...t/src/main/kotlin/data/PaymentLoadData.kt → ...o/feature/payment/data/PaymentLoadData.kt b/...t/src/main/kotlin/data/PaymentLoadData.kt → ...o/feature/payment/data/PaymentLoadData.kt
diff --git a/.../main/kotlin/event/PaymentFailureEvent.kt → ...ture/payment/event/PaymentFailureEvent.kt b/.../main/kotlin/event/PaymentFailureEvent.kt → ...ture/payment/event/PaymentFailureEvent.kt
diff --git a/.../main/kotlin/event/PaymentSuccessEvent.kt → ...ture/payment/event/PaymentSuccessEvent.kt b/.../main/kotlin/event/PaymentSuccessEvent.kt → ...ture/payment/event/PaymentSuccessEvent.kt
diff --git a/.../exceptions/PaymentNotCreatedException.kt → .../exceptions/PaymentNotCreatedException.kt b/.../exceptions/PaymentNotCreatedException.kt → .../exceptions/PaymentNotCreatedException.kt
diff --git a/...c/main/kotlin/model/PaymentBankAccount.kt → ...ature/payment/model/PaymentBankAccount.kt b/...c/main/kotlin/model/PaymentBankAccount.kt → ...ature/payment/model/PaymentBankAccount.kt
diff --git a/...src/main/kotlin/model/PaymentFrequency.kt → ...feature/payment/model/PaymentFrequency.kt b/...src/main/kotlin/model/PaymentFrequency.kt → ...feature/payment/model/PaymentFrequency.kt
diff --git a/...t/src/main/kotlin/model/PaymentMandate.kt → ...o/feature/payment/model/PaymentMandate.kt b/...t/src/main/kotlin/model/PaymentMandate.kt → ...o/feature/payment/model/PaymentMandate.kt
diff --git a/...c/main/kotlin/model/PaymentTransaction.kt → ...ature/payment/model/PaymentTransaction.kt b/...c/main/kotlin/model/PaymentTransaction.kt → ...ature/payment/model/PaymentTransaction.kt
diff --git a/.../kotlin/model/PaymentTransactionStatus.kt → ...payment/model/PaymentTransactionStatus.kt b/.../kotlin/model/PaymentTransactionStatus.kt → ...payment/model/PaymentTransactionStatus.kt
diff --git a/...ment/src/main/kotlin/model/PaymentType.kt → .../eco/feature/payment/model/PaymentType.kt b/...ment/src/main/kotlin/model/PaymentType.kt → .../eco/feature/payment/model/PaymentType.kt
diff --git a/.../repositories/PaymentMandateRepository.kt → .../repositories/PaymentMandateRepository.kt b/.../repositories/PaymentMandateRepository.kt → .../repositories/PaymentMandateRepository.kt
diff --git a/...ositories/PaymentTransactionRepository.kt → ...ositories/PaymentTransactionRepository.kt b/...ositories/PaymentTransactionRepository.kt → ...ositories/PaymentTransactionRepository.kt
diff --git a/...kotlin/services/PaymentBuckarooService.kt → ...ayment/services/PaymentBuckarooService.kt b/...kotlin/services/PaymentBuckarooService.kt → ...ayment/services/PaymentBuckarooService.kt
diff --git a/...ain/kotlin/services/PaymentSepaService.kt → ...re/payment/services/PaymentSepaService.kt b/...ain/kotlin/services/PaymentSepaService.kt → ...re/payment/services/PaymentSepaService.kt
diff --git a/.../kotlin/services/PaymentSepaXmlService.kt → ...payment/services/PaymentSepaXmlService.kt b/.../kotlin/services/PaymentSepaXmlService.kt → ...payment/services/PaymentSepaXmlService.kt
diff --git a/...ment/src/test/kotlin/mapper/MapperTest.kt → .../eco/feature/payment/mapper/MapperTest.kt b/...ment/src/test/kotlin/mapper/MapperTest.kt → .../eco/feature/payment/mapper/MapperTest.kt
diff --git a/...lin/repositories/PaymentRepositoryTest.kt → ...ent/repositories/PaymentRepositoryTest.kt b/...lin/repositories/PaymentRepositoryTest.kt → ...ent/repositories/PaymentRepositoryTest.kt
diff --git a/...lin/service/PaymentBuckarooServiceTest.kt → ...ent/service/PaymentBuckarooServiceTest.kt b/...lin/service/PaymentBuckarooServiceTest.kt → ...ent/service/PaymentBuckarooServiceTest.kt
diff --git a/.../kotlin/service/PaymentSepaServiceTest.kt → ...payment/service/PaymentSepaServiceTest.kt b/.../kotlin/service/PaymentSepaServiceTest.kt → ...payment/service/PaymentSepaServiceTest.kt
diff --git a/...tlin/service/PaymentSepaXmlServiceTest.kt → ...ment/service/PaymentSepaXmlServiceTest.kt b/...tlin/service/PaymentSepaXmlServiceTest.kt → ...ment/service/PaymentSepaXmlServiceTest.kt
diff --git a/.../kotlin/develop/data/UserGroupLoadData.kt → ...re/user/develop/data/UserGroupLoadData.kt b/.../kotlin/develop/data/UserGroupLoadData.kt → ...re/user/develop/data/UserGroupLoadData.kt
diff --git a/...velop/kotlin/develop/data/UserLoadData.kt → ...feature/user/develop/data/UserLoadData.kt b/...velop/kotlin/develop/data/UserLoadData.kt → ...feature/user/develop/data/UserLoadData.kt
diff --git a/...user/src/main/kotlin/UserConfiguration.kt → ...ock/eco/feature/user/UserConfiguration.kt b/...user/src/main/kotlin/UserConfiguration.kt → ...ock/eco/feature/user/UserConfiguration.kt
diff --git a/...re-user/src/main/kotlin/UserProperties.kt → .../flock/eco/feature/user/UserProperties.kt b/...re-user/src/main/kotlin/UserProperties.kt → .../flock/eco/feature/user/UserProperties.kt
diff --git a/.../main/kotlin/authorities/UserAuthority.kt → ...feature/user/authorities/UserAuthority.kt b/.../main/kotlin/authorities/UserAuthority.kt → ...feature/user/authorities/UserAuthority.kt
diff --git a/...tlin/controllers/UserAccountController.kt → ...user/controllers/UserAccountController.kt b/...tlin/controllers/UserAccountController.kt → ...user/controllers/UserAccountController.kt
diff --git a/...in/controllers/UserAuthorityController.kt → ...er/controllers/UserAuthorityController.kt b/...in/controllers/UserAuthorityController.kt → ...er/controllers/UserAuthorityController.kt
diff --git a/...main/kotlin/controllers/UserController.kt → ...eature/user/controllers/UserController.kt b/...main/kotlin/controllers/UserController.kt → ...eature/user/controllers/UserController.kt
diff --git a/...otlin/controllers/UserControllerAdvice.kt → .../user/controllers/UserControllerAdvice.kt b/...otlin/controllers/UserControllerAdvice.kt → .../user/controllers/UserControllerAdvice.kt
diff --git a/...kotlin/controllers/UserGroupController.kt → ...e/user/controllers/UserGroupController.kt b/...kotlin/controllers/UserGroupController.kt → ...e/user/controllers/UserGroupController.kt
diff --git a/...lin/controllers/UserRegisterController.kt → ...ser/controllers/UserRegisterController.kt b/...lin/controllers/UserRegisterController.kt → ...ser/controllers/UserRegisterController.kt
diff --git a/...otlin/controllers/UserStatusController.kt → .../user/controllers/UserStatusController.kt b/...otlin/controllers/UserStatusController.kt → .../user/controllers/UserStatusController.kt
diff --git a/...rc/main/kotlin/events/UserAccountEvent.kt → ...o/feature/user/events/UserAccountEvent.kt b/...rc/main/kotlin/events/UserAccountEvent.kt → ...o/feature/user/events/UserAccountEvent.kt
diff --git a/...lin/events/UserAccountNewPasswordEvent.kt → ...ser/events/UserAccountNewPasswordEvent.kt b/...lin/events/UserAccountNewPasswordEvent.kt → ...ser/events/UserAccountNewPasswordEvent.kt
diff --git a/...n/events/UserAccountPasswordResetEvent.kt → ...r/events/UserAccountPasswordResetEvent.kt b/...n/events/UserAccountPasswordResetEvent.kt → ...r/events/UserAccountPasswordResetEvent.kt
diff --git a/...nts/UserAccountResetCodeGeneratedEvent.kt → ...nts/UserAccountResetCodeGeneratedEvent.kt b/...nts/UserAccountResetCodeGeneratedEvent.kt → ...nts/UserAccountResetCodeGeneratedEvent.kt
diff --git a/...src/main/kotlin/events/UserCreateEvent.kt → ...co/feature/user/events/UserCreateEvent.kt b/...src/main/kotlin/events/UserCreateEvent.kt → ...co/feature/user/events/UserCreateEvent.kt
diff --git a/...src/main/kotlin/events/UserDeleteEvent.kt → ...co/feature/user/events/UserDeleteEvent.kt b/...src/main/kotlin/events/UserDeleteEvent.kt → ...co/feature/user/events/UserDeleteEvent.kt
diff --git a/...-user/src/main/kotlin/events/UserEvent.kt → ...lock/eco/feature/user/events/UserEvent.kt b/...-user/src/main/kotlin/events/UserEvent.kt → ...lock/eco/feature/user/events/UserEvent.kt
diff --git a/...src/main/kotlin/events/UserUpdateEvent.kt → ...co/feature/user/events/UserUpdateEvent.kt b/...src/main/kotlin/events/UserUpdateEvent.kt → ...co/feature/user/events/UserUpdateEvent.kt
diff --git a/...ain/kotlin/exceptions/EcoUserException.kt → ...ature/user/exceptions/EcoUserException.kt b/...ain/kotlin/exceptions/EcoUserException.kt → ...ature/user/exceptions/EcoUserException.kt
diff --git a/...NewPasswordMatchesOldPasswordException.kt → ...NewPasswordMatchesOldPasswordException.kt b/...NewPasswordMatchesOldPasswordException.kt → ...NewPasswordMatchesOldPasswordException.kt
diff --git a/.../exceptions/UserAccountExistsException.kt → .../exceptions/UserAccountExistsException.kt b/.../exceptions/UserAccountExistsException.kt → .../exceptions/UserAccountExistsException.kt
diff --git a/...eptions/UserAccountNotFoundForUserCode.kt → ...eptions/UserAccountNotFoundForUserCode.kt b/...eptions/UserAccountNotFoundForUserCode.kt → ...eptions/UserAccountNotFoundForUserCode.kt
diff --git a/...ptions/UserAccountNotFoundForUserEmail.kt → ...ptions/UserAccountNotFoundForUserEmail.kt b/...ptions/UserAccountNotFoundForUserEmail.kt → ...ptions/UserAccountNotFoundForUserEmail.kt
diff --git a/...countNotFoundWrongOldPasswordException.kt → ...countNotFoundWrongOldPasswordException.kt b/...countNotFoundWrongOldPasswordException.kt → ...countNotFoundWrongOldPasswordException.kt
diff --git a/.../exceptions/UserCannotRemoveOwnAccount.kt → .../exceptions/UserCannotRemoveOwnAccount.kt b/.../exceptions/UserCannotRemoveOwnAccount.kt → .../exceptions/UserCannotRemoveOwnAccount.kt
diff --git a/...main/kotlin/filters/UserKeyTokenFilter.kt → ...eature/user/filters/UserKeyTokenFilter.kt b/...main/kotlin/filters/UserKeyTokenFilter.kt → ...eature/user/filters/UserKeyTokenFilter.kt
diff --git a/.../src/main/kotlin/forms/UserAccountForm.kt → ...eco/feature/user/forms/UserAccountForm.kt b/.../src/main/kotlin/forms/UserAccountForm.kt → ...eco/feature/user/forms/UserAccountForm.kt
diff --git a/...main/kotlin/forms/UserAccountOauthForm.kt → ...eature/user/forms/UserAccountOauthForm.kt b/...main/kotlin/forms/UserAccountOauthForm.kt → ...eature/user/forms/UserAccountOauthForm.kt
diff --git a/...n/kotlin/forms/UserAccountPasswordForm.kt → ...ure/user/forms/UserAccountPasswordForm.kt b/...n/kotlin/forms/UserAccountPasswordForm.kt → ...ure/user/forms/UserAccountPasswordForm.kt
diff --git a/...re-user/src/main/kotlin/forms/UserForm.kt → .../flock/eco/feature/user/forms/UserForm.kt b/...re-user/src/main/kotlin/forms/UserForm.kt → .../flock/eco/feature/user/forms/UserForm.kt
diff --git a/...er/src/main/kotlin/forms/UserGroupForm.kt → ...k/eco/feature/user/forms/UserGroupForm.kt b/...er/src/main/kotlin/forms/UserGroupForm.kt → ...k/eco/feature/user/forms/UserGroupForm.kt
diff --git a/...user/src/main/kotlin/forms/UserKeyForm.kt → ...ock/eco/feature/user/forms/UserKeyForm.kt b/...user/src/main/kotlin/forms/UserKeyForm.kt → ...ock/eco/feature/user/forms/UserKeyForm.kt
diff --git a/...eature-user/src/main/kotlin/model/User.kt → ...nity/flock/eco/feature/user/model/User.kt b/...eature-user/src/main/kotlin/model/User.kt → ...nity/flock/eco/feature/user/model/User.kt
diff --git a/...user/src/main/kotlin/model/UserAccount.kt → ...ock/eco/feature/user/model/UserAccount.kt b/...user/src/main/kotlin/model/UserAccount.kt → ...ock/eco/feature/user/model/UserAccount.kt
diff --git a/...r/src/main/kotlin/model/UserAccountKey.kt → .../eco/feature/user/model/UserAccountKey.kt b/...r/src/main/kotlin/model/UserAccountKey.kt → .../eco/feature/user/model/UserAccountKey.kt
diff --git a/...src/main/kotlin/model/UserAccountOauth.kt → ...co/feature/user/model/UserAccountOauth.kt b/...src/main/kotlin/model/UserAccountOauth.kt → ...co/feature/user/model/UserAccountOauth.kt
diff --git a/.../kotlin/model/UserAccountOauthProvider.kt → ...re/user/model/UserAccountOauthProvider.kt b/.../kotlin/model/UserAccountOauthProvider.kt → ...re/user/model/UserAccountOauthProvider.kt
diff --git a/.../main/kotlin/model/UserAccountPassword.kt → ...feature/user/model/UserAccountPassword.kt b/.../main/kotlin/model/UserAccountPassword.kt → ...feature/user/model/UserAccountPassword.kt
diff --git a/...e-user/src/main/kotlin/model/UserGroup.kt → ...flock/eco/feature/user/model/UserGroup.kt b/...e-user/src/main/kotlin/model/UserGroup.kt → ...flock/eco/feature/user/model/UserGroup.kt
diff --git a/.../repositories/UserAccountKeyRepository.kt → .../repositories/UserAccountKeyRepository.kt b/.../repositories/UserAccountKeyRepository.kt → .../repositories/UserAccountKeyRepository.kt
diff --git a/...epositories/UserAccountOauthRepository.kt → ...epositories/UserAccountOauthRepository.kt b/...epositories/UserAccountOauthRepository.kt → ...epositories/UserAccountOauthRepository.kt
diff --git a/...sitories/UserAccountPasswordRepository.kt → ...sitories/UserAccountPasswordRepository.kt b/...sitories/UserAccountPasswordRepository.kt → ...sitories/UserAccountPasswordRepository.kt
diff --git a/...lin/repositories/UserAccountRepository.kt → ...ser/repositories/UserAccountRepository.kt b/...lin/repositories/UserAccountRepository.kt → ...ser/repositories/UserAccountRepository.kt
diff --git a/...otlin/repositories/UserGroupRepository.kt → .../user/repositories/UserGroupRepository.kt b/...otlin/repositories/UserGroupRepository.kt → .../user/repositories/UserGroupRepository.kt
diff --git a/...ain/kotlin/repositories/UserRepository.kt → ...ature/user/repositories/UserRepository.kt b/...ain/kotlin/repositories/UserRepository.kt → ...ature/user/repositories/UserRepository.kt
diff --git a/...ain/kotlin/resolvers/UserQueryResolver.kt → ...ature/user/resolvers/UserQueryResolver.kt b/...ain/kotlin/resolvers/UserQueryResolver.kt → ...ature/user/resolvers/UserQueryResolver.kt
diff --git a/...ain/kotlin/services/UserAccountService.kt → ...ature/user/services/UserAccountService.kt b/...ain/kotlin/services/UserAccountService.kt → ...ature/user/services/UserAccountService.kt
diff --git a/...n/kotlin/services/UserAuthorityService.kt → ...ure/user/services/UserAuthorityService.kt b/...n/kotlin/services/UserAuthorityService.kt → ...ure/user/services/UserAuthorityService.kt
diff --git a/.../main/kotlin/services/UserGroupService.kt → ...feature/user/services/UserGroupService.kt b/.../main/kotlin/services/UserGroupService.kt → ...feature/user/services/UserGroupService.kt
diff --git a/...in/kotlin/services/UserSecurityService.kt → ...ture/user/services/UserSecurityService.kt b/...in/kotlin/services/UserSecurityService.kt → ...ture/user/services/UserSecurityService.kt
diff --git a/...r/src/main/kotlin/services/UserService.kt → .../eco/feature/user/services/UserService.kt b/...r/src/main/kotlin/services/UserService.kt → .../eco/feature/user/services/UserService.kt
diff --git a/...ries/UserAccountPasswordRepositoryTest.kt → ...ries/UserAccountPasswordRepositoryTest.kt b/...ries/UserAccountPasswordRepositoryTest.kt → ...ries/UserAccountPasswordRepositoryTest.kt
diff --git a/...n/repositories/UserGroupRepositoryTest.kt → ...r/repositories/UserGroupRepositoryTest.kt b/...n/repositories/UserGroupRepositoryTest.kt → ...r/repositories/UserGroupRepositoryTest.kt
diff --git a/...kotlin/repositories/UserRepositoryTest.kt → ...e/user/repositories/UserRepositoryTest.kt b/...kotlin/repositories/UserRepositoryTest.kt → ...e/user/repositories/UserRepositoryTest.kt
diff --git a/...kotlin/services/UserAccountServiceTest.kt → ...e/user/services/UserAccountServiceTest.kt b/...kotlin/services/UserAccountServiceTest.kt → ...e/user/services/UserAccountServiceTest.kt
diff --git a/...t/kotlin/services/UserGroupServiceTest.kt → ...ure/user/services/UserGroupServiceTest.kt b/...t/kotlin/services/UserGroupServiceTest.kt → ...ure/user/services/UserGroupServiceTest.kt
diff --git a/...c/test/kotlin/services/UserServiceTest.kt → .../feature/user/services/UserServiceTest.kt b/...c/test/kotlin/services/UserServiceTest.kt → .../feature/user/services/UserServiceTest.kt
diff --git a/.../kotlin/develop.data/WorkspaceLoadData.kt → ...rkspace/develop/data/WorkspaceLoadData.kt b/.../kotlin/develop.data/WorkspaceLoadData.kt → ...rkspace/develop/data/WorkspaceLoadData.kt
diff --git a/...src/main/kotlin/WorkspaceConfiguration.kt → ...ature/workspace/WorkspaceConfiguration.kt b/...src/main/kotlin/WorkspaceConfiguration.kt → ...ature/workspace/WorkspaceConfiguration.kt
diff --git a/.../kotlin/authorities/WorkspaceAuthority.kt → ...rkspace/authorities/WorkspaceAuthority.kt b/.../kotlin/authorities/WorkspaceAuthority.kt → ...rkspace/authorities/WorkspaceAuthority.kt
diff --git a/...kotlin/controllers/WorkspaceController.kt → ...kspace/controllers/WorkspaceController.kt b/...kotlin/controllers/WorkspaceController.kt → ...kspace/controllers/WorkspaceController.kt
diff --git a/...in/controllers/WorkspaceRoleController.kt → ...ce/controllers/WorkspaceRoleController.kt b/...in/controllers/WorkspaceRoleController.kt → ...ce/controllers/WorkspaceRoleController.kt
diff --git a/...in/controllers/WorkspaceUserController.kt → ...ce/controllers/WorkspaceUserController.kt b/...in/controllers/WorkspaceUserController.kt → ...ce/controllers/WorkspaceUserController.kt
diff --git a/.../kotlin/mappers/WorkspaceGraphqlMapper.kt → ...rkspace/mappers/WorkspaceGraphqlMapper.kt b/.../kotlin/mappers/WorkspaceGraphqlMapper.kt → ...rkspace/mappers/WorkspaceGraphqlMapper.kt
diff --git a/...kspace/src/main/kotlin/model/Workspace.kt → .../eco/feature/workspace/model/Workspace.kt b/...kspace/src/main/kotlin/model/Workspace.kt → .../eco/feature/workspace/model/Workspace.kt
diff --git a/...e/src/main/kotlin/model/WorkspaceImage.kt → ...feature/workspace/model/WorkspaceImage.kt b/...e/src/main/kotlin/model/WorkspaceImage.kt → ...feature/workspace/model/WorkspaceImage.kt
diff --git a/...rc/main/kotlin/model/WorkspaceUserRole.kt → ...ture/workspace/model/WorkspaceUserRole.kt b/...rc/main/kotlin/model/WorkspaceUserRole.kt → ...ture/workspace/model/WorkspaceUserRole.kt
diff --git a/...kotlin/providers/WorkspaceUserProvider.kt → ...kspace/providers/WorkspaceUserProvider.kt b/...kotlin/providers/WorkspaceUserProvider.kt → ...kspace/providers/WorkspaceUserProvider.kt
diff --git a/...otlin/repositories/WorkspaceRepository.kt → ...space/repositories/WorkspaceRepository.kt b/...otlin/repositories/WorkspaceRepository.kt → ...space/repositories/WorkspaceRepository.kt
diff --git a/...otlin/resolvers/WorkspaceQueryResolver.kt → ...space/resolvers/WorkspaceQueryResolver.kt b/...otlin/resolvers/WorkspaceQueryResolver.kt → ...space/resolvers/WorkspaceQueryResolver.kt
diff --git a/.../main/kotlin/services/WorkspaceService.kt → ...re/workspace/services/WorkspaceService.kt b/.../main/kotlin/services/WorkspaceService.kt → ...re/workspace/services/WorkspaceService.kt
diff --git a/...rc/main/kotlin/CountryIsoConfiguration.kt → ...co/iso/country/CountryIsoConfiguration.kt b/...rc/main/kotlin/CountryIsoConfiguration.kt → ...co/iso/country/CountryIsoConfiguration.kt
diff --git a/...otlin/controllers/CountryIsoController.kt → ...untry/controllers/CountryIsoController.kt b/...otlin/controllers/CountryIsoController.kt → ...untry/controllers/CountryIsoController.kt
diff --git a/...-country/src/main/kotlin/model/Country.kt → ...ty/flock/eco/iso/country/model/Country.kt b/...-country/src/main/kotlin/model/Country.kt → ...ty/flock/eco/iso/country/model/Country.kt
diff --git a/...tlin/resolvers/CountryIsoQueryResolver.kt → ...ntry/resolvers/CountryIsoQueryResolver.kt b/...tlin/resolvers/CountryIsoQueryResolver.kt → ...ntry/resolvers/CountryIsoQueryResolver.kt
diff --git a/...main/kotlin/services/CountryIsoService.kt → ...iso/country/services/CountryIsoService.kt b/...main/kotlin/services/CountryIsoService.kt → ...iso/country/services/CountryIsoService.kt
diff --git a/.../kotlin/services/CountryIsoServiceTest.kt → ...country/services/CountryIsoServiceTest.kt b/.../kotlin/services/CountryIsoServiceTest.kt → ...country/services/CountryIsoServiceTest.kt
diff --git a/...c/main/kotlin/LanguageIsoConfiguration.kt → .../iso/language/LanguageIsoConfiguration.kt b/...c/main/kotlin/LanguageIsoConfiguration.kt → .../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/...tlin/controllers/LanguageIsoController.kt → ...uage/controllers/LanguageIsoController.kt b/...tlin/controllers/LanguageIsoController.kt → ...uage/controllers/LanguageIsoController.kt
diff --git a/...anguage/src/main/kotlin/model/Language.kt → .../flock/eco/iso/language/model/Language.kt b/...anguage/src/main/kotlin/model/Language.kt → .../flock/eco/iso/language/model/Language.kt
diff --git a/...lin/resolvers/LanguageIsoQueryResolver.kt → ...age/resolvers/LanguageIsoQueryResolver.kt b/...lin/resolvers/LanguageIsoQueryResolver.kt → ...age/resolvers/LanguageIsoQueryResolver.kt
diff --git a/...ain/kotlin/services/LanguageIsoService.kt → ...o/language/services/LanguageIsoService.kt b/...ain/kotlin/services/LanguageIsoService.kt → ...o/language/services/LanguageIsoService.kt
diff --git a/...kotlin/services/LanguageIsoServiceTest.kt → ...nguage/services/LanguageIsoServiceTest.kt b/...kotlin/services/LanguageIsoServiceTest.kt → ...nguage/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
@@ -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>