chore: repackage commons

scc-digitalhub · Nov 18, 2024 · 86457c3 · 86457c3
1 parent 472a044
commit 86457c3
Show file tree

Hide file tree

Showing 265 changed files with 554 additions and 541 deletions.
diff --git a/...cation/src/main/java/it/smartcommunitylabdhub/core/components/cloud/RunCloudListener.java b/...cation/src/main/java/it/smartcommunitylabdhub/core/components/cloud/RunCloudListener.java
@@ -1,8 +1,8 @@
 package it.smartcommunitylabdhub.core.components.cloud;
 
-import it.smartcommunitylabdhub.commons.models.entities.run.Run;
-import it.smartcommunitylabdhub.commons.models.enums.EntityName;
+import it.smartcommunitylabdhub.commons.models.entities.EntityName;
 import it.smartcommunitylabdhub.commons.models.metadata.AuditMetadata;
+import it.smartcommunitylabdhub.commons.models.run.Run;
 import it.smartcommunitylabdhub.core.websocket.UserNotification;
 import it.smartcommunitylabdhub.core.websocket.UserNotificationService;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...it/smartcommunitylabdhub/core/components/infrastructure/processors/ProcessorRegistry.java b/...it/smartcommunitylabdhub/core/components/infrastructure/processors/ProcessorRegistry.java
@@ -2,7 +2,8 @@
 
 import it.smartcommunitylabdhub.commons.annotations.common.RunProcessorType;
 import it.smartcommunitylabdhub.commons.infrastructure.RunProcessor;
-import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseStatus;
+import it.smartcommunitylabdhub.commons.models.run.RunBaseStatus;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

diff --git a/...java/it/smartcommunitylabdhub/core/components/infrastructure/runtimes/RuntimeFactory.java b/...java/it/smartcommunitylabdhub/core/components/infrastructure/runtimes/RuntimeFactory.java
@@ -4,8 +4,9 @@
 import it.smartcommunitylabdhub.commons.infrastructure.RunRunnable;
 import it.smartcommunitylabdhub.commons.infrastructure.Runtime;
 import it.smartcommunitylabdhub.commons.models.base.ExecutableBaseSpec;
-import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec;
-import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseStatus;
+import it.smartcommunitylabdhub.commons.models.run.RunBaseSpec;
+import it.smartcommunitylabdhub.commons.models.run.RunBaseStatus;
+
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;

diff --git a/.../java/it/smartcommunitylabdhub/core/components/infrastructure/specs/SpecExportRunner.java b/.../java/it/smartcommunitylabdhub/core/components/infrastructure/specs/SpecExportRunner.java
@@ -16,7 +16,7 @@
 
 package it.smartcommunitylabdhub.core.components.infrastructure.specs;
 
-import it.smartcommunitylabdhub.commons.models.enums.EntityName;
+import it.smartcommunitylabdhub.commons.models.entities.EntityName;
 import it.smartcommunitylabdhub.commons.models.schemas.Schema;
 import it.smartcommunitylabdhub.commons.services.SpecRegistry;
 import java.io.File;

diff --git a/.../java/it/smartcommunitylabdhub/core/components/infrastructure/specs/SpecRegistryImpl.java b/.../java/it/smartcommunitylabdhub/core/components/infrastructure/specs/SpecRegistryImpl.java
@@ -4,7 +4,7 @@
 import com.github.victools.jsonschema.generator.SchemaGeneratorConfigBuilder;
 import it.smartcommunitylabdhub.commons.annotations.common.SpecType;
 import it.smartcommunitylabdhub.commons.infrastructure.SpecFactory;
-import it.smartcommunitylabdhub.commons.models.enums.EntityName;
+import it.smartcommunitylabdhub.commons.models.entities.EntityName;
 import it.smartcommunitylabdhub.commons.models.schemas.Schema;
 import it.smartcommunitylabdhub.commons.models.specs.Spec;
 import it.smartcommunitylabdhub.commons.services.SpecRegistry;

diff --git a/...n/java/it/smartcommunitylabdhub/core/components/infrastructure/specs/SpecTypeScanner.java b/...n/java/it/smartcommunitylabdhub/core/components/infrastructure/specs/SpecTypeScanner.java
@@ -2,7 +2,7 @@
 
 import it.smartcommunitylabdhub.commons.annotations.common.SpecType;
 import it.smartcommunitylabdhub.commons.infrastructure.SpecFactory;
-import it.smartcommunitylabdhub.commons.models.enums.EntityName;
+import it.smartcommunitylabdhub.commons.models.entities.EntityName;
 import it.smartcommunitylabdhub.commons.models.specs.Spec;
 import it.smartcommunitylabdhub.commons.services.SpecRegistry;
 import it.smartcommunitylabdhub.core.CoreApplication;

diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/components/label/LabelComponent.java b/application/src/main/java/it/smartcommunitylabdhub/core/components/label/LabelComponent.java
@@ -1,6 +1,6 @@
 package it.smartcommunitylabdhub.core.components.label;
 
-import it.smartcommunitylabdhub.commons.models.entities.label.Label;
+import it.smartcommunitylabdhub.commons.models.label.Label;
 import it.smartcommunitylabdhub.commons.models.metadata.BaseMetadata;
 import it.smartcommunitylabdhub.commons.services.entities.LabelService;
 import it.smartcommunitylabdhub.core.models.base.BaseEntity;

diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/components/run/RunManager.java b/application/src/main/java/it/smartcommunitylabdhub/core/components/run/RunManager.java
@@ -14,12 +14,12 @@
 import it.smartcommunitylabdhub.commons.infrastructure.Runtime;
 import it.smartcommunitylabdhub.commons.infrastructure.SecuredRunnable;
 import it.smartcommunitylabdhub.commons.models.base.ExecutableBaseSpec;
-import it.smartcommunitylabdhub.commons.models.entities.function.Function;
-import it.smartcommunitylabdhub.commons.models.entities.run.Run;
-import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec;
-import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseStatus;
-import it.smartcommunitylabdhub.commons.models.entities.task.Task;
 import it.smartcommunitylabdhub.commons.models.enums.State;
+import it.smartcommunitylabdhub.commons.models.function.Function;
+import it.smartcommunitylabdhub.commons.models.run.Run;
+import it.smartcommunitylabdhub.commons.models.run.RunBaseSpec;
+import it.smartcommunitylabdhub.commons.models.run.RunBaseStatus;
+import it.smartcommunitylabdhub.commons.models.task.Task;
 import it.smartcommunitylabdhub.commons.services.entities.FunctionService;
 import it.smartcommunitylabdhub.commons.services.entities.RunService;
 import it.smartcommunitylabdhub.commons.utils.MapUtils;

diff --git a/...n/src/main/java/it/smartcommunitylabdhub/core/components/run/RunTransitionsProcessor.java b/...n/src/main/java/it/smartcommunitylabdhub/core/components/run/RunTransitionsProcessor.java
@@ -3,8 +3,8 @@
 import it.smartcommunitylabdhub.commons.annotations.common.RunProcessorType;
 import it.smartcommunitylabdhub.commons.infrastructure.RunProcessor;
 import it.smartcommunitylabdhub.commons.infrastructure.RunRunnable;
-import it.smartcommunitylabdhub.commons.models.entities.run.Run;
-import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseStatus;
+import it.smartcommunitylabdhub.commons.models.run.Run;
+import it.smartcommunitylabdhub.commons.models.run.RunBaseStatus;
 import it.smartcommunitylabdhub.core.models.specs.run.RunTransitionsSpec;
 import it.smartcommunitylabdhub.core.models.specs.run.RunTransitionsSpec.Transition;
 import it.smartcommunitylabdhub.framework.k8s.processors.K8sProcessor;

diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/config/InfrastructureConfig.java b/application/src/main/java/it/smartcommunitylabdhub/core/config/InfrastructureConfig.java
@@ -3,8 +3,8 @@
 import it.smartcommunitylabdhub.commons.infrastructure.RunRunnable;
 import it.smartcommunitylabdhub.commons.infrastructure.Runtime;
 import it.smartcommunitylabdhub.commons.models.base.ExecutableBaseSpec;
-import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec;
-import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseStatus;
+import it.smartcommunitylabdhub.commons.models.run.RunBaseSpec;
+import it.smartcommunitylabdhub.commons.models.run.RunBaseStatus;
 import it.smartcommunitylabdhub.commons.services.RunnableStore;
 import it.smartcommunitylabdhub.core.components.infrastructure.runtimes.RuntimeFactory;
 import it.smartcommunitylabdhub.core.repositories.RunnableRepository;

diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/config/PersistenceConfig.java b/application/src/main/java/it/smartcommunitylabdhub/core/config/PersistenceConfig.java
@@ -1,15 +1,15 @@
 package it.smartcommunitylabdhub.core.config;
 
-import it.smartcommunitylabdhub.commons.models.entities.artifact.Artifact;
-import it.smartcommunitylabdhub.commons.models.entities.dataitem.DataItem;
-import it.smartcommunitylabdhub.commons.models.entities.function.Function;
-import it.smartcommunitylabdhub.commons.models.entities.log.Log;
-import it.smartcommunitylabdhub.commons.models.entities.model.Model;
-import it.smartcommunitylabdhub.commons.models.entities.project.Project;
-import it.smartcommunitylabdhub.commons.models.entities.run.Run;
-import it.smartcommunitylabdhub.commons.models.entities.secret.Secret;
-import it.smartcommunitylabdhub.commons.models.entities.task.Task;
-import it.smartcommunitylabdhub.commons.models.entities.workflow.Workflow;
+import it.smartcommunitylabdhub.commons.models.artifact.Artifact;
+import it.smartcommunitylabdhub.commons.models.dataitem.DataItem;
+import it.smartcommunitylabdhub.commons.models.function.Function;
+import it.smartcommunitylabdhub.commons.models.log.Log;
+import it.smartcommunitylabdhub.commons.models.model.Model;
+import it.smartcommunitylabdhub.commons.models.project.Project;
+import it.smartcommunitylabdhub.commons.models.run.Run;
+import it.smartcommunitylabdhub.commons.models.secret.Secret;
+import it.smartcommunitylabdhub.commons.models.task.Task;
+import it.smartcommunitylabdhub.commons.models.workflow.Workflow;
 import it.smartcommunitylabdhub.core.models.entities.ArtifactEntity;
 import it.smartcommunitylabdhub.core.models.entities.DataItemEntity;
 import it.smartcommunitylabdhub.core.models.entities.FunctionEntity;

diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/config/SecurityConfig.java b/application/src/main/java/it/smartcommunitylabdhub/core/config/SecurityConfig.java
@@ -8,7 +8,7 @@
 import it.smartcommunitylabdhub.commons.config.ApplicationProperties;
 import it.smartcommunitylabdhub.commons.config.SecurityProperties;
 import it.smartcommunitylabdhub.commons.config.SecurityProperties.JwtAuthenticationProperties;
-import it.smartcommunitylabdhub.commons.models.entities.project.Project;
+import it.smartcommunitylabdhub.commons.models.project.Project;
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/config/WebSocketConfig.java b/application/src/main/java/it/smartcommunitylabdhub/core/config/WebSocketConfig.java
@@ -4,7 +4,7 @@
 import it.smartcommunitylabdhub.commons.config.ApplicationProperties;
 import it.smartcommunitylabdhub.commons.config.SecurityProperties;
 import it.smartcommunitylabdhub.commons.config.SecurityProperties.JwtAuthenticationProperties;
-import it.smartcommunitylabdhub.commons.models.entities.project.Project;
+import it.smartcommunitylabdhub.commons.models.project.Project;
 import it.smartcommunitylabdhub.core.websocket.UserNotificationService;
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.ArrayList;

diff --git a/...n/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/ArtifactController.java b/...n/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/ArtifactController.java
@@ -6,7 +6,7 @@
 import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.SystemException;
-import it.smartcommunitylabdhub.commons.models.entities.artifact.Artifact;
+import it.smartcommunitylabdhub.commons.models.artifact.Artifact;
 import it.smartcommunitylabdhub.commons.models.queries.SearchFilter;
 import it.smartcommunitylabdhub.core.ApplicationKeys;
 import it.smartcommunitylabdhub.core.annotations.ApiVersion;

diff --git a/...n/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/DataItemController.java b/...n/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/DataItemController.java
@@ -6,7 +6,7 @@
 import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.SystemException;
-import it.smartcommunitylabdhub.commons.models.entities.dataitem.DataItem;
+import it.smartcommunitylabdhub.commons.models.dataitem.DataItem;
 import it.smartcommunitylabdhub.commons.models.queries.SearchFilter;
 import it.smartcommunitylabdhub.core.ApplicationKeys;
 import it.smartcommunitylabdhub.core.annotations.ApiVersion;

diff --git a/...n/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/FunctionController.java b/...n/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/FunctionController.java
@@ -6,7 +6,7 @@
 import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.SystemException;
-import it.smartcommunitylabdhub.commons.models.entities.function.Function;
+import it.smartcommunitylabdhub.commons.models.function.Function;
 import it.smartcommunitylabdhub.commons.models.queries.SearchFilter;
 import it.smartcommunitylabdhub.core.ApplicationKeys;
 import it.smartcommunitylabdhub.core.annotations.ApiVersion;

diff --git a/...cation/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/LogController.java b/...cation/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/LogController.java
@@ -6,7 +6,7 @@
 import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.SystemException;
-import it.smartcommunitylabdhub.commons.models.entities.log.Log;
+import it.smartcommunitylabdhub.commons.models.log.Log;
 import it.smartcommunitylabdhub.commons.models.queries.SearchFilter;
 import it.smartcommunitylabdhub.core.ApplicationKeys;
 import it.smartcommunitylabdhub.core.annotations.ApiVersion;

diff --git a/...tion/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/ModelController.java b/...tion/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/ModelController.java
@@ -6,7 +6,7 @@
 import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.SystemException;
-import it.smartcommunitylabdhub.commons.models.entities.model.Model;
+import it.smartcommunitylabdhub.commons.models.model.Model;
 import it.smartcommunitylabdhub.commons.models.queries.SearchFilter;
 import it.smartcommunitylabdhub.core.ApplicationKeys;
 import it.smartcommunitylabdhub.core.annotations.ApiVersion;

diff --git a/...on/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/ProjectController.java b/...on/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/ProjectController.java
@@ -9,9 +9,9 @@
 import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.SystemException;
-import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail;
-import it.smartcommunitylabdhub.commons.models.entities.project.Project;
+import it.smartcommunitylabdhub.commons.models.project.Project;
 import it.smartcommunitylabdhub.commons.models.queries.SearchFilter;
+import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail;
 import it.smartcommunitylabdhub.commons.services.RelationshipsAwareEntityService;
 import it.smartcommunitylabdhub.core.ApplicationKeys;
 import it.smartcommunitylabdhub.core.annotations.ApiVersion;

diff --git a/...cation/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/RunController.java b/...cation/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/RunController.java
@@ -6,8 +6,8 @@
 import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.SystemException;
-import it.smartcommunitylabdhub.commons.models.entities.run.Run;
 import it.smartcommunitylabdhub.commons.models.queries.SearchFilter;
+import it.smartcommunitylabdhub.commons.models.run.Run;
 import it.smartcommunitylabdhub.core.ApplicationKeys;
 import it.smartcommunitylabdhub.core.annotations.ApiVersion;
 import it.smartcommunitylabdhub.core.components.run.RunManager;

diff --git a/...ion/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/SchemaController.java b/...ion/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/SchemaController.java
@@ -2,7 +2,7 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import it.smartcommunitylabdhub.commons.models.enums.EntityName;
+import it.smartcommunitylabdhub.commons.models.entities.EntityName;
 import it.smartcommunitylabdhub.commons.models.schemas.Schema;
 import it.smartcommunitylabdhub.commons.services.SpecRegistry;
 import it.smartcommunitylabdhub.core.annotations.ApiVersion;

diff --git a/...ion/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/SecretController.java b/...ion/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/SecretController.java
@@ -6,7 +6,7 @@
 import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.SystemException;
-import it.smartcommunitylabdhub.commons.models.entities.secret.Secret;
+import it.smartcommunitylabdhub.commons.models.secret.Secret;
 import it.smartcommunitylabdhub.commons.services.entities.SecretService;
 import it.smartcommunitylabdhub.core.annotations.ApiVersion;
 import jakarta.validation.Valid;

diff --git a/...ation/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/TaskController.java b/...ation/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/TaskController.java
@@ -6,8 +6,8 @@
 import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.SystemException;
-import it.smartcommunitylabdhub.commons.models.entities.task.Task;
 import it.smartcommunitylabdhub.commons.models.queries.SearchFilter;
+import it.smartcommunitylabdhub.commons.models.task.Task;
 import it.smartcommunitylabdhub.core.ApplicationKeys;
 import it.smartcommunitylabdhub.core.annotations.ApiVersion;
 import it.smartcommunitylabdhub.core.models.entities.TaskEntity;

diff --git a/...n/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/WorkflowController.java b/...n/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/WorkflowController.java
@@ -6,8 +6,8 @@
 import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.SystemException;
-import it.smartcommunitylabdhub.commons.models.entities.workflow.Workflow;
 import it.smartcommunitylabdhub.commons.models.queries.SearchFilter;
+import it.smartcommunitylabdhub.commons.models.workflow.Workflow;
 import it.smartcommunitylabdhub.core.ApplicationKeys;
 import it.smartcommunitylabdhub.core.annotations.ApiVersion;
 import it.smartcommunitylabdhub.core.models.entities.WorkflowEntity;

diff --git a/.../java/it/smartcommunitylabdhub/core/controllers/v1/context/ArtifactContextController.java b/.../java/it/smartcommunitylabdhub/core/controllers/v1/context/ArtifactContextController.java
@@ -6,18 +6,18 @@
 import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.SystemException;
-import it.smartcommunitylabdhub.commons.models.base.DownloadInfo;
-import it.smartcommunitylabdhub.commons.models.base.FileInfo;
-import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail;
-import it.smartcommunitylabdhub.commons.models.base.UploadInfo;
-import it.smartcommunitylabdhub.commons.models.entities.artifact.Artifact;
+import it.smartcommunitylabdhub.commons.models.artifact.Artifact;
+import it.smartcommunitylabdhub.commons.models.files.FileInfo;
 import it.smartcommunitylabdhub.commons.models.queries.SearchFilter;
+import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail;
 import it.smartcommunitylabdhub.commons.services.RelationshipsAwareEntityService;
 import it.smartcommunitylabdhub.core.ApplicationKeys;
 import it.smartcommunitylabdhub.core.annotations.ApiVersion;
 import it.smartcommunitylabdhub.core.models.entities.ArtifactEntity;
 import it.smartcommunitylabdhub.core.models.queries.filters.entities.ArtifactEntityFilter;
 import it.smartcommunitylabdhub.core.models.queries.services.SearchableArtifactService;
+import it.smartcommunitylabdhub.files.models.DownloadInfo;
+import it.smartcommunitylabdhub.files.models.UploadInfo;
 import it.smartcommunitylabdhub.files.service.EntityFilesService;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;

diff --git a/.../java/it/smartcommunitylabdhub/core/controllers/v1/context/DataItemContextController.java b/.../java/it/smartcommunitylabdhub/core/controllers/v1/context/DataItemContextController.java
@@ -6,18 +6,18 @@
 import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.SystemException;
-import it.smartcommunitylabdhub.commons.models.base.DownloadInfo;
-import it.smartcommunitylabdhub.commons.models.base.FileInfo;
-import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail;
-import it.smartcommunitylabdhub.commons.models.base.UploadInfo;
-import it.smartcommunitylabdhub.commons.models.entities.dataitem.DataItem;
+import it.smartcommunitylabdhub.commons.models.dataitem.DataItem;
+import it.smartcommunitylabdhub.commons.models.files.FileInfo;
 import it.smartcommunitylabdhub.commons.models.queries.SearchFilter;
+import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail;
 import it.smartcommunitylabdhub.commons.services.RelationshipsAwareEntityService;
 import it.smartcommunitylabdhub.core.ApplicationKeys;
 import it.smartcommunitylabdhub.core.annotations.ApiVersion;
 import it.smartcommunitylabdhub.core.models.entities.DataItemEntity;
 import it.smartcommunitylabdhub.core.models.queries.filters.entities.DataItemEntityFilter;
 import it.smartcommunitylabdhub.core.models.queries.services.SearchableDataItemService;
+import it.smartcommunitylabdhub.files.models.DownloadInfo;
+import it.smartcommunitylabdhub.files.models.UploadInfo;
 import it.smartcommunitylabdhub.files.service.EntityFilesService;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;

diff --git a/.../java/it/smartcommunitylabdhub/core/controllers/v1/context/FunctionContextController.java b/.../java/it/smartcommunitylabdhub/core/controllers/v1/context/FunctionContextController.java
@@ -6,10 +6,10 @@
 import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.SystemException;
-import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail;
-import it.smartcommunitylabdhub.commons.models.entities.function.Function;
-import it.smartcommunitylabdhub.commons.models.entities.task.Task;
+import it.smartcommunitylabdhub.commons.models.function.Function;
 import it.smartcommunitylabdhub.commons.models.queries.SearchFilter;
+import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail;
+import it.smartcommunitylabdhub.commons.models.task.Task;
 import it.smartcommunitylabdhub.commons.services.RelationshipsAwareEntityService;
 import it.smartcommunitylabdhub.core.ApplicationKeys;
 import it.smartcommunitylabdhub.core.annotations.ApiVersion;

diff --git a/...ain/java/it/smartcommunitylabdhub/core/controllers/v1/context/LabelContextController.java b/...ain/java/it/smartcommunitylabdhub/core/controllers/v1/context/LabelContextController.java
@@ -3,7 +3,7 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import it.smartcommunitylabdhub.commons.Keys;
-import it.smartcommunitylabdhub.commons.models.entities.label.Label;
+import it.smartcommunitylabdhub.commons.models.label.Label;
 import it.smartcommunitylabdhub.commons.services.entities.LabelService;
 import it.smartcommunitylabdhub.core.annotations.ApiVersion;
 import jakarta.validation.Valid;

diff --git a/.../main/java/it/smartcommunitylabdhub/core/controllers/v1/context/LogContextController.java b/.../main/java/it/smartcommunitylabdhub/core/controllers/v1/context/LogContextController.java
@@ -6,7 +6,7 @@
 import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException;
 import it.smartcommunitylabdhub.commons.exceptions.SystemException;
-import it.smartcommunitylabdhub.commons.models.entities.log.Log;
+import it.smartcommunitylabdhub.commons.models.log.Log;
 import it.smartcommunitylabdhub.commons.models.queries.SearchFilter;
 import it.smartcommunitylabdhub.commons.services.entities.RunService;
 import it.smartcommunitylabdhub.core.ApplicationKeys;