diff --git a/src/main/java/io/pakland/mdas/githubstats/application/FetchAvailableOrganizations.java b/src/main/java/io/pakland/mdas/githubstats/application/FetchAvailableOrganizations.java
index 30541026..937da2a6 100644
--- a/src/main/java/io/pakland/mdas/githubstats/application/FetchAvailableOrganizations.java
+++ b/src/main/java/io/pakland/mdas/githubstats/application/FetchAvailableOrganizations.java
@@ -1,7 +1,7 @@
 package io.pakland.mdas.githubstats.application;
 
 import io.pakland.mdas.githubstats.application.exceptions.HttpException;
-import io.pakland.mdas.githubstats.domain.Organization;
+import io.pakland.mdas.githubstats.domain.entity.Organization;
 import io.pakland.mdas.githubstats.domain.repository.OrganizationExternalRepository;
 
 import java.util.List;
diff --git a/src/main/java/io/pakland/mdas/githubstats/application/FetchCommitsFromPullRequest.java b/src/main/java/io/pakland/mdas/githubstats/application/FetchCommitsFromPullRequest.java
index 041dfb85..31af8582 100644
--- a/src/main/java/io/pakland/mdas/githubstats/application/FetchCommitsFromPullRequest.java
+++ b/src/main/java/io/pakland/mdas/githubstats/application/FetchCommitsFromPullRequest.java
@@ -1,7 +1,7 @@
 package io.pakland.mdas.githubstats.application;
 
 import io.pakland.mdas.githubstats.application.exceptions.HttpException;
-import io.pakland.mdas.githubstats.domain.Commit;
+import io.pakland.mdas.githubstats.domain.entity.Commit;
 import io.pakland.mdas.githubstats.domain.repository.CommitExternalRepository;
 
 import java.util.ArrayList;
diff --git a/src/main/java/io/pakland/mdas/githubstats/application/FetchPullRequestsFromRepository.java b/src/main/java/io/pakland/mdas/githubstats/application/FetchPullRequestsFromRepository.java
index eb732988..1bd0ed51 100644
--- a/src/main/java/io/pakland/mdas/githubstats/application/FetchPullRequestsFromRepository.java
+++ b/src/main/java/io/pakland/mdas/githubstats/application/FetchPullRequestsFromRepository.java
@@ -1,8 +1,8 @@
 package io.pakland.mdas.githubstats.application;
 
 import io.pakland.mdas.githubstats.application.exceptions.HttpException;
-import io.pakland.mdas.githubstats.domain.PullRequest;
-import io.pakland.mdas.githubstats.domain.PullRequestState;
+import io.pakland.mdas.githubstats.domain.entity.PullRequest;
+import io.pakland.mdas.githubstats.domain.entity.PullRequestState;
 import io.pakland.mdas.githubstats.domain.repository.PullRequestExternalRepository;
 import io.pakland.mdas.githubstats.domain.repository.PullRequestExternalRepository.FetchPullRequestFromRepositoryRequest;
 
diff --git a/src/main/java/io/pakland/mdas/githubstats/application/FetchRepositoriesFromTeam.java b/src/main/java/io/pakland/mdas/githubstats/application/FetchRepositoriesFromTeam.java
index 1f27a09e..99d4c80e 100644
--- a/src/main/java/io/pakland/mdas/githubstats/application/FetchRepositoriesFromTeam.java
+++ b/src/main/java/io/pakland/mdas/githubstats/application/FetchRepositoriesFromTeam.java
@@ -1,7 +1,7 @@
 package io.pakland.mdas.githubstats.application;
 
 import io.pakland.mdas.githubstats.application.exceptions.HttpException;
-import io.pakland.mdas.githubstats.domain.Repository;
+import io.pakland.mdas.githubstats.domain.entity.Repository;
 import io.pakland.mdas.githubstats.domain.repository.RepositoryExternalRepository;
 
 import java.util.List;
diff --git a/src/main/java/io/pakland/mdas/githubstats/application/FetchTeamsFromOrganization.java b/src/main/java/io/pakland/mdas/githubstats/application/FetchTeamsFromOrganization.java
index 023e6e22..810c166e 100644
--- a/src/main/java/io/pakland/mdas/githubstats/application/FetchTeamsFromOrganization.java
+++ b/src/main/java/io/pakland/mdas/githubstats/application/FetchTeamsFromOrganization.java
@@ -1,7 +1,7 @@
 package io.pakland.mdas.githubstats.application;
 
 import io.pakland.mdas.githubstats.application.exceptions.HttpException;
-import io.pakland.mdas.githubstats.domain.Team;
+import io.pakland.mdas.githubstats.domain.entity.Team;
 import io.pakland.mdas.githubstats.domain.repository.TeamExternalRepository;
 
 import java.util.List;
diff --git a/src/main/java/io/pakland/mdas/githubstats/application/FetchUsersFromTeam.java b/src/main/java/io/pakland/mdas/githubstats/application/FetchUsersFromTeam.java
index 60a68aeb..b5978d36 100644
--- a/src/main/java/io/pakland/mdas/githubstats/application/FetchUsersFromTeam.java
+++ b/src/main/java/io/pakland/mdas/githubstats/application/FetchUsersFromTeam.java
@@ -1,7 +1,7 @@
 package io.pakland.mdas.githubstats.application;
 
 import io.pakland.mdas.githubstats.application.exceptions.HttpException;
-import io.pakland.mdas.githubstats.domain.User;
+import io.pakland.mdas.githubstats.domain.entity.User;
 import io.pakland.mdas.githubstats.domain.repository.UserExternalRepository;
 
 import java.util.List;
diff --git a/src/main/java/io/pakland/mdas/githubstats/application/AggregateCommits.java b/src/main/java/io/pakland/mdas/githubstats/application/internal/AggregateCommits.java
similarity index 59%
rename from src/main/java/io/pakland/mdas/githubstats/application/AggregateCommits.java
rename to src/main/java/io/pakland/mdas/githubstats/application/internal/AggregateCommits.java
index 01780303..2132a0b2 100644
--- a/src/main/java/io/pakland/mdas/githubstats/application/AggregateCommits.java
+++ b/src/main/java/io/pakland/mdas/githubstats/application/internal/AggregateCommits.java
@@ -1,7 +1,7 @@
-package io.pakland.mdas.githubstats.application;
+package io.pakland.mdas.githubstats.application.internal;
 
-import io.pakland.mdas.githubstats.domain.Commit;
-import io.pakland.mdas.githubstats.domain.CommitAggregation;
+import io.pakland.mdas.githubstats.domain.entity.Commit;
+import io.pakland.mdas.githubstats.domain.entity.CommitAggregation;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
diff --git a/src/main/java/io/pakland/mdas/githubstats/application/AggregateUserReviews.java b/src/main/java/io/pakland/mdas/githubstats/application/internal/AggregateUserReviews.java
similarity index 66%
rename from src/main/java/io/pakland/mdas/githubstats/application/AggregateUserReviews.java
rename to src/main/java/io/pakland/mdas/githubstats/application/internal/AggregateUserReviews.java
index 11c056ea..4e212944 100644
--- a/src/main/java/io/pakland/mdas/githubstats/application/AggregateUserReviews.java
+++ b/src/main/java/io/pakland/mdas/githubstats/application/internal/AggregateUserReviews.java
@@ -1,7 +1,7 @@
-package io.pakland.mdas.githubstats.application;
+package io.pakland.mdas.githubstats.application.internal;
 
-import io.pakland.mdas.githubstats.domain.UserReview;
-import io.pakland.mdas.githubstats.domain.UserReviewAggregation;
+import io.pakland.mdas.githubstats.domain.entity.UserReview;
+import io.pakland.mdas.githubstats.domain.entity.UserReviewAggregation;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
diff --git a/src/main/java/io/pakland/mdas/githubstats/application/GetOrganizationFromId.java b/src/main/java/io/pakland/mdas/githubstats/application/internal/GetOrganizationFromId.java
similarity index 88%
rename from src/main/java/io/pakland/mdas/githubstats/application/GetOrganizationFromId.java
rename to src/main/java/io/pakland/mdas/githubstats/application/internal/GetOrganizationFromId.java
index 4797148d..b635b1df 100644
--- a/src/main/java/io/pakland/mdas/githubstats/application/GetOrganizationFromId.java
+++ b/src/main/java/io/pakland/mdas/githubstats/application/internal/GetOrganizationFromId.java
@@ -1,7 +1,7 @@
-package io.pakland.mdas.githubstats.application;
+package io.pakland.mdas.githubstats.application.internal;
 
 import io.pakland.mdas.githubstats.application.exceptions.OrganizationNotFound;
-import io.pakland.mdas.githubstats.domain.Organization;
+import io.pakland.mdas.githubstats.domain.entity.Organization;
 import io.pakland.mdas.githubstats.domain.repository.OrganizationRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/io/pakland/mdas/githubstats/application/GetUserByLogin.java b/src/main/java/io/pakland/mdas/githubstats/application/internal/GetUserByLogin.java
similarity index 81%
rename from src/main/java/io/pakland/mdas/githubstats/application/GetUserByLogin.java
rename to src/main/java/io/pakland/mdas/githubstats/application/internal/GetUserByLogin.java
index 3bef7bc0..be797696 100644
--- a/src/main/java/io/pakland/mdas/githubstats/application/GetUserByLogin.java
+++ b/src/main/java/io/pakland/mdas/githubstats/application/internal/GetUserByLogin.java
@@ -1,8 +1,7 @@
-package io.pakland.mdas.githubstats.application;
+package io.pakland.mdas.githubstats.application.internal;
 
-import io.pakland.mdas.githubstats.application.exceptions.OrganizationNotFound;
 import io.pakland.mdas.githubstats.application.exceptions.UserLoginNotFound;
-import io.pakland.mdas.githubstats.domain.User;
+import io.pakland.mdas.githubstats.domain.entity.User;
 import io.pakland.mdas.githubstats.domain.repository.UserRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/io/pakland/mdas/githubstats/application/OrchestrateAggregators.java b/src/main/java/io/pakland/mdas/githubstats/application/internal/OrchestrateAggregators.java
similarity index 87%
rename from src/main/java/io/pakland/mdas/githubstats/application/OrchestrateAggregators.java
rename to src/main/java/io/pakland/mdas/githubstats/application/internal/OrchestrateAggregators.java
index ca6b8d92..3e47bdf1 100644
--- a/src/main/java/io/pakland/mdas/githubstats/application/OrchestrateAggregators.java
+++ b/src/main/java/io/pakland/mdas/githubstats/application/internal/OrchestrateAggregators.java
@@ -1,6 +1,8 @@
-package io.pakland.mdas.githubstats.application;
+package io.pakland.mdas.githubstats.application.internal;
 
-import io.pakland.mdas.githubstats.domain.*;
+import io.pakland.mdas.githubstats.application.internal.AggregateCommits;
+import io.pakland.mdas.githubstats.application.internal.AggregateUserReviews;
+import io.pakland.mdas.githubstats.domain.entity.*;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
diff --git a/src/main/java/io/pakland/mdas/githubstats/application/SaveAllCommits.java b/src/main/java/io/pakland/mdas/githubstats/application/internal/SaveAllCommits.java
similarity index 82%
rename from src/main/java/io/pakland/mdas/githubstats/application/SaveAllCommits.java
rename to src/main/java/io/pakland/mdas/githubstats/application/internal/SaveAllCommits.java
index 3b451568..da701a63 100644
--- a/src/main/java/io/pakland/mdas/githubstats/application/SaveAllCommits.java
+++ b/src/main/java/io/pakland/mdas/githubstats/application/internal/SaveAllCommits.java
@@ -1,6 +1,6 @@
-package io.pakland.mdas.githubstats.application;
+package io.pakland.mdas.githubstats.application.internal;
 
-import io.pakland.mdas.githubstats.domain.Commit;
+import io.pakland.mdas.githubstats.domain.entity.Commit;
 import io.pakland.mdas.githubstats.domain.repository.CommitRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/io/pakland/mdas/githubstats/application/SaveAllPullRequests.java b/src/main/java/io/pakland/mdas/githubstats/application/internal/SaveAllPullRequests.java
similarity index 82%
rename from src/main/java/io/pakland/mdas/githubstats/application/SaveAllPullRequests.java
rename to src/main/java/io/pakland/mdas/githubstats/application/internal/SaveAllPullRequests.java
index 9bed50d4..31aeaae7 100644
--- a/src/main/java/io/pakland/mdas/githubstats/application/SaveAllPullRequests.java
+++ b/src/main/java/io/pakland/mdas/githubstats/application/internal/SaveAllPullRequests.java
@@ -1,6 +1,6 @@
-package io.pakland.mdas.githubstats.application;
+package io.pakland.mdas.githubstats.application.internal;
 
-import io.pakland.mdas.githubstats.domain.PullRequest;
+import io.pakland.mdas.githubstats.domain.entity.PullRequest;
 import io.pakland.mdas.githubstats.domain.repository.PullRequestRepository;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/src/main/java/io/pakland/mdas/githubstats/application/SaveAllRepositories.java b/src/main/java/io/pakland/mdas/githubstats/application/internal/SaveAllRepositories.java
similarity index 83%
rename from src/main/java/io/pakland/mdas/githubstats/application/SaveAllRepositories.java
rename to src/main/java/io/pakland/mdas/githubstats/application/internal/SaveAllRepositories.java
index b8240646..fa5059c9 100644
--- a/src/main/java/io/pakland/mdas/githubstats/application/SaveAllRepositories.java
+++ b/src/main/java/io/pakland/mdas/githubstats/application/internal/SaveAllRepositories.java
@@ -1,6 +1,6 @@
-package io.pakland.mdas.githubstats.application;
+package io.pakland.mdas.githubstats.application.internal;
 
-import io.pakland.mdas.githubstats.domain.Repository;
+import io.pakland.mdas.githubstats.domain.entity.Repository;
 import io.pakland.mdas.githubstats.domain.repository.RepositoryRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/io/pakland/mdas/githubstats/application/SaveAllTeams.java b/src/main/java/io/pakland/mdas/githubstats/application/internal/SaveAllTeams.java
similarity index 82%
rename from src/main/java/io/pakland/mdas/githubstats/application/SaveAllTeams.java
rename to src/main/java/io/pakland/mdas/githubstats/application/internal/SaveAllTeams.java
index 0af02985..e96161e3 100644
--- a/src/main/java/io/pakland/mdas/githubstats/application/SaveAllTeams.java
+++ b/src/main/java/io/pakland/mdas/githubstats/application/internal/SaveAllTeams.java
@@ -1,6 +1,6 @@
-package io.pakland.mdas.githubstats.application;
+package io.pakland.mdas.githubstats.application.internal;
 
-import io.pakland.mdas.githubstats.domain.Team;
+import io.pakland.mdas.githubstats.domain.entity.Team;
 import io.pakland.mdas.githubstats.domain.repository.TeamRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/io/pakland/mdas/githubstats/application/SaveAllUserReviews.java b/src/main/java/io/pakland/mdas/githubstats/application/internal/SaveAllUserReviews.java
similarity index 81%
rename from src/main/java/io/pakland/mdas/githubstats/application/SaveAllUserReviews.java
rename to src/main/java/io/pakland/mdas/githubstats/application/internal/SaveAllUserReviews.java
index 72bdefe5..fe62c2f5 100644
--- a/src/main/java/io/pakland/mdas/githubstats/application/SaveAllUserReviews.java
+++ b/src/main/java/io/pakland/mdas/githubstats/application/internal/SaveAllUserReviews.java
@@ -1,6 +1,6 @@
-package io.pakland.mdas.githubstats.application;
+package io.pakland.mdas.githubstats.application.internal;
 
-import io.pakland.mdas.githubstats.domain.UserReview;
+import io.pakland.mdas.githubstats.domain.entity.UserReview;
 import io.pakland.mdas.githubstats.domain.repository.UserReviewRepository;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/src/main/java/io/pakland/mdas/githubstats/application/SaveAllUsers.java b/src/main/java/io/pakland/mdas/githubstats/application/internal/SaveAllUsers.java
similarity index 82%
rename from src/main/java/io/pakland/mdas/githubstats/application/SaveAllUsers.java
rename to src/main/java/io/pakland/mdas/githubstats/application/internal/SaveAllUsers.java
index 356fadd5..5e1964e7 100644
--- a/src/main/java/io/pakland/mdas/githubstats/application/SaveAllUsers.java
+++ b/src/main/java/io/pakland/mdas/githubstats/application/internal/SaveAllUsers.java
@@ -1,6 +1,6 @@
-package io.pakland.mdas.githubstats.application;
+package io.pakland.mdas.githubstats.application.internal;
 
-import io.pakland.mdas.githubstats.domain.User;
+import io.pakland.mdas.githubstats.domain.entity.User;
 import io.pakland.mdas.githubstats.domain.repository.UserRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/io/pakland/mdas/githubstats/application/SaveOrganization.java b/src/main/java/io/pakland/mdas/githubstats/application/internal/SaveOrganization.java
similarity index 85%
rename from src/main/java/io/pakland/mdas/githubstats/application/SaveOrganization.java
rename to src/main/java/io/pakland/mdas/githubstats/application/internal/SaveOrganization.java
index ee0ab1a2..7829a075 100644
--- a/src/main/java/io/pakland/mdas/githubstats/application/SaveOrganization.java
+++ b/src/main/java/io/pakland/mdas/githubstats/application/internal/SaveOrganization.java
@@ -1,6 +1,6 @@
-package io.pakland.mdas.githubstats.application;
+package io.pakland.mdas.githubstats.application.internal;
 
-import io.pakland.mdas.githubstats.domain.Organization;
+import io.pakland.mdas.githubstats.domain.entity.Organization;
 import io.pakland.mdas.githubstats.domain.repository.OrganizationRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/io/pakland/mdas/githubstats/application/unnused/GetOrganizationFromTeamName.java b/src/main/java/io/pakland/mdas/githubstats/application/unnused/GetOrganizationFromTeamName.java
index b8c9360d..62cbeebe 100644
--- a/src/main/java/io/pakland/mdas/githubstats/application/unnused/GetOrganizationFromTeamName.java
+++ b/src/main/java/io/pakland/mdas/githubstats/application/unnused/GetOrganizationFromTeamName.java
@@ -1,8 +1,8 @@
 package io.pakland.mdas.githubstats.application.unnused;
 
 import io.pakland.mdas.githubstats.application.exceptions.TeamNotFound;
-import io.pakland.mdas.githubstats.domain.Organization;
-import io.pakland.mdas.githubstats.domain.Team;
+import io.pakland.mdas.githubstats.domain.entity.Organization;
+import io.pakland.mdas.githubstats.domain.entity.Team;
 import io.pakland.mdas.githubstats.domain.repository.TeamRepository;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/io/pakland/mdas/githubstats/application/unnused/GetRepositoriesByTeam.java b/src/main/java/io/pakland/mdas/githubstats/application/unnused/GetRepositoriesByTeam.java
index bf5a4572..2f4a5054 100644
--- a/src/main/java/io/pakland/mdas/githubstats/application/unnused/GetRepositoriesByTeam.java
+++ b/src/main/java/io/pakland/mdas/githubstats/application/unnused/GetRepositoriesByTeam.java
@@ -1,7 +1,7 @@
 package io.pakland.mdas.githubstats.application.unnused;
 
-import io.pakland.mdas.githubstats.domain.Repository;
-import io.pakland.mdas.githubstats.domain.Team;
+import io.pakland.mdas.githubstats.domain.entity.Repository;
+import io.pakland.mdas.githubstats.domain.entity.Team;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/src/main/java/io/pakland/mdas/githubstats/application/unnused/GetTeamsFromOrganization.java b/src/main/java/io/pakland/mdas/githubstats/application/unnused/GetTeamsFromOrganization.java
index 12b89888..7f4ab029 100644
--- a/src/main/java/io/pakland/mdas/githubstats/application/unnused/GetTeamsFromOrganization.java
+++ b/src/main/java/io/pakland/mdas/githubstats/application/unnused/GetTeamsFromOrganization.java
@@ -1,8 +1,7 @@
 package io.pakland.mdas.githubstats.application.unnused;
 
-import io.pakland.mdas.githubstats.domain.Organization;
-import io.pakland.mdas.githubstats.domain.Team;
-import io.pakland.mdas.githubstats.domain.repository.TeamRepository;
+import io.pakland.mdas.githubstats.domain.entity.Organization;
+import io.pakland.mdas.githubstats.domain.entity.Team;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/Comment.java b/src/main/java/io/pakland/mdas/githubstats/domain/entity/Comment.java
similarity index 92%
rename from src/main/java/io/pakland/mdas/githubstats/domain/Comment.java
rename to src/main/java/io/pakland/mdas/githubstats/domain/entity/Comment.java
index 987bac0d..e5c03564 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/Comment.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/entity/Comment.java
@@ -1,4 +1,4 @@
-package io.pakland.mdas.githubstats.domain;
+package io.pakland.mdas.githubstats.domain.entity;
 
 import javax.persistence.*;
 
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/Commit.java b/src/main/java/io/pakland/mdas/githubstats/domain/entity/Commit.java
similarity index 92%
rename from src/main/java/io/pakland/mdas/githubstats/domain/Commit.java
rename to src/main/java/io/pakland/mdas/githubstats/domain/entity/Commit.java
index f45f71c7..c9cf8349 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/Commit.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/entity/Commit.java
@@ -1,7 +1,6 @@
-package io.pakland.mdas.githubstats.domain;
+package io.pakland.mdas.githubstats.domain.entity;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/CommitAggregation.java b/src/main/java/io/pakland/mdas/githubstats/domain/entity/CommitAggregation.java
similarity index 93%
rename from src/main/java/io/pakland/mdas/githubstats/domain/CommitAggregation.java
rename to src/main/java/io/pakland/mdas/githubstats/domain/entity/CommitAggregation.java
index a92ca3e8..7ead9d9a 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/CommitAggregation.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/entity/CommitAggregation.java
@@ -1,4 +1,4 @@
-package io.pakland.mdas.githubstats.domain;
+package io.pakland.mdas.githubstats.domain.entity;
 
 import java.util.List;
 
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/HistoricQueries.java b/src/main/java/io/pakland/mdas/githubstats/domain/entity/HistoricQueries.java
similarity index 94%
rename from src/main/java/io/pakland/mdas/githubstats/domain/HistoricQueries.java
rename to src/main/java/io/pakland/mdas/githubstats/domain/entity/HistoricQueries.java
index 6fe2fe91..ff39be7d 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/HistoricQueries.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/entity/HistoricQueries.java
@@ -1,4 +1,4 @@
-package io.pakland.mdas.githubstats.domain;
+package io.pakland.mdas.githubstats.domain.entity;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/Organization.java b/src/main/java/io/pakland/mdas/githubstats/domain/entity/Organization.java
similarity index 96%
rename from src/main/java/io/pakland/mdas/githubstats/domain/Organization.java
rename to src/main/java/io/pakland/mdas/githubstats/domain/entity/Organization.java
index ab97921e..0089a830 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/Organization.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/entity/Organization.java
@@ -1,4 +1,4 @@
-package io.pakland.mdas.githubstats.domain;
+package io.pakland.mdas.githubstats.domain.entity;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.HashSet;
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/PullRequest.java b/src/main/java/io/pakland/mdas/githubstats/domain/entity/PullRequest.java
similarity index 97%
rename from src/main/java/io/pakland/mdas/githubstats/domain/PullRequest.java
rename to src/main/java/io/pakland/mdas/githubstats/domain/entity/PullRequest.java
index ba7ebbe4..67152ce3 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/PullRequest.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/entity/PullRequest.java
@@ -1,4 +1,4 @@
-package io.pakland.mdas.githubstats.domain;
+package io.pakland.mdas.githubstats.domain.entity;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/PullRequestState.java b/src/main/java/io/pakland/mdas/githubstats/domain/entity/PullRequestState.java
similarity index 90%
rename from src/main/java/io/pakland/mdas/githubstats/domain/PullRequestState.java
rename to src/main/java/io/pakland/mdas/githubstats/domain/entity/PullRequestState.java
index b6347a75..b06465b8 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/PullRequestState.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/entity/PullRequestState.java
@@ -1,4 +1,4 @@
-package io.pakland.mdas.githubstats.domain;
+package io.pakland.mdas.githubstats.domain.entity;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/Repository.java b/src/main/java/io/pakland/mdas/githubstats/domain/entity/Repository.java
similarity index 96%
rename from src/main/java/io/pakland/mdas/githubstats/domain/Repository.java
rename to src/main/java/io/pakland/mdas/githubstats/domain/entity/Repository.java
index df62c450..875fe5b2 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/Repository.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/entity/Repository.java
@@ -1,4 +1,4 @@
-package io.pakland.mdas.githubstats.domain;
+package io.pakland.mdas.githubstats.domain.entity;
 
 import java.util.Map;
 import javax.persistence.*;
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/Team.java b/src/main/java/io/pakland/mdas/githubstats/domain/entity/Team.java
similarity index 96%
rename from src/main/java/io/pakland/mdas/githubstats/domain/Team.java
rename to src/main/java/io/pakland/mdas/githubstats/domain/entity/Team.java
index aa3fae29..39ef6c11 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/Team.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/entity/Team.java
@@ -1,4 +1,4 @@
-package io.pakland.mdas.githubstats.domain;
+package io.pakland.mdas.githubstats.domain.entity;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.*;
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/User.java b/src/main/java/io/pakland/mdas/githubstats/domain/entity/User.java
similarity index 95%
rename from src/main/java/io/pakland/mdas/githubstats/domain/User.java
rename to src/main/java/io/pakland/mdas/githubstats/domain/entity/User.java
index df6654b9..8df91936 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/User.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/entity/User.java
@@ -1,4 +1,4 @@
-package io.pakland.mdas.githubstats.domain;
+package io.pakland.mdas.githubstats.domain.entity;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/UserReview.java b/src/main/java/io/pakland/mdas/githubstats/domain/entity/UserReview.java
similarity index 95%
rename from src/main/java/io/pakland/mdas/githubstats/domain/UserReview.java
rename to src/main/java/io/pakland/mdas/githubstats/domain/entity/UserReview.java
index 0a30c58e..d140cc00 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/UserReview.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/entity/UserReview.java
@@ -1,4 +1,4 @@
-package io.pakland.mdas.githubstats.domain;
+package io.pakland.mdas.githubstats.domain.entity;
 
 import javax.persistence.*;
 
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/UserReviewAggregation.java b/src/main/java/io/pakland/mdas/githubstats/domain/entity/UserReviewAggregation.java
similarity index 91%
rename from src/main/java/io/pakland/mdas/githubstats/domain/UserReviewAggregation.java
rename to src/main/java/io/pakland/mdas/githubstats/domain/entity/UserReviewAggregation.java
index 8fde6b6f..057b1708 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/UserReviewAggregation.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/entity/UserReviewAggregation.java
@@ -1,4 +1,4 @@
-package io.pakland.mdas.githubstats.domain;
+package io.pakland.mdas.githubstats.domain.entity;
 
 import java.util.List;
 
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/repository/CommentRepository.java b/src/main/java/io/pakland/mdas/githubstats/domain/repository/CommentRepository.java
index fb90339a..6b0fcccb 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/repository/CommentRepository.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/repository/CommentRepository.java
@@ -1,6 +1,6 @@
 package io.pakland.mdas.githubstats.domain.repository;
 
-import io.pakland.mdas.githubstats.domain.Comment;
+import io.pakland.mdas.githubstats.domain.entity.Comment;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/repository/CommitExternalRepository.java b/src/main/java/io/pakland/mdas/githubstats/domain/repository/CommitExternalRepository.java
index 93ef4284..6dacf1e9 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/repository/CommitExternalRepository.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/repository/CommitExternalRepository.java
@@ -1,7 +1,7 @@
 package io.pakland.mdas.githubstats.domain.repository;
 
 import io.pakland.mdas.githubstats.application.exceptions.HttpException;
-import io.pakland.mdas.githubstats.domain.Commit;
+import io.pakland.mdas.githubstats.domain.entity.Commit;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/repository/CommitRepository.java b/src/main/java/io/pakland/mdas/githubstats/domain/repository/CommitRepository.java
index 6fc88db8..3161b72c 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/repository/CommitRepository.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/repository/CommitRepository.java
@@ -1,6 +1,6 @@
 package io.pakland.mdas.githubstats.domain.repository;
 
-import io.pakland.mdas.githubstats.domain.Commit;
+import io.pakland.mdas.githubstats.domain.entity.Commit;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/repository/HistoricQueriesRepository.java b/src/main/java/io/pakland/mdas/githubstats/domain/repository/HistoricQueriesRepository.java
index 84467c03..2d885c12 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/repository/HistoricQueriesRepository.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/repository/HistoricQueriesRepository.java
@@ -1,6 +1,6 @@
 package io.pakland.mdas.githubstats.domain.repository;
 
-import io.pakland.mdas.githubstats.domain.HistoricQueries;
+import io.pakland.mdas.githubstats.domain.entity.HistoricQueries;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface HistoricQueriesRepository extends JpaRepository<HistoricQueries, Integer> {
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/repository/OrganizationExternalRepository.java b/src/main/java/io/pakland/mdas/githubstats/domain/repository/OrganizationExternalRepository.java
index af21a7d6..e9dfa235 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/repository/OrganizationExternalRepository.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/repository/OrganizationExternalRepository.java
@@ -1,7 +1,7 @@
 package io.pakland.mdas.githubstats.domain.repository;
 
 import io.pakland.mdas.githubstats.application.exceptions.HttpException;
-import io.pakland.mdas.githubstats.domain.Organization;
+import io.pakland.mdas.githubstats.domain.entity.Organization;
 
 import java.util.List;
 
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/repository/OrganizationRepository.java b/src/main/java/io/pakland/mdas/githubstats/domain/repository/OrganizationRepository.java
index 50b5578e..4716f09b 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/repository/OrganizationRepository.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/repository/OrganizationRepository.java
@@ -1,6 +1,6 @@
 package io.pakland.mdas.githubstats.domain.repository;
 
-import io.pakland.mdas.githubstats.domain.Organization;
+import io.pakland.mdas.githubstats.domain.entity.Organization;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/repository/PullRequestExternalRepository.java b/src/main/java/io/pakland/mdas/githubstats/domain/repository/PullRequestExternalRepository.java
index 09e51a65..b256a8e4 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/repository/PullRequestExternalRepository.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/repository/PullRequestExternalRepository.java
@@ -1,8 +1,8 @@
 package io.pakland.mdas.githubstats.domain.repository;
 
 import io.pakland.mdas.githubstats.application.exceptions.HttpException;
-import io.pakland.mdas.githubstats.domain.PullRequest;
-import io.pakland.mdas.githubstats.domain.PullRequestState;
+import io.pakland.mdas.githubstats.domain.entity.PullRequest;
+import io.pakland.mdas.githubstats.domain.entity.PullRequestState;
 import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/repository/PullRequestRepository.java b/src/main/java/io/pakland/mdas/githubstats/domain/repository/PullRequestRepository.java
index 244d99e6..b930cba4 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/repository/PullRequestRepository.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/repository/PullRequestRepository.java
@@ -1,6 +1,6 @@
 package io.pakland.mdas.githubstats.domain.repository;
 
-import io.pakland.mdas.githubstats.domain.PullRequest;
+import io.pakland.mdas.githubstats.domain.entity.PullRequest;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/repository/RepositoryExternalRepository.java b/src/main/java/io/pakland/mdas/githubstats/domain/repository/RepositoryExternalRepository.java
index 69e00866..5e05d48d 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/repository/RepositoryExternalRepository.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/repository/RepositoryExternalRepository.java
@@ -1,7 +1,7 @@
 package io.pakland.mdas.githubstats.domain.repository;
 
 import io.pakland.mdas.githubstats.application.exceptions.HttpException;
-import io.pakland.mdas.githubstats.domain.Repository;
+import io.pakland.mdas.githubstats.domain.entity.Repository;
 
 import java.util.List;
 
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/repository/RepositoryRepository.java b/src/main/java/io/pakland/mdas/githubstats/domain/repository/RepositoryRepository.java
index 0ed0fff3..aebc84ca 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/repository/RepositoryRepository.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/repository/RepositoryRepository.java
@@ -4,5 +4,5 @@
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface RepositoryRepository extends JpaRepository<io.pakland.mdas.githubstats.domain.Repository, Integer> {
+public interface RepositoryRepository extends JpaRepository<io.pakland.mdas.githubstats.domain.entity.Repository, Integer> {
 }
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/repository/TeamExternalRepository.java b/src/main/java/io/pakland/mdas/githubstats/domain/repository/TeamExternalRepository.java
index 45b70736..1dab77e9 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/repository/TeamExternalRepository.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/repository/TeamExternalRepository.java
@@ -1,7 +1,7 @@
 package io.pakland.mdas.githubstats.domain.repository;
 
 import io.pakland.mdas.githubstats.application.exceptions.HttpException;
-import io.pakland.mdas.githubstats.domain.Team;
+import io.pakland.mdas.githubstats.domain.entity.Team;
 
 import java.util.List;
 
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/repository/TeamRepository.java b/src/main/java/io/pakland/mdas/githubstats/domain/repository/TeamRepository.java
index dc83e6b6..0de33c2c 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/repository/TeamRepository.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/repository/TeamRepository.java
@@ -1,6 +1,6 @@
 package io.pakland.mdas.githubstats.domain.repository;
 
-import io.pakland.mdas.githubstats.domain.Team;
+import io.pakland.mdas.githubstats.domain.entity.Team;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/repository/UserExternalRepository.java b/src/main/java/io/pakland/mdas/githubstats/domain/repository/UserExternalRepository.java
index 0665ee78..1cfd66db 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/repository/UserExternalRepository.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/repository/UserExternalRepository.java
@@ -1,7 +1,7 @@
 package io.pakland.mdas.githubstats.domain.repository;
 
 import io.pakland.mdas.githubstats.application.exceptions.HttpException;
-import io.pakland.mdas.githubstats.domain.User;
+import io.pakland.mdas.githubstats.domain.entity.User;
 
 import java.util.List;
 
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/repository/UserRepository.java b/src/main/java/io/pakland/mdas/githubstats/domain/repository/UserRepository.java
index 45fc5286..024c059e 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/repository/UserRepository.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/repository/UserRepository.java
@@ -1,6 +1,6 @@
 package io.pakland.mdas.githubstats.domain.repository;
 
-import io.pakland.mdas.githubstats.domain.User;
+import io.pakland.mdas.githubstats.domain.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
diff --git a/src/main/java/io/pakland/mdas/githubstats/domain/repository/UserReviewRepository.java b/src/main/java/io/pakland/mdas/githubstats/domain/repository/UserReviewRepository.java
index 9783801c..4d17621a 100644
--- a/src/main/java/io/pakland/mdas/githubstats/domain/repository/UserReviewRepository.java
+++ b/src/main/java/io/pakland/mdas/githubstats/domain/repository/UserReviewRepository.java
@@ -1,6 +1,6 @@
 package io.pakland.mdas.githubstats.domain.repository;
 
-import io.pakland.mdas.githubstats.domain.UserReview;
+import io.pakland.mdas.githubstats.domain.entity.UserReview;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
diff --git a/src/main/java/io/pakland/mdas/githubstats/infrastructure/controller/UserControllerFromDb.java b/src/main/java/io/pakland/mdas/githubstats/infrastructure/controller/UserControllerFromDb.java
index 17831eaa..b00c3468 100644
--- a/src/main/java/io/pakland/mdas/githubstats/infrastructure/controller/UserControllerFromDb.java
+++ b/src/main/java/io/pakland/mdas/githubstats/infrastructure/controller/UserControllerFromDb.java
@@ -1,11 +1,13 @@
 package io.pakland.mdas.githubstats.infrastructure.controller;
 
 import io.pakland.mdas.githubstats.application.FetchAvailableOrganizations;
-import io.pakland.mdas.githubstats.application.GetUserByLogin;
-import io.pakland.mdas.githubstats.application.OrchestrateAggregators;
+import io.pakland.mdas.githubstats.application.internal.GetUserByLogin;
+import io.pakland.mdas.githubstats.application.internal.OrchestrateAggregators;
 import io.pakland.mdas.githubstats.application.exceptions.HttpException;
 import io.pakland.mdas.githubstats.application.exceptions.UserLoginNotFound;
-import io.pakland.mdas.githubstats.domain.*;
+import io.pakland.mdas.githubstats.domain.entity.Organization;
+import io.pakland.mdas.githubstats.domain.entity.PullRequest;
+import io.pakland.mdas.githubstats.domain.entity.User;
 import io.pakland.mdas.githubstats.domain.repository.OrganizationExternalRepository;
 import io.pakland.mdas.githubstats.infrastructure.github.repository.OrganizationGitHubRepository;
 import io.pakland.mdas.githubstats.infrastructure.github.repository.WebClientConfiguration;
diff --git a/src/main/java/io/pakland/mdas/githubstats/infrastructure/controller/UserControllerFromGithub.java b/src/main/java/io/pakland/mdas/githubstats/infrastructure/controller/UserControllerFromGithub.java
index c067539d..20463a44 100644
--- a/src/main/java/io/pakland/mdas/githubstats/infrastructure/controller/UserControllerFromGithub.java
+++ b/src/main/java/io/pakland/mdas/githubstats/infrastructure/controller/UserControllerFromGithub.java
@@ -2,7 +2,7 @@
 
 import io.pakland.mdas.githubstats.application.*;
 import io.pakland.mdas.githubstats.application.exceptions.HttpException;
-import io.pakland.mdas.githubstats.domain.*;
+import io.pakland.mdas.githubstats.domain.entity.*;
 import io.pakland.mdas.githubstats.domain.repository.*;
 import io.pakland.mdas.githubstats.infrastructure.github.repository.*;
 import io.pakland.mdas.githubstats.infrastructure.shell.model.UserOptionRequest;
diff --git a/src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/CommitGitHubRepository.java b/src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/CommitGitHubRepository.java
index 4b5d1a75..b7a10481 100644
--- a/src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/CommitGitHubRepository.java
+++ b/src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/CommitGitHubRepository.java
@@ -2,8 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.pakland.mdas.githubstats.application.exceptions.HttpException;
-import io.pakland.mdas.githubstats.domain.Commit;
-import io.pakland.mdas.githubstats.domain.PullRequest;
+import io.pakland.mdas.githubstats.domain.entity.Commit;
 import io.pakland.mdas.githubstats.domain.repository.CommitExternalRepository;
 import lombok.Data;
 import org.slf4j.Logger;
diff --git a/src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/OrganizationGitHubRepository.java b/src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/OrganizationGitHubRepository.java
index 69d58d47..da8c7892 100644
--- a/src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/OrganizationGitHubRepository.java
+++ b/src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/OrganizationGitHubRepository.java
@@ -1,7 +1,7 @@
 package io.pakland.mdas.githubstats.infrastructure.github.repository;
 
 import io.pakland.mdas.githubstats.application.exceptions.HttpException;
-import io.pakland.mdas.githubstats.domain.Organization;
+import io.pakland.mdas.githubstats.domain.entity.Organization;
 import io.pakland.mdas.githubstats.domain.repository.OrganizationExternalRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/PullRequestGitHubRepository.java b/src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/PullRequestGitHubRepository.java
index 149e3e99..ff2928fb 100644
--- a/src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/PullRequestGitHubRepository.java
+++ b/src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/PullRequestGitHubRepository.java
@@ -1,7 +1,7 @@
 package io.pakland.mdas.githubstats.infrastructure.github.repository;
 
 import io.pakland.mdas.githubstats.application.exceptions.HttpException;
-import io.pakland.mdas.githubstats.domain.PullRequest;
+import io.pakland.mdas.githubstats.domain.entity.PullRequest;
 import io.pakland.mdas.githubstats.domain.repository.PullRequestExternalRepository;
 import java.util.List;
 import org.slf4j.Logger;
diff --git a/src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/RepositoryGitHubRepository.java b/src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/RepositoryGitHubRepository.java
index b160174e..9680c890 100644
--- a/src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/RepositoryGitHubRepository.java
+++ b/src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/RepositoryGitHubRepository.java
@@ -1,7 +1,7 @@
 package io.pakland.mdas.githubstats.infrastructure.github.repository;
 
 import io.pakland.mdas.githubstats.application.exceptions.HttpException;
-import io.pakland.mdas.githubstats.domain.Repository;
+import io.pakland.mdas.githubstats.domain.entity.Repository;
 import io.pakland.mdas.githubstats.domain.repository.RepositoryExternalRepository;
 import java.util.List;
 import org.slf4j.Logger;
diff --git a/src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/TeamGitHubRepository.java b/src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/TeamGitHubRepository.java
index 3b42616d..c0d290a0 100644
--- a/src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/TeamGitHubRepository.java
+++ b/src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/TeamGitHubRepository.java
@@ -1,7 +1,7 @@
 package io.pakland.mdas.githubstats.infrastructure.github.repository;
 
 import io.pakland.mdas.githubstats.application.exceptions.HttpException;
-import io.pakland.mdas.githubstats.domain.Team;
+import io.pakland.mdas.githubstats.domain.entity.Team;
 import io.pakland.mdas.githubstats.domain.repository.TeamExternalRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/UserGitHubRepository.java b/src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/UserGitHubRepository.java
index c6c15ea8..10ed8c8e 100644
--- a/src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/UserGitHubRepository.java
+++ b/src/main/java/io/pakland/mdas/githubstats/infrastructure/github/repository/UserGitHubRepository.java
@@ -1,7 +1,7 @@
 package io.pakland.mdas.githubstats.infrastructure.github.repository;
 
 import io.pakland.mdas.githubstats.application.exceptions.HttpException;
-import io.pakland.mdas.githubstats.domain.User;
+import io.pakland.mdas.githubstats.domain.entity.User;
 import io.pakland.mdas.githubstats.domain.repository.UserExternalRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/test/java/io/pakland/mdas/githubstats/application/FetchCommitsFromPullRequestTest.java b/src/test/java/io/pakland/mdas/githubstats/application/FetchCommitsFromPullRequestTest.java
index 831da5c4..fa020ca3 100644
--- a/src/test/java/io/pakland/mdas/githubstats/application/FetchCommitsFromPullRequestTest.java
+++ b/src/test/java/io/pakland/mdas/githubstats/application/FetchCommitsFromPullRequestTest.java
@@ -1,7 +1,7 @@
 package io.pakland.mdas.githubstats.application;
 
 import io.pakland.mdas.githubstats.application.exceptions.HttpException;
-import io.pakland.mdas.githubstats.domain.Commit;
+import io.pakland.mdas.githubstats.domain.entity.Commit;
 import io.pakland.mdas.githubstats.domain.repository.CommitExternalRepository;
 import io.pakland.mdas.githubstats.domain.repository.CommitExternalRepository.FetchCommitsFromPullRequestRequest;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/io/pakland/mdas/githubstats/application/FetchPullRequestFromRepositoryTest.java b/src/test/java/io/pakland/mdas/githubstats/application/FetchPullRequestFromRepositoryTest.java
index b98c6fce..29adb35c 100644
--- a/src/test/java/io/pakland/mdas/githubstats/application/FetchPullRequestFromRepositoryTest.java
+++ b/src/test/java/io/pakland/mdas/githubstats/application/FetchPullRequestFromRepositoryTest.java
@@ -4,8 +4,8 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import io.pakland.mdas.githubstats.application.exceptions.HttpException;
-import io.pakland.mdas.githubstats.domain.PullRequest;
-import io.pakland.mdas.githubstats.domain.PullRequestState;
+import io.pakland.mdas.githubstats.domain.entity.PullRequest;
+import io.pakland.mdas.githubstats.domain.entity.PullRequestState;
 import io.pakland.mdas.githubstats.domain.repository.PullRequestExternalRepository;
 import io.pakland.mdas.githubstats.domain.repository.PullRequestExternalRepository.FetchPullRequestFromRepositoryRequest;
 import java.util.ArrayList;
diff --git a/src/test/java/io/pakland/mdas/githubstats/application/AggregateCommitsTest.java b/src/test/java/io/pakland/mdas/githubstats/application/internal/AggregateCommitsTest.java
similarity index 79%
rename from src/test/java/io/pakland/mdas/githubstats/application/AggregateCommitsTest.java
rename to src/test/java/io/pakland/mdas/githubstats/application/internal/AggregateCommitsTest.java
index 5580c85c..bef1a216 100644
--- a/src/test/java/io/pakland/mdas/githubstats/application/AggregateCommitsTest.java
+++ b/src/test/java/io/pakland/mdas/githubstats/application/internal/AggregateCommitsTest.java
@@ -1,7 +1,7 @@
-package io.pakland.mdas.githubstats.application;
+package io.pakland.mdas.githubstats.application.internal;
 
-import io.pakland.mdas.githubstats.domain.Commit;
-import io.pakland.mdas.githubstats.domain.CommitAggregation;
+import io.pakland.mdas.githubstats.domain.entity.Commit;
+import io.pakland.mdas.githubstats.domain.entity.CommitAggregation;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
diff --git a/src/test/java/io/pakland/mdas/githubstats/application/AggregateUserReviewsTest.java b/src/test/java/io/pakland/mdas/githubstats/application/internal/AggregateUserReviewsTest.java
similarity index 84%
rename from src/test/java/io/pakland/mdas/githubstats/application/AggregateUserReviewsTest.java
rename to src/test/java/io/pakland/mdas/githubstats/application/internal/AggregateUserReviewsTest.java
index 7efeb31a..36756022 100644
--- a/src/test/java/io/pakland/mdas/githubstats/application/AggregateUserReviewsTest.java
+++ b/src/test/java/io/pakland/mdas/githubstats/application/internal/AggregateUserReviewsTest.java
@@ -1,8 +1,8 @@
-package io.pakland.mdas.githubstats.application;
+package io.pakland.mdas.githubstats.application.internal;
 
-import io.pakland.mdas.githubstats.domain.Comment;
-import io.pakland.mdas.githubstats.domain.UserReview;
-import io.pakland.mdas.githubstats.domain.UserReviewAggregation;
+import io.pakland.mdas.githubstats.domain.entity.Comment;
+import io.pakland.mdas.githubstats.domain.entity.UserReview;
+import io.pakland.mdas.githubstats.domain.entity.UserReviewAggregation;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
diff --git a/src/test/java/io/pakland/mdas/githubstats/application/GetOrganizationFromIdTest.java b/src/test/java/io/pakland/mdas/githubstats/application/internal/GetOrganizationFromIdTest.java
similarity index 86%
rename from src/test/java/io/pakland/mdas/githubstats/application/GetOrganizationFromIdTest.java
rename to src/test/java/io/pakland/mdas/githubstats/application/internal/GetOrganizationFromIdTest.java
index 56fbc02e..38c6d48c 100644
--- a/src/test/java/io/pakland/mdas/githubstats/application/GetOrganizationFromIdTest.java
+++ b/src/test/java/io/pakland/mdas/githubstats/application/internal/GetOrganizationFromIdTest.java
@@ -1,7 +1,8 @@
-package io.pakland.mdas.githubstats.application;
+package io.pakland.mdas.githubstats.application.internal;
 
 import io.pakland.mdas.githubstats.application.exceptions.OrganizationNotFound;
-import io.pakland.mdas.githubstats.domain.Organization;
+import io.pakland.mdas.githubstats.application.internal.GetOrganizationFromId;
+import io.pakland.mdas.githubstats.domain.entity.Organization;
 import io.pakland.mdas.githubstats.domain.repository.OrganizationRepository;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
diff --git a/src/test/java/io/pakland/mdas/githubstats/application/SaveAllCommitsTest.java b/src/test/java/io/pakland/mdas/githubstats/application/internal/SaveAllCommitsTest.java
similarity index 79%
rename from src/test/java/io/pakland/mdas/githubstats/application/SaveAllCommitsTest.java
rename to src/test/java/io/pakland/mdas/githubstats/application/internal/SaveAllCommitsTest.java
index 3e2c22f8..f0eefa9b 100644
--- a/src/test/java/io/pakland/mdas/githubstats/application/SaveAllCommitsTest.java
+++ b/src/test/java/io/pakland/mdas/githubstats/application/internal/SaveAllCommitsTest.java
@@ -1,6 +1,7 @@
-package io.pakland.mdas.githubstats.application;
+package io.pakland.mdas.githubstats.application.internal;
 
-import io.pakland.mdas.githubstats.domain.Commit;
+import io.pakland.mdas.githubstats.application.internal.SaveAllCommits;
+import io.pakland.mdas.githubstats.domain.entity.Commit;
 import io.pakland.mdas.githubstats.domain.repository.CommitRepository;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
diff --git a/src/test/java/io/pakland/mdas/githubstats/application/SaveAllPullRequestsTest.java b/src/test/java/io/pakland/mdas/githubstats/application/internal/SaveAllPullRequestsTest.java
similarity index 77%
rename from src/test/java/io/pakland/mdas/githubstats/application/SaveAllPullRequestsTest.java
rename to src/test/java/io/pakland/mdas/githubstats/application/internal/SaveAllPullRequestsTest.java
index bc301bf7..72f2385e 100644
--- a/src/test/java/io/pakland/mdas/githubstats/application/SaveAllPullRequestsTest.java
+++ b/src/test/java/io/pakland/mdas/githubstats/application/internal/SaveAllPullRequestsTest.java
@@ -1,6 +1,7 @@
-package io.pakland.mdas.githubstats.application;
+package io.pakland.mdas.githubstats.application.internal;
 
-import io.pakland.mdas.githubstats.domain.PullRequest;
+import io.pakland.mdas.githubstats.application.internal.SaveAllPullRequests;
+import io.pakland.mdas.githubstats.domain.entity.PullRequest;
 import io.pakland.mdas.githubstats.domain.repository.PullRequestRepository;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
diff --git a/src/test/java/io/pakland/mdas/githubstats/application/SaveAllRepositoriesTest.java b/src/test/java/io/pakland/mdas/githubstats/application/internal/SaveAllRepositoriesTest.java
similarity index 78%
rename from src/test/java/io/pakland/mdas/githubstats/application/SaveAllRepositoriesTest.java
rename to src/test/java/io/pakland/mdas/githubstats/application/internal/SaveAllRepositoriesTest.java
index ac1b5128..b440a5f9 100644
--- a/src/test/java/io/pakland/mdas/githubstats/application/SaveAllRepositoriesTest.java
+++ b/src/test/java/io/pakland/mdas/githubstats/application/internal/SaveAllRepositoriesTest.java
@@ -1,6 +1,7 @@
-package io.pakland.mdas.githubstats.application;
+package io.pakland.mdas.githubstats.application.internal;
 
-import io.pakland.mdas.githubstats.domain.Repository;
+import io.pakland.mdas.githubstats.application.internal.SaveAllRepositories;
+import io.pakland.mdas.githubstats.domain.entity.Repository;
 import io.pakland.mdas.githubstats.domain.repository.RepositoryRepository;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
diff --git a/src/test/java/io/pakland/mdas/githubstats/application/SaveAllTeamsTest.java b/src/test/java/io/pakland/mdas/githubstats/application/internal/SaveAllTeamsTest.java
similarity index 77%
rename from src/test/java/io/pakland/mdas/githubstats/application/SaveAllTeamsTest.java
rename to src/test/java/io/pakland/mdas/githubstats/application/internal/SaveAllTeamsTest.java
index 4da5d414..74016eaf 100644
--- a/src/test/java/io/pakland/mdas/githubstats/application/SaveAllTeamsTest.java
+++ b/src/test/java/io/pakland/mdas/githubstats/application/internal/SaveAllTeamsTest.java
@@ -1,6 +1,7 @@
-package io.pakland.mdas.githubstats.application;
+package io.pakland.mdas.githubstats.application.internal;
 
-import io.pakland.mdas.githubstats.domain.Team;
+import io.pakland.mdas.githubstats.application.internal.SaveAllTeams;
+import io.pakland.mdas.githubstats.domain.entity.Team;
 import io.pakland.mdas.githubstats.domain.repository.TeamRepository;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
diff --git a/src/test/java/io/pakland/mdas/githubstats/application/SaveAllUserReviewsTest.java b/src/test/java/io/pakland/mdas/githubstats/application/internal/SaveAllUserReviewsTest.java
similarity index 78%
rename from src/test/java/io/pakland/mdas/githubstats/application/SaveAllUserReviewsTest.java
rename to src/test/java/io/pakland/mdas/githubstats/application/internal/SaveAllUserReviewsTest.java
index 2165fa64..ced2c8ec 100644
--- a/src/test/java/io/pakland/mdas/githubstats/application/SaveAllUserReviewsTest.java
+++ b/src/test/java/io/pakland/mdas/githubstats/application/internal/SaveAllUserReviewsTest.java
@@ -1,6 +1,7 @@
-package io.pakland.mdas.githubstats.application;
+package io.pakland.mdas.githubstats.application.internal;
 
-import io.pakland.mdas.githubstats.domain.UserReview;
+import io.pakland.mdas.githubstats.application.internal.SaveAllUserReviews;
+import io.pakland.mdas.githubstats.domain.entity.UserReview;
 import io.pakland.mdas.githubstats.domain.repository.UserReviewRepository;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
diff --git a/src/test/java/io/pakland/mdas/githubstats/application/SaveAllUsersTest.java b/src/test/java/io/pakland/mdas/githubstats/application/internal/SaveAllUsersTest.java
similarity index 77%
rename from src/test/java/io/pakland/mdas/githubstats/application/SaveAllUsersTest.java
rename to src/test/java/io/pakland/mdas/githubstats/application/internal/SaveAllUsersTest.java
index 89968c87..8561714e 100644
--- a/src/test/java/io/pakland/mdas/githubstats/application/SaveAllUsersTest.java
+++ b/src/test/java/io/pakland/mdas/githubstats/application/internal/SaveAllUsersTest.java
@@ -1,6 +1,7 @@
-package io.pakland.mdas.githubstats.application;
+package io.pakland.mdas.githubstats.application.internal;
 
-import io.pakland.mdas.githubstats.domain.User;
+import io.pakland.mdas.githubstats.application.internal.SaveAllUsers;
+import io.pakland.mdas.githubstats.domain.entity.User;
 import io.pakland.mdas.githubstats.domain.repository.UserRepository;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
diff --git a/src/test/java/io/pakland/mdas/githubstats/application/SaveOrganizationTest.java b/src/test/java/io/pakland/mdas/githubstats/application/internal/SaveOrganizationTest.java
similarity index 87%
rename from src/test/java/io/pakland/mdas/githubstats/application/SaveOrganizationTest.java
rename to src/test/java/io/pakland/mdas/githubstats/application/internal/SaveOrganizationTest.java
index be14dad9..e9580a93 100644
--- a/src/test/java/io/pakland/mdas/githubstats/application/SaveOrganizationTest.java
+++ b/src/test/java/io/pakland/mdas/githubstats/application/internal/SaveOrganizationTest.java
@@ -1,6 +1,7 @@
-package io.pakland.mdas.githubstats.application;
+package io.pakland.mdas.githubstats.application.internal;
 
-import io.pakland.mdas.githubstats.domain.Organization;
+import io.pakland.mdas.githubstats.application.internal.SaveOrganization;
+import io.pakland.mdas.githubstats.domain.entity.Organization;
 import io.pakland.mdas.githubstats.domain.repository.OrganizationRepository;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
diff --git a/src/test/java/io/pakland/mdas/githubstats/application/GetOrganizationFromTeamNameTest.java b/src/test/java/io/pakland/mdas/githubstats/application/unused/GetOrganizationFromTeamNameTest.java
similarity index 90%
rename from src/test/java/io/pakland/mdas/githubstats/application/GetOrganizationFromTeamNameTest.java
rename to src/test/java/io/pakland/mdas/githubstats/application/unused/GetOrganizationFromTeamNameTest.java
index 398ce323..462e68ad 100644
--- a/src/test/java/io/pakland/mdas/githubstats/application/GetOrganizationFromTeamNameTest.java
+++ b/src/test/java/io/pakland/mdas/githubstats/application/unused/GetOrganizationFromTeamNameTest.java
@@ -1,9 +1,9 @@
-package io.pakland.mdas.githubstats.application;
+package io.pakland.mdas.githubstats.application.unused;
 
 import io.pakland.mdas.githubstats.application.exceptions.TeamNotFound;
 import io.pakland.mdas.githubstats.application.unnused.GetOrganizationFromTeamName;
-import io.pakland.mdas.githubstats.domain.Organization;
-import io.pakland.mdas.githubstats.domain.Team;
+import io.pakland.mdas.githubstats.domain.entity.Organization;
+import io.pakland.mdas.githubstats.domain.entity.Team;
 import io.pakland.mdas.githubstats.domain.repository.TeamRepository;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
diff --git a/src/test/java/io/pakland/mdas/githubstats/application/GetRepositoriesByTeamTest.java b/src/test/java/io/pakland/mdas/githubstats/application/unused/GetRepositoriesByTeamTest.java
similarity index 83%
rename from src/test/java/io/pakland/mdas/githubstats/application/GetRepositoriesByTeamTest.java
rename to src/test/java/io/pakland/mdas/githubstats/application/unused/GetRepositoriesByTeamTest.java
index 8126ed51..18c50308 100644
--- a/src/test/java/io/pakland/mdas/githubstats/application/GetRepositoriesByTeamTest.java
+++ b/src/test/java/io/pakland/mdas/githubstats/application/unused/GetRepositoriesByTeamTest.java
@@ -1,8 +1,8 @@
-package io.pakland.mdas.githubstats.application;
+package io.pakland.mdas.githubstats.application.unused;
 
 import io.pakland.mdas.githubstats.application.unnused.GetRepositoriesByTeam;
-import io.pakland.mdas.githubstats.domain.Repository;
-import io.pakland.mdas.githubstats.domain.Team;
+import io.pakland.mdas.githubstats.domain.entity.Repository;
+import io.pakland.mdas.githubstats.domain.entity.Team;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
diff --git a/src/test/java/io/pakland/mdas/githubstats/application/GetTeamsFromOrganizationTest.java b/src/test/java/io/pakland/mdas/githubstats/application/unused/GetTeamsFromOrganizationTest.java
similarity index 82%
rename from src/test/java/io/pakland/mdas/githubstats/application/GetTeamsFromOrganizationTest.java
rename to src/test/java/io/pakland/mdas/githubstats/application/unused/GetTeamsFromOrganizationTest.java
index 6279dd91..e981fe7d 100644
--- a/src/test/java/io/pakland/mdas/githubstats/application/GetTeamsFromOrganizationTest.java
+++ b/src/test/java/io/pakland/mdas/githubstats/application/unused/GetTeamsFromOrganizationTest.java
@@ -1,8 +1,8 @@
-package io.pakland.mdas.githubstats.application;
+package io.pakland.mdas.githubstats.application.unused;
 
 import io.pakland.mdas.githubstats.application.unnused.GetTeamsFromOrganization;
-import io.pakland.mdas.githubstats.domain.Organization;
-import io.pakland.mdas.githubstats.domain.Team;
+import io.pakland.mdas.githubstats.domain.entity.Organization;
+import io.pakland.mdas.githubstats.domain.entity.Team;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
diff --git a/src/test/java/io/pakland/mdas/githubstats/domain/OrganizationTest.java b/src/test/java/io/pakland/mdas/githubstats/domain/OrganizationTest.java
index a4b0c118..6c508596 100644
--- a/src/test/java/io/pakland/mdas/githubstats/domain/OrganizationTest.java
+++ b/src/test/java/io/pakland/mdas/githubstats/domain/OrganizationTest.java
@@ -4,6 +4,8 @@
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
+import io.pakland.mdas.githubstats.domain.entity.Organization;
+import io.pakland.mdas.githubstats.domain.entity.Team;
 import java.util.Collections;
 import java.util.HashSet;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/io/pakland/mdas/githubstats/domain/TeamTest.java b/src/test/java/io/pakland/mdas/githubstats/domain/TeamTest.java
index f96221d5..e55e5b95 100644
--- a/src/test/java/io/pakland/mdas/githubstats/domain/TeamTest.java
+++ b/src/test/java/io/pakland/mdas/githubstats/domain/TeamTest.java
@@ -4,6 +4,8 @@
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
+import io.pakland.mdas.githubstats.domain.entity.Repository;
+import io.pakland.mdas.githubstats.domain.entity.Team;
 import java.util.Collections;
 import java.util.HashSet;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/io/pakland/mdas/githubstats/infrastructure/github/repository/OrganizationGitHubRepositoryTest.java b/src/test/java/io/pakland/mdas/githubstats/infrastructure/github/repository/OrganizationGitHubRepositoryTest.java
index c21f3ae8..a4a1eccc 100644
--- a/src/test/java/io/pakland/mdas/githubstats/infrastructure/github/repository/OrganizationGitHubRepositoryTest.java
+++ b/src/test/java/io/pakland/mdas/githubstats/infrastructure/github/repository/OrganizationGitHubRepositoryTest.java
@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import io.pakland.mdas.githubstats.application.exceptions.HttpException;
-import io.pakland.mdas.githubstats.domain.Organization;
+import io.pakland.mdas.githubstats.domain.entity.Organization;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
diff --git a/src/test/java/io/pakland/mdas/githubstats/infrastructure/github/repository/TeamGitHubRepositoryTest.java b/src/test/java/io/pakland/mdas/githubstats/infrastructure/github/repository/TeamGitHubRepositoryTest.java
index 983bb39b..ec5549d3 100644
--- a/src/test/java/io/pakland/mdas/githubstats/infrastructure/github/repository/TeamGitHubRepositoryTest.java
+++ b/src/test/java/io/pakland/mdas/githubstats/infrastructure/github/repository/TeamGitHubRepositoryTest.java
@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import io.pakland.mdas.githubstats.application.exceptions.HttpException;
-import io.pakland.mdas.githubstats.domain.Team;
+import io.pakland.mdas.githubstats.domain.entity.Team;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
diff --git a/src/test/java/io/pakland/mdas/githubstats/infrastructure/github/repository/UserGitHubRepositoryTest.java b/src/test/java/io/pakland/mdas/githubstats/infrastructure/github/repository/UserGitHubRepositoryTest.java
index 2980ddb4..001985c9 100644
--- a/src/test/java/io/pakland/mdas/githubstats/infrastructure/github/repository/UserGitHubRepositoryTest.java
+++ b/src/test/java/io/pakland/mdas/githubstats/infrastructure/github/repository/UserGitHubRepositoryTest.java
@@ -1,7 +1,7 @@
 package io.pakland.mdas.githubstats.infrastructure.github.repository;
 
 import io.pakland.mdas.githubstats.application.exceptions.HttpException;
-import io.pakland.mdas.githubstats.domain.User;
+import io.pakland.mdas.githubstats.domain.entity.User;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;