Move all entities to component folders

Signed-off-by: Dillon-Brown <dillon.brown@salesagility.com>

core/backend/Data/Entity/Record.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity;
+namespace App\Data\Entity;
 
 use ApiPlatform\Core\Annotation\ApiProperty;
 use ApiPlatform\Core\Annotation\ApiResource;

core/backend/Data/Entity/RecordList.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity;
+namespace App\Data\Entity;
 
 use ApiPlatform\Core\Annotation\ApiProperty;
 use ApiPlatform\Core\Annotation\ApiResource;

core/backend/Data/LegacyHandler/ListData.php

@@ -4,7 +4,7 @@
 namespace App\Data\LegacyHandler;
 
 
-use App\Entity\Record;
+use App\Data\Entity\Record;
 
 class ListData
 {

core/backend/Data/LegacyHandler/RecordHandler.php

@@ -4,7 +4,7 @@ namespace App\Data\LegacyHandler;
 
 use ApiBeanMapper;
 use App\Engine\LegacyHandler\LegacyHandler;
-use App\Entity\Record;
+use App\Data\Entity\Record;
 use App\Engine\LegacyHandler\LegacyScopeState;
 use App\Service\ModuleNameMapperInterface;
 use App\Service\RecordProviderInterface;

core/backend/Data/LegacyHandler/RecordListHandler.php

@@ -4,7 +4,7 @@ namespace App\Data\LegacyHandler;
 
 use App\Engine\LegacyHandler\LegacyHandler;
 use App\Engine\LegacyHandler\LegacyScopeState;
-use App\Entity\RecordList;
+use App\Data\Entity\RecordList;
 use App\Service\ModuleNameMapperInterface;
 use App\Service\RecordListProviderInterface;
 use InvalidArgumentException;

core/backend/Data/LegacyHandler/RecordMapper.php

@@ -4,7 +4,7 @@
 namespace App\Data\LegacyHandler;
 
 
-use App\Entity\Record;
+use App\Data\Entity\Record;
 use App\Service\ModuleNameMapperInterface;
 
 class RecordMapper

core/backend/DataPersister/ProcessDataPersister.php

@@ -4,7 +4,7 @@ namespace App\DataPersister;
 
 use ApiPlatform\Core\DataPersister\ContextAwareDataPersisterInterface;
 use ApiPlatform\Core\Exception\InvalidResourceException;
-use App\Entity\Process;
+use App\Process\Entity\Process;
 use App\Service\ProcessHandlerInterface;
 use App\Service\ProcessHandlerRegistry;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;

core/backend/DataPersister/RecordDataPersister.php

@@ -4,7 +4,7 @@ namespace App\DataPersister;
 
 use ApiPlatform\Core\DataPersister\ContextAwareDataPersisterInterface;
 use ApiPlatform\Core\Exception\InvalidResourceException;
-use App\Entity\Record;
+use App\Data\Entity\Record;
 use App\Service\RecordProviderInterface;
 
 class RecordDataPersister implements ContextAwareDataPersisterInterface

core/backend/DataProvider/AppListStringsItemDataProvider.php

@@ -4,7 +4,7 @@ namespace App\DataProvider;
 
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
-use App\Entity\AppListStrings;
+use App\Languages\Entity\AppListStrings;
 use App\Languages\LegacyHandler\AppListStringsHandler;
 
 /**

core/backend/DataProvider/AppStringsItemDataProvider.php

@@ -4,7 +4,7 @@ namespace App\DataProvider;
 
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
-use App\Entity\AppStrings;
+use App\Languages\Entity\AppStrings;
 use App\Languages\LegacyHandler\AppStringsHandler;
 
 /**

core/backend/DataProvider/BatchedStatisticsItemDataProvider.php

@@ -4,7 +4,7 @@ namespace App\DataProvider;
 
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
-use App\Entity\BatchedStatistics;
+use App\Statistics\Entity\BatchedStatistics;
 use App\Service\StatisticsManagerInterface;
 
 class BatchedStatisticsItemDataProvider implements ItemDataProviderInterface, RestrictedDataProviderInterface

core/backend/DataProvider/FieldDefinitionItemDataProvider.php

@@ -4,7 +4,7 @@ namespace App\DataProvider;
 
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
-use App\Entity\FieldDefinition;
+use App\FieldDefinitions\Entity\FieldDefinition;
 use App\FieldDefinitions\LegacyHandler\FieldDefinitionsHandler;
 use Exception;
 

core/backend/DataProvider/ModStringsItemDataProvider.php

@@ -4,7 +4,7 @@ namespace App\DataProvider;
 
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
-use App\Entity\ModStrings;
+use App\Languages\Entity\ModStrings;
 use App\Languages\LegacyHandler\ModStringsHandler;
 
 /**

core/backend/DataProvider/NavbarItemDataProvider.php

@@ -4,7 +4,7 @@ namespace App\DataProvider;
 
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
-use App\Entity\Navbar;
+use App\Navbar\Entity\Navbar;
 use App\Service\NavigationProviderInterface;
 use Symfony\Component\Security\Core\Security;
 

core/backend/DataProvider/ProcessCollectionDataProvider.php

@@ -8,7 +8,7 @@ use ApiPlatform\Core\DataProvider\ArrayPaginator;
 use ApiPlatform\Core\DataProvider\ContextAwareCollectionDataProviderInterface;
 use ApiPlatform\Core\DataProvider\PaginatorInterface;
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
-use App\Entity\Process;
+use App\Process\Entity\Process;
 
 class ProcessCollectionDataProvider implements ContextAwareCollectionDataProviderInterface, RestrictedDataProviderInterface
 {

core/backend/DataProvider/ProcessItemDataProvider.php

@@ -5,7 +5,7 @@ namespace App\DataProvider;
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
 use ApiPlatform\Core\Exception\ItemNotFoundException;
-use App\Entity\Process;
+use App\Process\Entity\Process;
 
 class ProcessItemDataProvider implements ItemDataProviderInterface, RestrictedDataProviderInterface
 {

core/backend/DataProvider/RecordItemDataProvider.php

@@ -4,7 +4,7 @@ namespace App\DataProvider;
 
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
-use App\Entity\Record;
+use App\Data\Entity\Record;
 use App\Service\RecordProviderInterface;
 use Exception;
 

core/backend/DataProvider/RecordListItemDataProvider.php

@@ -5,7 +5,7 @@ namespace App\DataProvider;
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
 use App\Data\LegacyHandler\RecordListHandler;
-use App\Entity\RecordList;
+use App\Data\Entity\RecordList;
 use Exception;
 
 /**

core/backend/DataProvider/StatisticsItemDataProvider.php

@@ -4,7 +4,7 @@ namespace App\DataProvider;
 
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Service\StatisticsProviderRegistry;
 
 class StatisticsItemDataProvider implements ItemDataProviderInterface, RestrictedDataProviderInterface

core/backend/DataProvider/SystemConfigCollectionDataProvider.php

@@ -7,7 +7,7 @@ use ApiPlatform\Core\DataProvider\ArrayPaginator;
 use ApiPlatform\Core\DataProvider\ContextAwareCollectionDataProviderInterface;
 use ApiPlatform\Core\DataProvider\PaginatorInterface;
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
-use App\Entity\SystemConfig;
+use App\SystemConfig\Entity\SystemConfig;
 use App\Service\SystemConfigProviderInterface;
 
 /**

core/backend/DataProvider/SystemConfigItemDataProvider.php

@@ -4,7 +4,7 @@ namespace App\DataProvider;
 
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
-use App\Entity\SystemConfig;
+use App\SystemConfig\Entity\SystemConfig;
 use App\Service\SystemConfigProviderInterface;
 
 /**
@@ -56,4 +56,4 @@ final class SystemConfigItemDataProvider implements ItemDataProviderInterface, R
 
         return $this->systemConfigProvider->getSystemConfig($id);
     }
-}
+}

core/backend/DataProvider/ThemeImagesItemDataProvider.php

@@ -4,7 +4,7 @@ namespace App\DataProvider;
 
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
-use App\Entity\ThemeImages;
+use App\Themes\Entity\ThemeImages;
 use App\Service\ThemeImageService;
 
 /**
@@ -56,4 +56,4 @@ final class ThemeImagesItemDataProvider implements ItemDataProviderInterface, Re
 
         return $this->themeImageService->get($id);
     }
-}
+}

core/backend/DataProvider/UserPreferenceCollectionDataProvider.php

@@ -6,7 +6,7 @@ use ApiPlatform\Core\DataProvider\ArrayPaginator;
 use ApiPlatform\Core\DataProvider\ContextAwareCollectionDataProviderInterface;
 use ApiPlatform\Core\DataProvider\PaginatorInterface;
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
-use App\Entity\UserPreference;
+use App\UserPreferences\Entity\UserPreference;
 use App\Service\UserPreferencesProviderInterface;
 
 /**

core/backend/DataProvider/UserPreferenceItemDataProvider.php

@@ -4,7 +4,7 @@ namespace App\DataProvider;
 
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
-use App\Entity\UserPreference;
+use App\UserPreferences\Entity\UserPreference;
 use App\Service\UserPreferencesProviderInterface;
 
 /**
@@ -55,4 +55,4 @@ final class UserPreferenceItemDataProvider implements ItemDataProviderInterface,
     ): ?UserPreference {
         return $this->userPreferenceService->getUserPreference($id);
     }
-}
+}

core/backend/DataProvider/ViewDefinitionItemDataProvider.php

@@ -4,7 +4,7 @@ namespace App\DataProvider;
 
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
-use App\Entity\ViewDefinition;
+use App\ViewDefinitions\Entity\ViewDefinition;
 use App\Service\ViewDefinitionsProviderInterface;
 use Exception;
 

core/backend/FieldDefinitions/Entity/FieldDefinition.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity;
+namespace App\FieldDefinitions\Entity;
 
 use ApiPlatform\Core\Annotation\ApiProperty;
 use ApiPlatform\Core\Annotation\ApiResource;

core/backend/FieldDefinitions/LegacyHandler/FieldDefinitionMapperInterface.php

@@ -2,7 +2,7 @@
 
 namespace App\FieldDefinitions\LegacyHandler;
 
-use App\Entity\FieldDefinition;
+use App\FieldDefinitions\Entity\FieldDefinition;
 
 interface FieldDefinitionMapperInterface
 {

core/backend/FieldDefinitions/LegacyHandler/FieldDefinitionsHandler.php

@@ -3,7 +3,7 @@
 namespace App\FieldDefinitions\LegacyHandler;
 
 use App\Engine\LegacyHandler\LegacyScopeState;
-use App\Entity\FieldDefinition;
+use App\FieldDefinitions\Entity\FieldDefinition;
 use App\Engine\LegacyHandler\LegacyHandler;
 use App\Service\FieldDefinitionsProviderInterface;
 use App\Service\ModuleNameMapperInterface;

core/backend/FieldDefinitions/LegacyHandler/GroupedFieldDefinitionMapper.php

@@ -2,7 +2,7 @@
 
 namespace App\FieldDefinitions\LegacyHandler;
 
-use App\Entity\FieldDefinition;
+use App\FieldDefinitions\Entity\FieldDefinition;
 
 class GroupedFieldDefinitionMapper implements FieldDefinitionMapperInterface, GroupedFieldDefinitionMapperInterface
 {

core/backend/FieldDefinitions/LegacyHandler/LegacyGroupedFieldDefinitionMapper.php

@@ -2,7 +2,7 @@
 
 namespace App\FieldDefinitions\LegacyHandler;
 
-use App\Entity\FieldDefinition;
+use App\FieldDefinitions\Entity\FieldDefinition;
 
 class LegacyGroupedFieldDefinitionMapper implements FieldDefinitionMapperInterface
 {

core/backend/FieldDefinitions/LegacyHandler/LegacyReadOnlyFieldDefinitionMapper.php

@@ -2,7 +2,7 @@
 
 namespace App\FieldDefinitions\LegacyHandler;
 
-use App\Entity\FieldDefinition;
+use App\FieldDefinitions\Entity\FieldDefinition;
 
 class LegacyReadOnlyFieldDefinitionMapper implements FieldDefinitionMapperInterface
 {

core/backend/Languages/Entity/AppListStrings.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace App\Entity;
+namespace App\Languages\Entity;
 
 use ApiPlatform\Core\Annotation\ApiProperty;
 use ApiPlatform\Core\Annotation\ApiResource;

core/backend/Languages/Entity/AppStrings.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace App\Entity;
+namespace App\Languages\Entity;
 
 use ApiPlatform\Core\Annotation\ApiProperty;
 use ApiPlatform\Core\Annotation\ApiResource;

core/backend/Languages/Entity/ModStrings.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace App\Entity;
+namespace App\Languages\Entity;
 
 use ApiPlatform\Core\Annotation\ApiProperty;
 use ApiPlatform\Core\Annotation\ApiResource;

core/backend/Languages/LegacyHandler/AppListStringsHandler.php

@@ -6,7 +6,7 @@ namespace App\Languages\LegacyHandler;
 
 use ApiPlatform\Core\Exception\ItemNotFoundException;
 use App\Engine\LegacyHandler\LegacyHandler;
-use App\Entity\AppListStrings;
+use App\Languages\Entity\AppListStrings;
 
 class AppListStringsHandler extends LegacyHandler implements AppListStringsProviderInterface
 {

core/backend/Languages/LegacyHandler/AppListStringsProviderInterface.php

@@ -2,7 +2,7 @@
 
 namespace App\Languages\LegacyHandler;
 
-use App\Entity\AppListStrings;
+use App\Languages\Entity\AppListStrings;
 
 interface AppListStringsProviderInterface
 {

core/backend/Languages/LegacyHandler/AppStringsHandler.php

@@ -4,7 +4,7 @@ namespace App\Languages\LegacyHandler;
 
 use ApiPlatform\Core\Exception\ItemNotFoundException;
 use App\Engine\LegacyHandler\LegacyHandler;
-use App\Entity\AppStrings;
+use App\Languages\Entity\AppStrings;
 
 class AppStringsHandler extends LegacyHandler
 {

core/backend/Languages/LegacyHandler/ModStringsHandler.php

@@ -7,7 +7,7 @@ namespace App\Languages\LegacyHandler;
 use ApiPlatform\Core\Exception\ItemNotFoundException;
 use App\Engine\LegacyHandler\LegacyHandler;
 use App\Engine\LegacyHandler\LegacyScopeState;
-use App\Entity\ModStrings;
+use App\Languages\Entity\ModStrings;
 use App\Service\ModuleNameMapperInterface;
 use App\Service\ModuleRegistryInterface;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;

core/backend/Navbar/Entity/Navbar.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity;
+namespace App\Navbar\Entity;
 
 use ApiPlatform\Core\Annotation\ApiProperty;
 use ApiPlatform\Core\Annotation\ApiResource;

core/backend/Navbar/LegacyHandler/NavbarHandler.php

@@ -3,7 +3,7 @@
 namespace App\Navbar\LegacyHandler;
 
 use App\Engine\LegacyHandler\LegacyScopeState;
-use App\Entity\Navbar;
+use App\Navbar\Entity\Navbar;
 use App\Engine\LegacyHandler\LegacyHandler;
 use App\Service\ModuleNameMapperInterface;
 use App\Service\ModuleRegistryInterface;

core/backend/Process/Entity/Process.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace App\Entity;
+namespace App\Process\Entity;
 
 use ApiPlatform\Core\Annotation\ApiProperty;
 use ApiPlatform\Core\Annotation\ApiResource;

core/backend/Process/LegacyHandler/ResetPasswordHandler.php

@@ -5,7 +5,7 @@ namespace App\Process\LegacyHandler;
 
 
 use ApiPlatform\Core\Exception\InvalidArgumentException;
-use App\Entity\Process;
+use App\Process\Entity\Process;
 use App\Engine\LegacyHandler\LegacyHandler;
 use App\Service\ProcessHandlerInterface;
 use BadFunctionCallException;

core/backend/Repository/UserRepository.php

@@ -2,7 +2,7 @@
 
 namespace App\Repository;
 
-use App\Entity\User;
+use App\Module\users\Entity\User;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\NonUniqueResultException;
 use Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface;

core/backend/Resolver/BatchedStatisticsItemResolver.php

@@ -3,7 +3,7 @@
 namespace App\Resolver;
 
 use ApiPlatform\Core\GraphQl\Resolver\QueryItemResolverInterface;
-use App\Entity\BatchedStatistics;
+use App\Statistics\Entity\BatchedStatistics;
 use App\Service\StatisticsManagerInterface;
 
 class BatchedStatisticsItemResolver implements QueryItemResolverInterface

core/backend/Resolver/RecordItemResolver.php

@@ -3,7 +3,7 @@
 namespace App\Resolver;
 
 use ApiPlatform\Core\GraphQl\Resolver\QueryItemResolverInterface;
-use App\Entity\Record;
+use App\Data\Entity\Record;
 use App\Service\RecordProviderInterface;
 use Exception;
 

core/backend/Resolver/RecordListResolver.php

@@ -4,7 +4,7 @@ namespace App\Resolver;
 
 use ApiPlatform\Core\GraphQl\Resolver\QueryItemResolverInterface;
 use App\Data\LegacyHandler\RecordListHandler;
-use App\Entity\RecordList;
+use App\Data\Entity\RecordList;
 
 class RecordListResolver implements QueryItemResolverInterface
 {

core/backend/Resolver/StatisticsItemResolver.php

@@ -3,7 +3,7 @@
 namespace App\Resolver;
 
 use ApiPlatform\Core\GraphQl\Resolver\QueryItemResolverInterface;
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Service\StatisticsManagerInterface;
 
 class StatisticsItemResolver implements QueryItemResolverInterface

core/backend/Security/UserChecker.php

@@ -2,7 +2,7 @@
 
 namespace App\Security;
 
-use App\Entity\User;
+use App\Module\users\Entity\User;
 use App\Security\Exception\UserDeletedException;
 use Symfony\Component\Security\Core\User\UserCheckerInterface;
 use Symfony\Component\Security\Core\User\UserInterface;

core/backend/Service/BulkActions/CsvExportBulkAction.php

@@ -3,7 +3,7 @@
 namespace App\Service\BulkActions;
 
 use ApiPlatform\Core\Exception\InvalidArgumentException;
-use App\Entity\Process;
+use App\Process\Entity\Process;
 use App\Data\LegacyHandler\FilterMapper\LegacyFilterMapper;
 use App\Service\ModuleNameMapperInterface;
 use App\Service\ProcessHandlerInterface;

core/backend/Service/BulkActions/DeleteRecordsBulkAction.php

@@ -3,7 +3,7 @@
 namespace App\Service\BulkActions;
 
 use ApiPlatform\Core\Exception\InvalidArgumentException;
-use App\Entity\Process;
+use App\Process\Entity\Process;
 use App\Service\ModuleNameMapperInterface;
 use App\Service\ProcessHandlerInterface;
 use App\Service\RecordDeletionServiceInterface;

core/backend/Service/BulkActions/MergeRecordsBulkAction.php

@@ -3,7 +3,7 @@
 namespace App\Service\BulkActions;
 
 use ApiPlatform\Core\Exception\InvalidArgumentException;
-use App\Entity\Process;
+use App\Process\Entity\Process;
 use App\Service\ModuleNameMapperInterface;
 use App\Service\ProcessHandlerInterface;
 use Psr\Log\LoggerAwareInterface;

core/backend/Service/FieldDefinitionsProviderInterface.php

@@ -4,7 +4,7 @@
 namespace App\Service;
 
 
-use App\Entity\FieldDefinition;
+use App\FieldDefinitions\Entity\FieldDefinition;
 
 interface FieldDefinitionsProviderInterface
 {

core/backend/Service/NavigationProviderInterface.php

@@ -2,7 +2,7 @@
 
 namespace App\Service;
 
-use App\Entity\Navbar;
+use App\Navbar\Entity\Navbar;
 
 interface NavigationProviderInterface
 {

core/backend/Service/ProcessHandlerInterface.php

@@ -2,7 +2,7 @@
 
 namespace App\Service;
 
-use App\Entity\Process;
+use App\Process\Entity\Process;
 
 interface ProcessHandlerInterface
 {

core/backend/Service/RecordActions/ConvertLeadAction.php

@@ -3,7 +3,7 @@
 namespace App\Service\RecordActions;
 
 use ApiPlatform\Core\Exception\InvalidArgumentException;
-use App\Entity\Process;
+use App\Process\Entity\Process;
 use App\Service\ModuleNameMapperInterface;
 use App\Service\ProcessHandlerInterface;
 

core/backend/Service/RecordActions/DeleteRecordAction.php

@@ -3,7 +3,7 @@
 namespace App\Service\RecordActions;
 
 use ApiPlatform\Core\Exception\InvalidArgumentException;
-use App\Entity\Process;
+use App\Process\Entity\Process;
 use App\Service\ModuleNameMapperInterface;
 use App\Service\ProcessHandlerInterface;
 use App\Service\RecordDeletionServiceInterface;

core/backend/Service/RecordActions/DuplicateRecordAction.php

@@ -3,7 +3,7 @@
 namespace App\Service\RecordActions;
 
 use ApiPlatform\Core\Exception\InvalidArgumentException;
-use App\Entity\Process;
+use App\Process\Entity\Process;
 use App\Service\ModuleNameMapperInterface;
 use App\Service\ProcessHandlerInterface;
 

core/backend/Service/RecordListProviderInterface.php

@@ -2,7 +2,7 @@
 
 namespace App\Service;
 
-use App\Entity\RecordList;
+use App\Data\Entity\RecordList;
 
 interface RecordListProviderInterface
 {

core/backend/Service/RecordProviderInterface.php

@@ -2,7 +2,7 @@
 
 namespace App\Service;
 
-use App\Entity\Record;
+use App\Data\Entity\Record;
 use Exception;
 
 interface RecordProviderInterface

core/backend/Service/StatisticsManager.php

@@ -2,8 +2,8 @@
 
 namespace App\Service;
 
-use App\Entity\BatchedStatistics;
-use App\Entity\Statistic;
+use App\Statistics\Entity\BatchedStatistics;
+use App\Statistics\Entity\Statistic;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use Throwable;

core/backend/Service/StatisticsManagerInterface.php

@@ -2,8 +2,8 @@
 
 namespace App\Service;
 
-use App\Entity\BatchedStatistics;
-use App\Entity\Statistic;
+use App\Statistics\Entity\BatchedStatistics;
+use App\Statistics\Entity\Statistic;
 
 interface StatisticsManagerInterface
 {

core/backend/Service/StatisticsProviderInterface.php

@@ -2,7 +2,7 @@
 
 namespace App\Service;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 
 interface StatisticsProviderInterface
 {

core/backend/Service/SystemConfigProviderInterface.php

@@ -2,7 +2,7 @@
 
 namespace App\Service;
 
-use App\Entity\SystemConfig;
+use App\SystemConfig\Entity\SystemConfig;
 
 interface SystemConfigProviderInterface
 {

core/backend/Service/ThemeImageService.php

@@ -2,7 +2,7 @@
 
 namespace App\Service;
 
-use App\Entity\ThemeImages;
+use App\Themes\Entity\ThemeImages;
 
 class ThemeImageService
 {

core/backend/Service/UserPreferencesProviderInterface.php

@@ -2,7 +2,7 @@
 
 namespace App\Service;
 
-use App\Entity\UserPreference;
+use App\UserPreferences\Entity\UserPreference;
 
 interface UserPreferencesProviderInterface
 {

core/backend/Service/ViewDefinitionsProviderInterface.php

@@ -2,7 +2,7 @@
 
 namespace App\Service;
 
-use App\Entity\ViewDefinition;
+use App\ViewDefinitions\Entity\ViewDefinition;
 use Exception;
 
 interface ViewDefinitionsProviderInterface

core/backend/Statistics/Entity/BatchedStatistics.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace App\Entity;
+namespace App\Statistics\Entity;
 
 use ApiPlatform\Core\Annotation\ApiProperty;
 use ApiPlatform\Core\Annotation\ApiResource;

core/backend/Statistics/Entity/Statistic.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace App\Entity;
+namespace App\Statistics\Entity;
 
 use ApiPlatform\Core\Annotation\ApiProperty;
 use ApiPlatform\Core\Annotation\ApiResource;

core/backend/Statistics/LegacyHandler/AssignedUserOpportunitiesCount.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Legacy\Data\PreparedStatementHandler;
 use App\Data\LegacyHandler\PresetDataHandlers\SubpanelDataQueryHandler;
 use App\Legacy\Data\SecurityFiltersTrait;

core/backend/Statistics/LegacyHandler/CaseAccountGetDateEntered.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Engine\LegacyHandler\LegacyHandler;
 use App\Service\StatisticsProviderInterface;
 use BeanFactory;

core/backend/Statistics/LegacyHandler/CaseDaysOpen.php

@@ -4,7 +4,7 @@ namespace App\Statistics\LegacyHandler;
 
 use aCase;
 use App\Data\LegacyHandler\AuditQueryingTrait;
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Engine\LegacyHandler\LegacyHandler;
 use App\Engine\LegacyHandler\LegacyScopeState;
 use App\Service\ModuleNameMapperInterface;

core/backend/Statistics/LegacyHandler/CasesPerAccount.php

@@ -4,7 +4,7 @@ namespace App\Statistics\LegacyHandler;
 
 use aCase;
 use App\Data\LegacyHandler\PresetDataHandlers\SubpanelDataQueryHandler;
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Service\StatisticsProviderInterface;
 use BeanFactory;
 use Psr\Log\LoggerAwareInterface;

core/backend/Statistics/LegacyHandler/ContactLastTouchPoint.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Data\LegacyHandler\PresetDataHandlers\SubpanelDataQueryHandler;
 use App\Engine\LegacyHandler\LegacyScopeState;
 use App\Service\ModuleNameMapperInterface;

core/backend/Statistics/LegacyHandler/DateTimeStatisticsHandlingTrait.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use DateTimeService;
 use Exception;
 

core/backend/Statistics/LegacyHandler/DaysUntilDueTask.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Engine\LegacyHandler\LegacyHandler;
 use App\Engine\LegacyHandler\LegacyScopeState;
 use App\Service\ModuleNameMapperInterface;

core/backend/Statistics/LegacyHandler/DefaultError.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Service\StatisticsProviderInterface;
 
 class DefaultError implements StatisticsProviderInterface

core/backend/Statistics/LegacyHandler/LeadDaysOpen.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Data\LegacyHandler\AuditQueryingTrait;
 use App\Engine\LegacyHandler\LegacyHandler;
 use App\Engine\LegacyHandler\LegacyScopeState;

core/backend/Statistics/LegacyHandler/OpportunitySalesStageTimeSpan.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Data\LegacyHandler\AuditQueryingTrait;
 use App\Engine\LegacyHandler\LegacyHandler;
 use App\Engine\LegacyHandler\LegacyScopeState;

core/backend/Statistics/LegacyHandler/OpportunitySizeAnalysis.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Legacy\Data\PreparedStatementHandler;
 use App\Data\LegacyHandler\PresetDataHandlers\SubpanelDataQueryHandler;
 use App\Legacy\Data\SecurityFiltersTrait;

core/backend/Statistics/LegacyHandler/Series/AccountsNewByMonth.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler\Series;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Data\LegacyHandler\ListDataQueryHandler;
 use App\Engine\LegacyHandler\LegacyHandler;
 use App\Engine\LegacyHandler\LegacyScopeState;

core/backend/Statistics/LegacyHandler/Series/LeadsByStatusCount.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler\Series;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Data\LegacyHandler\ListDataQueryHandler;
 use App\Engine\LegacyHandler\LegacyHandler;
 use App\Engine\LegacyHandler\LegacyScopeState;

core/backend/Statistics/LegacyHandler/Series/OpportunitiesBySalesStagePipeline.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler\Series;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Data\LegacyHandler\ListDataQueryHandler;
 use App\Engine\LegacyHandler\LegacyHandler;
 use App\Engine\LegacyHandler\LegacyScopeState;

core/backend/Statistics/LegacyHandler/Series/PastYearsClosedOpportunityAmounts.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler\Series;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Data\LegacyHandler\PresetDataHandlers\SubpanelDataQueryHandler;
 use App\Statistics\LegacyHandler\StatisticsHandlingTrait;
 use App\Model\Statistics\ChartOptions;

core/backend/Statistics/LegacyHandler/StatisticsHandlingTrait.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Model\Statistics\ChartOptions;
 use App\Model\Statistics\Series;
 use App\Model\Statistics\SeriesItem;

core/backend/Statistics/LegacyHandler/SubPanelActivitiesNextDate.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Data\LegacyHandler\PresetDataHandlers\SubpanelDataQueryHandler;
 use App\Service\StatisticsProviderInterface;
 

core/backend/Statistics/LegacyHandler/SubPanelCampaignsLastReceived.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Data\LegacyHandler\PresetDataHandlers\SubpanelDataQueryHandler;
 use App\Service\StatisticsProviderInterface;
 use DateFormatService;

core/backend/Statistics/LegacyHandler/SubPanelCasesCount.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Data\LegacyHandler\PresetDataHandlers\SubpanelDataQueryHandler;
 use App\Service\StatisticsProviderInterface;
 

core/backend/Statistics/LegacyHandler/SubPanelContractsRenewalDate.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Service\StatisticsProviderInterface;
 use App\Data\LegacyHandler\PresetDataHandlers\SubpanelDataQueryHandler;
 

core/backend/Statistics/LegacyHandler/SubPanelEventsLastDate.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Data\LegacyHandler\PresetDataHandlers\SubpanelDataQueryHandler;
 use App\Service\StatisticsProviderInterface;
 

core/backend/Statistics/LegacyHandler/SubPanelHistoryLastDate.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Data\LegacyHandler\PresetDataHandlers\SubpanelDataQueryHandler;
 use App\Service\StatisticsProviderInterface;
 

core/backend/Statistics/LegacyHandler/SubPanelInvoicesTotal.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Data\LegacyHandler\PresetDataHandlers\SubpanelDataQueryHandler;
 use App\Service\StatisticsProviderInterface;
 

core/backend/Statistics/LegacyHandler/SubPanelQuotesTotal.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Data\LegacyHandler\PresetDataHandlers\SubpanelDataQueryHandler;
 use App\Service\StatisticsProviderInterface;
 

core/backend/Statistics/LegacyHandler/SubPanelTasksHistoryCount.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Data\LegacyHandler\PresetDataHandlers\SubpanelDataQueryHandler;
 use App\Service\StatisticsProviderInterface;
 

core/backend/Statistics/LegacyHandler/SubpanelDefault.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Data\LegacyHandler\PresetDataHandlers\SubpanelDataQueryHandler;
 use App\Service\StatisticsProviderInterface;
 use Psr\Log\LoggerAwareInterface;

core/backend/Statistics/LegacyHandler/SubpanelOpportunitiesTotal.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Data\LegacyHandler\PresetDataHandlers\SubpanelDataQueryHandler;
 use App\Service\StatisticsProviderInterface;
 

core/backend/Statistics/LegacyHandler/WonOpportunityAmountByYear.php

@@ -2,7 +2,7 @@
 
 namespace App\Statistics\LegacyHandler;
 
-use App\Entity\Statistic;
+use App\Statistics\Entity\Statistic;
 use App\Data\LegacyHandler\PresetDataHandlers\SubpanelDataQueryHandler;
 use App\Service\StatisticsProviderInterface;
 

core/backend/SystemConfig/Entity/SystemConfig.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace App\Entity;
+namespace App\SystemConfig\Entity;
 
 use ApiPlatform\Core\Annotation\ApiProperty;
 use ApiPlatform\Core\Annotation\ApiResource;

core/backend/SystemConfig/LegacyHandler/DateFormatConfigMapper.php

@@ -2,7 +2,7 @@
 
 namespace App\SystemConfig\LegacyHandler;
 
-use App\Entity\SystemConfig;
+use App\SystemConfig\Entity\SystemConfig;
 use App\DateTime\LegacyHandler\DateTimeHandler;
 
 class DateFormatConfigMapper implements SystemConfigMapperInterface

core/backend/SystemConfig/LegacyHandler/DefaultCurrencyConfigMapper.php

@@ -2,7 +2,7 @@
 
 namespace App\SystemConfig\LegacyHandler;
 
-use App\Entity\SystemConfig;
+use App\SystemConfig\Entity\SystemConfig;
 use App\Currency\LegacyHandler\CurrencyHandler;
 
 class DefaultCurrencyConfigMapper implements SystemConfigMapperInterface

core/backend/SystemConfig/LegacyHandler/DefaultModuleConfigMapper.php

@@ -2,7 +2,7 @@
 
 namespace App\SystemConfig\LegacyHandler;
 
-use App\Entity\SystemConfig;
+use App\SystemConfig\Entity\SystemConfig;
 use App\Service\ModuleNameMapperInterface;
 
 class DefaultModuleConfigMapper implements SystemConfigMapperInterface