diff --git a/adapters/persistence/inmemory/analytics/InMemoryAnalyticsSnapshotRepository.ts b/adapters/analytics/persistence/inmemory/InMemoryAnalyticsSnapshotRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/analytics/InMemoryAnalyticsSnapshotRepository.ts
rename to adapters/analytics/persistence/inmemory/InMemoryAnalyticsSnapshotRepository.ts
diff --git a/adapters/persistence/inmemory/analytics/InMemoryEngagementRepository.ts b/adapters/analytics/persistence/inmemory/InMemoryEngagementRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/analytics/InMemoryEngagementRepository.ts
rename to adapters/analytics/persistence/inmemory/InMemoryEngagementRepository.ts
diff --git a/adapters/persistence/inmemory/analytics/InMemoryPageViewRepository.ts b/adapters/analytics/persistence/inmemory/InMemoryPageViewRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/analytics/InMemoryPageViewRepository.ts
rename to adapters/analytics/persistence/inmemory/InMemoryPageViewRepository.ts
diff --git a/adapters/persistence/inmemory/identity/InMemoryAchievementRepository.ts b/adapters/identity/persistence/inmemory/InMemoryAchievementRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/identity/InMemoryAchievementRepository.ts
rename to adapters/identity/persistence/inmemory/InMemoryAchievementRepository.ts
diff --git a/adapters/persistence/inmemory/identity/InMemorySponsorAccountRepository.ts b/adapters/identity/persistence/inmemory/InMemorySponsorAccountRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/identity/InMemorySponsorAccountRepository.ts
rename to adapters/identity/persistence/inmemory/InMemorySponsorAccountRepository.ts
diff --git a/adapters/persistence/inmemory/identity/InMemoryUserRatingRepository.ts b/adapters/identity/persistence/inmemory/InMemoryUserRatingRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/identity/InMemoryUserRatingRepository.ts
rename to adapters/identity/persistence/inmemory/InMemoryUserRatingRepository.ts
diff --git a/adapters/persistence/inmemory/identity/InMemoryUserRepository.ts b/adapters/identity/persistence/inmemory/InMemoryUserRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/identity/InMemoryUserRepository.ts
rename to adapters/identity/persistence/inmemory/InMemoryUserRepository.ts
diff --git a/adapters/persistence/inmemory/media/InMemoryAvatarGenerationRepository.ts b/adapters/media/persistence/inmemory/InMemoryAvatarGenerationRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/media/InMemoryAvatarGenerationRepository.ts
rename to adapters/media/persistence/inmemory/InMemoryAvatarGenerationRepository.ts
diff --git a/adapters/notifications/adapters/DiscordNotificationAdapter.ts b/adapters/notifications/gateways/DiscordNotificationGateway.ts
similarity index 100%
rename from adapters/notifications/adapters/DiscordNotificationAdapter.ts
rename to adapters/notifications/gateways/DiscordNotificationGateway.ts
diff --git a/adapters/notifications/adapters/EmailNotificationAdapter.ts b/adapters/notifications/gateways/EmailNotificationGateway.ts
similarity index 100%
rename from adapters/notifications/adapters/EmailNotificationAdapter.ts
rename to adapters/notifications/gateways/EmailNotificationGateway.ts
diff --git a/adapters/notifications/adapters/InAppNotificationAdapter.ts b/adapters/notifications/gateways/InAppNotificationGateway.ts
similarity index 100%
rename from adapters/notifications/adapters/InAppNotificationAdapter.ts
rename to adapters/notifications/gateways/InAppNotificationGateway.ts
diff --git a/adapters/notifications/adapters/NotificationGatewayRegistry.ts b/adapters/notifications/gateways/NotificationGatewayRegistry.ts
similarity index 100%
rename from adapters/notifications/adapters/NotificationGatewayRegistry.ts
rename to adapters/notifications/gateways/NotificationGatewayRegistry.ts
diff --git a/adapters/persistence/inmemory/notifications/InMemoryNotificationPreferenceRepository.ts b/adapters/notifications/persistence/inmemory/InMemoryNotificationPreferenceRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/notifications/InMemoryNotificationPreferenceRepository.ts
rename to adapters/notifications/persistence/inmemory/InMemoryNotificationPreferenceRepository.ts
diff --git a/adapters/persistence/inmemory/notifications/InMemoryNotificationRepository.ts b/adapters/notifications/persistence/inmemory/InMemoryNotificationRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/notifications/InMemoryNotificationRepository.ts
rename to adapters/notifications/persistence/inmemory/InMemoryNotificationRepository.ts
diff --git a/adapters/persistence/inmemory/racing/InMemoryCarRepository.ts b/adapters/racing/persistence/inmemory/InMemoryCarRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/racing/InMemoryCarRepository.ts
rename to adapters/racing/persistence/inmemory/InMemoryCarRepository.ts
diff --git a/adapters/persistence/inmemory/racing/InMemoryDriverRepository.ts b/adapters/racing/persistence/inmemory/InMemoryDriverRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/racing/InMemoryDriverRepository.ts
rename to adapters/racing/persistence/inmemory/InMemoryDriverRepository.ts
diff --git a/adapters/persistence/inmemory/racing/InMemoryGameRepository.ts b/adapters/racing/persistence/inmemory/InMemoryGameRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/racing/InMemoryGameRepository.ts
rename to adapters/racing/persistence/inmemory/InMemoryGameRepository.ts
diff --git a/adapters/persistence/inmemory/racing/InMemoryLeagueMembershipRepository.ts b/adapters/racing/persistence/inmemory/InMemoryLeagueMembershipRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/racing/InMemoryLeagueMembershipRepository.ts
rename to adapters/racing/persistence/inmemory/InMemoryLeagueMembershipRepository.ts
diff --git a/adapters/persistence/inmemory/racing/InMemoryLeagueRepository.ts b/adapters/racing/persistence/inmemory/InMemoryLeagueRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/racing/InMemoryLeagueRepository.ts
rename to adapters/racing/persistence/inmemory/InMemoryLeagueRepository.ts
diff --git a/adapters/persistence/inmemory/racing/InMemoryLeagueScoringPresetProvider.ts b/adapters/racing/persistence/inmemory/InMemoryLeagueScoringPresetProvider.ts
similarity index 100%
rename from adapters/persistence/inmemory/racing/InMemoryLeagueScoringPresetProvider.ts
rename to adapters/racing/persistence/inmemory/InMemoryLeagueScoringPresetProvider.ts
diff --git a/adapters/persistence/inmemory/racing/InMemoryLeagueWalletRepository.ts b/adapters/racing/persistence/inmemory/InMemoryLeagueWalletRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/racing/InMemoryLeagueWalletRepository.ts
rename to adapters/racing/persistence/inmemory/InMemoryLeagueWalletRepository.ts
diff --git a/adapters/persistence/inmemory/racing/InMemoryLiveryRepository.ts b/adapters/racing/persistence/inmemory/InMemoryLiveryRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/racing/InMemoryLiveryRepository.ts
rename to adapters/racing/persistence/inmemory/InMemoryLiveryRepository.ts
diff --git a/adapters/persistence/inmemory/racing/InMemoryPenaltyRepository.ts b/adapters/racing/persistence/inmemory/InMemoryPenaltyRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/racing/InMemoryPenaltyRepository.ts
rename to adapters/racing/persistence/inmemory/InMemoryPenaltyRepository.ts
diff --git a/adapters/persistence/inmemory/racing/InMemoryProtestRepository.ts b/adapters/racing/persistence/inmemory/InMemoryProtestRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/racing/InMemoryProtestRepository.ts
rename to adapters/racing/persistence/inmemory/InMemoryProtestRepository.ts
diff --git a/adapters/persistence/inmemory/racing/InMemoryRaceEventRepository.ts b/adapters/racing/persistence/inmemory/InMemoryRaceEventRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/racing/InMemoryRaceEventRepository.ts
rename to adapters/racing/persistence/inmemory/InMemoryRaceEventRepository.ts
diff --git a/adapters/persistence/inmemory/racing/InMemoryRaceRegistrationRepository.ts b/adapters/racing/persistence/inmemory/InMemoryRaceRegistrationRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/racing/InMemoryRaceRegistrationRepository.ts
rename to adapters/racing/persistence/inmemory/InMemoryRaceRegistrationRepository.ts
diff --git a/adapters/persistence/inmemory/racing/InMemoryRaceRepository.ts b/adapters/racing/persistence/inmemory/InMemoryRaceRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/racing/InMemoryRaceRepository.ts
rename to adapters/racing/persistence/inmemory/InMemoryRaceRepository.ts
diff --git a/adapters/persistence/inmemory/racing/InMemoryResultRepository.ts b/adapters/racing/persistence/inmemory/InMemoryResultRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/racing/InMemoryResultRepository.ts
rename to adapters/racing/persistence/inmemory/InMemoryResultRepository.ts
diff --git a/adapters/persistence/inmemory/racing/InMemoryScoringRepositories.ts b/adapters/racing/persistence/inmemory/InMemoryScoringRepositories.ts
similarity index 100%
rename from adapters/persistence/inmemory/racing/InMemoryScoringRepositories.ts
rename to adapters/racing/persistence/inmemory/InMemoryScoringRepositories.ts
diff --git a/adapters/persistence/inmemory/racing/InMemorySeasonSponsorshipRepository.ts b/adapters/racing/persistence/inmemory/InMemorySeasonSponsorshipRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/racing/InMemorySeasonSponsorshipRepository.ts
rename to adapters/racing/persistence/inmemory/InMemorySeasonSponsorshipRepository.ts
diff --git a/adapters/persistence/inmemory/racing/InMemorySessionRepository.ts b/adapters/racing/persistence/inmemory/InMemorySessionRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/racing/InMemorySessionRepository.ts
rename to adapters/racing/persistence/inmemory/InMemorySessionRepository.ts
diff --git a/adapters/persistence/inmemory/racing/InMemorySponsorRepository.ts b/adapters/racing/persistence/inmemory/InMemorySponsorRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/racing/InMemorySponsorRepository.ts
rename to adapters/racing/persistence/inmemory/InMemorySponsorRepository.ts
diff --git a/adapters/persistence/inmemory/racing/InMemorySponsorshipPricingRepository.ts b/adapters/racing/persistence/inmemory/InMemorySponsorshipPricingRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/racing/InMemorySponsorshipPricingRepository.ts
rename to adapters/racing/persistence/inmemory/InMemorySponsorshipPricingRepository.ts
diff --git a/adapters/persistence/inmemory/racing/InMemorySponsorshipRequestRepository.ts b/adapters/racing/persistence/inmemory/InMemorySponsorshipRequestRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/racing/InMemorySponsorshipRequestRepository.ts
rename to adapters/racing/persistence/inmemory/InMemorySponsorshipRequestRepository.ts
diff --git a/adapters/persistence/inmemory/racing/InMemoryStandingRepository.ts b/adapters/racing/persistence/inmemory/InMemoryStandingRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/racing/InMemoryStandingRepository.ts
rename to adapters/racing/persistence/inmemory/InMemoryStandingRepository.ts
diff --git a/adapters/persistence/inmemory/racing/InMemoryTeamMembershipRepository.ts b/adapters/racing/persistence/inmemory/InMemoryTeamMembershipRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/racing/InMemoryTeamMembershipRepository.ts
rename to adapters/racing/persistence/inmemory/InMemoryTeamMembershipRepository.ts
diff --git a/adapters/persistence/inmemory/racing/InMemoryTeamRepository.ts b/adapters/racing/persistence/inmemory/InMemoryTeamRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/racing/InMemoryTeamRepository.ts
rename to adapters/racing/persistence/inmemory/InMemoryTeamRepository.ts
diff --git a/adapters/persistence/inmemory/racing/InMemoryTrackRepository.ts b/adapters/racing/persistence/inmemory/InMemoryTrackRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/racing/InMemoryTrackRepository.ts
rename to adapters/racing/persistence/inmemory/InMemoryTrackRepository.ts
diff --git a/adapters/persistence/inmemory/racing/InMemoryTransactionRepository.ts b/adapters/racing/persistence/inmemory/InMemoryTransactionRepository.ts
similarity index 100%
rename from adapters/persistence/inmemory/racing/InMemoryTransactionRepository.ts
rename to adapters/racing/persistence/inmemory/InMemoryTransactionRepository.ts