fixed misplaced folder

Daggerpov · Feb 6, 2025 · a521f8a · a521f8a
1 parent e37c6e8
commit a521f8a
Show file tree

Hide file tree

Showing 48 changed files with 81 additions and 81 deletions.
diff --git a/src/main/java/com/danielagapov/spawn/Mappers/ChatMessageLikesMapper.java b/src/main/java/com/danielagapov/spawn/Mappers/ChatMessageLikesMapper.java
@@ -1,10 +1,10 @@
 package com.danielagapov.spawn.Mappers;
 
 import com.danielagapov.spawn.DTOs.ChatMessageLikesDTO;
-import com.danielagapov.spawn.Exceptions.Models.ChatMessage;
-import com.danielagapov.spawn.Exceptions.Models.ChatMessageLikes;
-import com.danielagapov.spawn.Exceptions.Models.CompositeKeys.ChatMessageLikesId;
-import com.danielagapov.spawn.Exceptions.Models.User;
+import com.danielagapov.spawn.Models.ChatMessage;
+import com.danielagapov.spawn.Models.ChatMessageLikes;
+import com.danielagapov.spawn.Models.CompositeKeys.ChatMessageLikesId;
+import com.danielagapov.spawn.Models.User;
 
 public class ChatMessageLikesMapper {
 

diff --git a/src/main/java/com/danielagapov/spawn/Mappers/ChatMessageMapper.java b/src/main/java/com/danielagapov/spawn/Mappers/ChatMessageMapper.java
@@ -1,9 +1,9 @@
 package com.danielagapov.spawn.Mappers;
 
 import com.danielagapov.spawn.DTOs.ChatMessageDTO;
-import com.danielagapov.spawn.Exceptions.Models.ChatMessage;
-import com.danielagapov.spawn.Exceptions.Models.Event;
-import com.danielagapov.spawn.Exceptions.Models.User;
+import com.danielagapov.spawn.Models.ChatMessage;
+import com.danielagapov.spawn.Models.Event;
+import com.danielagapov.spawn.Models.User;
 
 import java.util.List;
 import java.util.Map;

diff --git a/src/main/java/com/danielagapov/spawn/Mappers/EventMapper.java b/src/main/java/com/danielagapov/spawn/Mappers/EventMapper.java
@@ -3,9 +3,9 @@
 import com.danielagapov.spawn.DTOs.EventCreationDTO;
 import com.danielagapov.spawn.DTOs.EventDTO;
 import com.danielagapov.spawn.DTOs.FullFeedEventDTO;
-import com.danielagapov.spawn.Exceptions.Models.Event;
-import com.danielagapov.spawn.Exceptions.Models.Location;
-import com.danielagapov.spawn.Exceptions.Models.User;
+import com.danielagapov.spawn.Models.Event;
+import com.danielagapov.spawn.Models.Location;
+import com.danielagapov.spawn.Models.User;
 
 import java.util.List;
 import java.util.Map;

diff --git a/src/main/java/com/danielagapov/spawn/Mappers/FriendRequestMapper.java b/src/main/java/com/danielagapov/spawn/Mappers/FriendRequestMapper.java
@@ -1,8 +1,8 @@
 package com.danielagapov.spawn.Mappers;
 
 import com.danielagapov.spawn.DTOs.FriendRequestDTO;
-import com.danielagapov.spawn.Exceptions.Models.FriendRequest;
-import com.danielagapov.spawn.Exceptions.Models.User;
+import com.danielagapov.spawn.Models.FriendRequest;
+import com.danielagapov.spawn.Models.User;
 
 import java.util.List;
 import java.util.stream.Collectors;

diff --git a/src/main/java/com/danielagapov/spawn/Mappers/FriendTagMapper.java b/src/main/java/com/danielagapov/spawn/Mappers/FriendTagMapper.java
@@ -1,7 +1,7 @@
 package com.danielagapov.spawn.Mappers;
 
 import com.danielagapov.spawn.DTOs.FriendTagDTO;
-import com.danielagapov.spawn.Exceptions.Models.FriendTag;
+import com.danielagapov.spawn.Models.FriendTag;
 
 import java.util.List;
 import java.util.Map;

diff --git a/src/main/java/com/danielagapov/spawn/Mappers/LocationMapper.java b/src/main/java/com/danielagapov/spawn/Mappers/LocationMapper.java
@@ -1,7 +1,7 @@
 package com.danielagapov.spawn.Mappers;
 
 import com.danielagapov.spawn.DTOs.LocationDTO;
-import com.danielagapov.spawn.Exceptions.Models.Location;
+import com.danielagapov.spawn.Models.Location;
 
 import java.util.List;
 import java.util.stream.Collectors;

diff --git a/src/main/java/com/danielagapov/spawn/Mappers/UserMapper.java b/src/main/java/com/danielagapov/spawn/Mappers/UserMapper.java
@@ -2,7 +2,7 @@
 
 import com.danielagapov.spawn.DTOs.FullUserDTO;
 import com.danielagapov.spawn.DTOs.UserDTO;
-import com.danielagapov.spawn.Exceptions.Models.User;
+import com.danielagapov.spawn.Models.User;
 
 import java.util.List;
 import java.util.Map;

diff --git a/.../spawn/Exceptions/Models/ChatMessage.java → ...anielagapov/spawn/Models/ChatMessage.java b/.../spawn/Exceptions/Models/ChatMessage.java → ...anielagapov/spawn/Models/ChatMessage.java
@@ -1,4 +1,4 @@
-package com.danielagapov.spawn.Exceptions.Models;
+package com.danielagapov.spawn.Models;
 
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;

diff --git a/...n/Exceptions/Models/ChatMessageLikes.java → ...agapov/spawn/Models/ChatMessageLikes.java b/...n/Exceptions/Models/ChatMessageLikes.java → ...agapov/spawn/Models/ChatMessageLikes.java
@@ -1,6 +1,6 @@
-package com.danielagapov.spawn.Exceptions.Models;
+package com.danielagapov.spawn.Models;
 
-import com.danielagapov.spawn.Exceptions.Models.CompositeKeys.ChatMessageLikesId;
+import com.danielagapov.spawn.Models.CompositeKeys.ChatMessageLikesId;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;

diff --git a/...els/CompositeKeys/ChatMessageLikesId.java → ...els/CompositeKeys/ChatMessageLikesId.java b/...els/CompositeKeys/ChatMessageLikesId.java → ...els/CompositeKeys/ChatMessageLikesId.java
@@ -1,4 +1,4 @@
-package com.danielagapov.spawn.Exceptions.Models.CompositeKeys;
+package com.danielagapov.spawn.Models.CompositeKeys;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;

diff --git a/...ns/Models/CompositeKeys/EventUsersId.java → ...wn/Models/CompositeKeys/EventUsersId.java b/...ns/Models/CompositeKeys/EventUsersId.java → ...wn/Models/CompositeKeys/EventUsersId.java
@@ -1,4 +1,4 @@
-package com.danielagapov.spawn.Exceptions.Models.CompositeKeys;
+package com.danielagapov.spawn.Models.CompositeKeys;
 
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;

diff --git a/...agapov/spawn/Exceptions/Models/Event.java → .../com/danielagapov/spawn/Models/Event.java b/...agapov/spawn/Exceptions/Models/Event.java → .../com/danielagapov/spawn/Models/Event.java
@@ -1,4 +1,4 @@
-package com.danielagapov.spawn.Exceptions.Models;
+package com.danielagapov.spawn.Models;
 
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;

diff --git a/...pov/spawn/Exceptions/Models/EventTag.java → ...m/danielagapov/spawn/Models/EventTag.java b/...pov/spawn/Exceptions/Models/EventTag.java → ...m/danielagapov/spawn/Models/EventTag.java
@@ -1,4 +1,4 @@
-package com.danielagapov.spawn.Exceptions.Models;
+package com.danielagapov.spawn.Models;
 
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;

diff --git a/...ov/spawn/Exceptions/Models/EventUser.java → .../danielagapov/spawn/Models/EventUser.java b/...ov/spawn/Exceptions/Models/EventUser.java → .../danielagapov/spawn/Models/EventUser.java
@@ -1,7 +1,7 @@
-package com.danielagapov.spawn.Exceptions.Models;
+package com.danielagapov.spawn.Models;
 
 import com.danielagapov.spawn.Enums.ParticipationStatus;
-import com.danielagapov.spawn.Exceptions.Models.CompositeKeys.EventUsersId;
+import com.danielagapov.spawn.Models.CompositeKeys.EventUsersId;
 
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;

diff --git a/...pawn/Exceptions/Models/FriendRequest.java → ...ielagapov/spawn/Models/FriendRequest.java b/...pawn/Exceptions/Models/FriendRequest.java → ...ielagapov/spawn/Models/FriendRequest.java
@@ -1,4 +1,4 @@
-package com.danielagapov.spawn.Exceptions.Models;
+package com.danielagapov.spawn.Models;
 
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;

diff --git a/...ov/spawn/Exceptions/Models/FriendTag.java → .../danielagapov/spawn/Models/FriendTag.java b/...ov/spawn/Exceptions/Models/FriendTag.java → .../danielagapov/spawn/Models/FriendTag.java
@@ -1,4 +1,4 @@
-package com.danielagapov.spawn.Exceptions.Models;
+package com.danielagapov.spawn.Models;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;

diff --git a/...pov/spawn/Exceptions/Models/Location.java → ...m/danielagapov/spawn/Models/Location.java b/...pov/spawn/Exceptions/Models/Location.java → ...m/danielagapov/spawn/Models/Location.java
@@ -1,4 +1,4 @@
-package com.danielagapov.spawn.Exceptions.Models;
+package com.danielagapov.spawn.Models;
 
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;

diff --git a/...lagapov/spawn/Exceptions/Models/README.md → ...a/com/danielagapov/spawn/Models/README.md b/...lagapov/spawn/Exceptions/Models/README.md → ...a/com/danielagapov/spawn/Models/README.md
diff --git a/...lagapov/spawn/Exceptions/Models/User.java → ...a/com/danielagapov/spawn/Models/User.java b/...lagapov/spawn/Exceptions/Models/User.java → ...a/com/danielagapov/spawn/Models/User.java
@@ -1,4 +1,4 @@
-package com.danielagapov.spawn.Exceptions.Models;
+package com.danielagapov.spawn.Models;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

diff --git a/...pawn/Exceptions/Models/UserFriendTag.java → ...ielagapov/spawn/Models/UserFriendTag.java b/...pawn/Exceptions/Models/UserFriendTag.java → ...ielagapov/spawn/Models/UserFriendTag.java
@@ -1,4 +1,4 @@
-package com.danielagapov.spawn.Exceptions.Models;
+package com.danielagapov.spawn.Models;
 
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;

diff --git a/...xceptions/Models/UserIdExternalIdMap.java → ...pov/spawn/Models/UserIdExternalIdMap.java b/...xceptions/Models/UserIdExternalIdMap.java → ...pov/spawn/Models/UserIdExternalIdMap.java
@@ -1,4 +1,4 @@
-package com.danielagapov.spawn.Exceptions.Models;
+package com.danielagapov.spawn.Models;
 
 import com.danielagapov.spawn.Enums.OAuthProvider;
 import jakarta.persistence.*;

diff --git a/src/main/java/com/danielagapov/spawn/Repositories/IChatMessageLikesRepository.java b/src/main/java/com/danielagapov/spawn/Repositories/IChatMessageLikesRepository.java
@@ -1,7 +1,7 @@
 package com.danielagapov.spawn.Repositories;
 
-import com.danielagapov.spawn.Exceptions.Models.ChatMessage;
-import com.danielagapov.spawn.Exceptions.Models.ChatMessageLikes;
+import com.danielagapov.spawn.Models.ChatMessage;
+import com.danielagapov.spawn.Models.ChatMessageLikes;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

diff --git a/src/main/java/com/danielagapov/spawn/Repositories/IChatMessageRepository.java b/src/main/java/com/danielagapov/spawn/Repositories/IChatMessageRepository.java
@@ -1,6 +1,6 @@
 package com.danielagapov.spawn.Repositories;
 
-import com.danielagapov.spawn.Exceptions.Models.ChatMessage;
+import com.danielagapov.spawn.Models.ChatMessage;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

diff --git a/src/main/java/com/danielagapov/spawn/Repositories/IEventRepository.java b/src/main/java/com/danielagapov/spawn/Repositories/IEventRepository.java
@@ -1,6 +1,6 @@
 package com.danielagapov.spawn.Repositories;
 
-import com.danielagapov.spawn.Exceptions.Models.Event;
+import com.danielagapov.spawn.Models.Event;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

diff --git a/src/main/java/com/danielagapov/spawn/Repositories/IEventTagRepository.java b/src/main/java/com/danielagapov/spawn/Repositories/IEventTagRepository.java
@@ -1,6 +1,6 @@
 package com.danielagapov.spawn.Repositories;
 
-import com.danielagapov.spawn.Exceptions.Models.EventTag;
+import com.danielagapov.spawn.Models.EventTag;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

diff --git a/src/main/java/com/danielagapov/spawn/Repositories/IEventUserRepository.java b/src/main/java/com/danielagapov/spawn/Repositories/IEventUserRepository.java
@@ -1,6 +1,6 @@
 package com.danielagapov.spawn.Repositories;
 
-import com.danielagapov.spawn.Exceptions.Models.EventUser;
+import com.danielagapov.spawn.Models.EventUser;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

diff --git a/src/main/java/com/danielagapov/spawn/Repositories/IFriendRequestsRepository.java b/src/main/java/com/danielagapov/spawn/Repositories/IFriendRequestsRepository.java
@@ -1,6 +1,6 @@
 package com.danielagapov.spawn.Repositories;
 
-import com.danielagapov.spawn.Exceptions.Models.FriendRequest;
+import com.danielagapov.spawn.Models.FriendRequest;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

diff --git a/src/main/java/com/danielagapov/spawn/Repositories/IFriendTagRepository.java b/src/main/java/com/danielagapov/spawn/Repositories/IFriendTagRepository.java
@@ -1,6 +1,6 @@
 package com.danielagapov.spawn.Repositories;
 
-import com.danielagapov.spawn.Exceptions.Models.FriendTag;
+import com.danielagapov.spawn.Models.FriendTag;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

diff --git a/src/main/java/com/danielagapov/spawn/Repositories/ILocationRepository.java b/src/main/java/com/danielagapov/spawn/Repositories/ILocationRepository.java
@@ -1,6 +1,6 @@
 package com.danielagapov.spawn.Repositories;
 
-import com.danielagapov.spawn.Exceptions.Models.Location;
+import com.danielagapov.spawn.Models.Location;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

diff --git a/src/main/java/com/danielagapov/spawn/Repositories/IUserFriendTagRepository.java b/src/main/java/com/danielagapov/spawn/Repositories/IUserFriendTagRepository.java
@@ -1,6 +1,6 @@
 package com.danielagapov.spawn.Repositories;
 
-import com.danielagapov.spawn.Exceptions.Models.UserFriendTag;
+import com.danielagapov.spawn.Models.UserFriendTag;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;

diff --git a/src/main/java/com/danielagapov/spawn/Repositories/IUserIdExternalIdMapRepository.java b/src/main/java/com/danielagapov/spawn/Repositories/IUserIdExternalIdMapRepository.java
@@ -1,6 +1,6 @@
 package com.danielagapov.spawn.Repositories;
 
-import com.danielagapov.spawn.Exceptions.Models.UserIdExternalIdMap;
+import com.danielagapov.spawn.Models.UserIdExternalIdMap;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

diff --git a/src/main/java/com/danielagapov/spawn/Repositories/IUserRepository.java b/src/main/java/com/danielagapov/spawn/Repositories/IUserRepository.java
@@ -1,6 +1,6 @@
 package com.danielagapov.spawn.Repositories;
 
-import com.danielagapov.spawn.Exceptions.Models.User;
+import com.danielagapov.spawn.Models.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

diff --git a/src/main/java/com/danielagapov/spawn/Services/ChatMessage/ChatMessageService.java b/src/main/java/com/danielagapov/spawn/Services/ChatMessage/ChatMessageService.java
@@ -14,10 +14,10 @@
 import com.danielagapov.spawn.Mappers.ChatMessageLikesMapper;
 import com.danielagapov.spawn.Mappers.ChatMessageMapper;
 import com.danielagapov.spawn.Mappers.UserMapper;
-import com.danielagapov.spawn.Exceptions.Models.ChatMessage;
-import com.danielagapov.spawn.Exceptions.Models.ChatMessageLikes;
-import com.danielagapov.spawn.Exceptions.Models.Event;
-import com.danielagapov.spawn.Exceptions.Models.User;
+import com.danielagapov.spawn.Models.ChatMessage;
+import com.danielagapov.spawn.Models.ChatMessageLikes;
+import com.danielagapov.spawn.Models.Event;
+import com.danielagapov.spawn.Models.User;
 import com.danielagapov.spawn.Repositories.IChatMessageLikesRepository;
 import com.danielagapov.spawn.Repositories.IChatMessageRepository;
 import com.danielagapov.spawn.Repositories.IEventRepository;

diff --git a/src/main/java/com/danielagapov/spawn/Services/Event/EventService.java b/src/main/java/com/danielagapov/spawn/Services/Event/EventService.java
@@ -10,11 +10,11 @@
 import com.danielagapov.spawn.Exceptions.Logger.ILogger;
 import com.danielagapov.spawn.Mappers.EventMapper;
 import com.danielagapov.spawn.Mappers.LocationMapper;
-import com.danielagapov.spawn.Exceptions.Models.CompositeKeys.EventUsersId;
-import com.danielagapov.spawn.Exceptions.Models.Event;
-import com.danielagapov.spawn.Exceptions.Models.EventUser;
-import com.danielagapov.spawn.Exceptions.Models.Location;
-import com.danielagapov.spawn.Exceptions.Models.User;
+import com.danielagapov.spawn.Models.CompositeKeys.EventUsersId;
+import com.danielagapov.spawn.Models.Event;
+import com.danielagapov.spawn.Models.EventUser;
+import com.danielagapov.spawn.Models.Location;
+import com.danielagapov.spawn.Models.User;
 import com.danielagapov.spawn.Repositories.IEventRepository;
 import com.danielagapov.spawn.Repositories.IEventUserRepository;
 import com.danielagapov.spawn.Repositories.ILocationRepository;

diff --git a/src/main/java/com/danielagapov/spawn/Services/FriendRequestService/FriendRequestService.java b/src/main/java/com/danielagapov/spawn/Services/FriendRequestService/FriendRequestService.java
@@ -6,8 +6,8 @@
 import com.danielagapov.spawn.Exceptions.Base.BaseSaveException;
 import com.danielagapov.spawn.Exceptions.Logger.ILogger;
 import com.danielagapov.spawn.Mappers.FriendRequestMapper;
-import com.danielagapov.spawn.Exceptions.Models.FriendRequest;
-import com.danielagapov.spawn.Exceptions.Models.User;
+import com.danielagapov.spawn.Models.FriendRequest;
+import com.danielagapov.spawn.Models.User;
 import com.danielagapov.spawn.Repositories.IFriendRequestsRepository;
 import com.danielagapov.spawn.Services.User.IUserService;
 import org.springframework.dao.DataAccessException;

diff --git a/src/main/java/com/danielagapov/spawn/Services/FriendTag/FriendTagService.java b/src/main/java/com/danielagapov/spawn/Services/FriendTag/FriendTagService.java
@@ -10,9 +10,9 @@
 import com.danielagapov.spawn.Exceptions.Base.BasesNotFoundException;
 import com.danielagapov.spawn.Exceptions.Logger.ILogger;
 import com.danielagapov.spawn.Mappers.FriendTagMapper;
-import com.danielagapov.spawn.Exceptions.Models.FriendTag;
-import com.danielagapov.spawn.Exceptions.Models.User;
-import com.danielagapov.spawn.Exceptions.Models.UserFriendTag;
+import com.danielagapov.spawn.Models.FriendTag;
+import com.danielagapov.spawn.Models.User;
+import com.danielagapov.spawn.Models.UserFriendTag;
 import com.danielagapov.spawn.Repositories.IFriendTagRepository;
 import com.danielagapov.spawn.Repositories.IUserFriendTagRepository;
 import com.danielagapov.spawn.Repositories.IUserRepository;

diff --git a/src/main/java/com/danielagapov/spawn/Services/Location/ILocationService.java b/src/main/java/com/danielagapov/spawn/Services/Location/ILocationService.java
@@ -1,7 +1,7 @@
 package com.danielagapov.spawn.Services.Location;
 
 import com.danielagapov.spawn.DTOs.LocationDTO;
-import com.danielagapov.spawn.Exceptions.Models.Location;
+import com.danielagapov.spawn.Models.Location;
 
 import java.util.List;
 import java.util.UUID;

diff --git a/src/main/java/com/danielagapov/spawn/Services/Location/LocationService.java b/src/main/java/com/danielagapov/spawn/Services/Location/LocationService.java
@@ -7,7 +7,7 @@
 import com.danielagapov.spawn.Exceptions.Base.BasesNotFoundException;
 import com.danielagapov.spawn.Exceptions.Logger.ILogger;
 import com.danielagapov.spawn.Mappers.LocationMapper;
-import com.danielagapov.spawn.Exceptions.Models.Location;
+import com.danielagapov.spawn.Models.Location;
 import com.danielagapov.spawn.Repositories.ILocationRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;

diff --git a/src/main/java/com/danielagapov/spawn/Services/OAuth/OAuthService.java b/src/main/java/com/danielagapov/spawn/Services/OAuth/OAuthService.java
@@ -6,8 +6,8 @@
 import com.danielagapov.spawn.Exceptions.Base.BaseNotFoundException;
 import com.danielagapov.spawn.Exceptions.Logger.ILogger;
 import com.danielagapov.spawn.Mappers.UserMapper;
-import com.danielagapov.spawn.Exceptions.Models.User;
-import com.danielagapov.spawn.Exceptions.Models.UserIdExternalIdMap;
+import com.danielagapov.spawn.Models.User;
+import com.danielagapov.spawn.Models.UserIdExternalIdMap;
 import com.danielagapov.spawn.Repositories.IUserIdExternalIdMapRepository;
 import com.danielagapov.spawn.Services.User.IUserService;
 import org.springframework.dao.DataAccessException;

diff --git a/src/main/java/com/danielagapov/spawn/Services/S3/S3Service.java b/src/main/java/com/danielagapov/spawn/Services/S3/S3Service.java
@@ -4,7 +4,7 @@
 import com.danielagapov.spawn.Exceptions.ApplicationException;
 import com.danielagapov.spawn.Exceptions.Logger.ILogger;
 import com.danielagapov.spawn.Mappers.UserMapper;
-import com.danielagapov.spawn.Exceptions.Models.User;
+import com.danielagapov.spawn.Models.User;
 import com.danielagapov.spawn.Services.User.UserService;
 import org.springframework.stereotype.Service;
 import software.amazon.awssdk.core.sync.RequestBody;

diff --git a/src/main/java/com/danielagapov/spawn/Services/User/IUserService.java b/src/main/java/com/danielagapov/spawn/Services/User/IUserService.java
@@ -4,8 +4,8 @@
 import com.danielagapov.spawn.DTOs.FullUserDTO;
 import com.danielagapov.spawn.DTOs.RecommendedFriendUserDTO;
 import com.danielagapov.spawn.DTOs.UserDTO;
-import com.danielagapov.spawn.Exceptions.Models.FriendTag;
-import com.danielagapov.spawn.Exceptions.Models.User;
+import com.danielagapov.spawn.Models.FriendTag;
+import com.danielagapov.spawn.Models.User;
 
 import java.util.List;
 import java.util.Map;

diff --git a/src/main/java/com/danielagapov/spawn/Services/User/UserService.java b/src/main/java/com/danielagapov/spawn/Services/User/UserService.java
@@ -10,9 +10,9 @@
 import com.danielagapov.spawn.Exceptions.DatabaseException;
 import com.danielagapov.spawn.Exceptions.Logger.ILogger;
 import com.danielagapov.spawn.Mappers.UserMapper;
-import com.danielagapov.spawn.Exceptions.Models.EventUser;
-import com.danielagapov.spawn.Exceptions.Models.FriendTag;
-import com.danielagapov.spawn.Exceptions.Models.User;
+import com.danielagapov.spawn.Models.EventUser;
+import com.danielagapov.spawn.Models.FriendTag;
+import com.danielagapov.spawn.Models.User;
 import com.danielagapov.spawn.Repositories.IEventUserRepository;
 import com.danielagapov.spawn.Repositories.IFriendTagRepository;
 import com.danielagapov.spawn.Repositories.IUserFriendTagRepository;

diff --git a/src/test/java/com/danielagapov/spawn/ServiceTests/ChatMessageServiceTests.java b/src/test/java/com/danielagapov/spawn/ServiceTests/ChatMessageServiceTests.java
@@ -8,10 +8,10 @@
 import com.danielagapov.spawn.Exceptions.Base.BaseSaveException;
 import com.danielagapov.spawn.Exceptions.Base.BaseDeleteException;
 import com.danielagapov.spawn.Exceptions.Base.BasesNotFoundException;
-import com.danielagapov.spawn.Exceptions.Models.ChatMessage;
-import com.danielagapov.spawn.Exceptions.Models.ChatMessageLikes;
-import com.danielagapov.spawn.Exceptions.Models.Event;
-import com.danielagapov.spawn.Exceptions.Models.User;
+import com.danielagapov.spawn.Models.ChatMessage;
+import com.danielagapov.spawn.Models.ChatMessageLikes;
+import com.danielagapov.spawn.Models.Event;
+import com.danielagapov.spawn.Models.User;
 import com.danielagapov.spawn.Repositories.IChatMessageLikesRepository;
 import com.danielagapov.spawn.Repositories.IChatMessageRepository;
 import com.danielagapov.spawn.Repositories.IEventRepository;