9 files changed, 26 insertions, 22 deletions
diff --git a/BackEnd/Timeline/Controllers/BookmarkTimelineController.cs b/BackEnd/Timeline/Controllers/BookmarkTimelineController.cs
index e2a08dcb..80a06c17 100644
--- a/BackEnd/Timeline/Controllers/BookmarkTimelineController.cs
+++ b/BackEnd/Timeline/Controllers/BookmarkTimelineController.cs
@@ -4,10 +4,11 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Timeline.Entities;
 using Timeline.Models.Http;
-using Timeline.Models.Mapper;
 using Timeline.Models.Validation;
-using Timeline.Services;
-using Timeline.Services.Exceptions;
+using Timeline.Services.Api;
+using Timeline.Services.Mapper;
+using Timeline.Services.Timeline;
+using Timeline.Services.User;
 
 namespace Timeline.Controllers
 {
diff --git a/BackEnd/Timeline/Controllers/ControllerAuthExtensions.cs b/BackEnd/Timeline/Controllers/ControllerAuthExtensions.cs
index 9096978d..9fcb727a 100644
--- a/BackEnd/Timeline/Controllers/ControllerAuthExtensions.cs
+++ b/BackEnd/Timeline/Controllers/ControllerAuthExtensions.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Security.Claims;
 using Timeline.Auth;
-using Timeline.Services;
+using Timeline.Services.User;
 using static Timeline.Resources.Controllers.ControllerAuthExtensions;
 
 namespace Timeline.Controllers
diff --git a/BackEnd/Timeline/Controllers/HighlightTimelineController.cs b/BackEnd/Timeline/Controllers/HighlightTimelineController.cs
index f582e74b..2f1f898e 100644
--- a/BackEnd/Timeline/Controllers/HighlightTimelineController.cs
+++ b/BackEnd/Timeline/Controllers/HighlightTimelineController.cs
@@ -4,10 +4,11 @@ using System.Threading.Tasks;
 using Timeline.Auth;
 using Timeline.Entities;
 using Timeline.Models.Http;
-using Timeline.Models.Mapper;
 using Timeline.Models.Validation;
-using Timeline.Services;
-using Timeline.Services.Exceptions;
+using Timeline.Services.Api;
+using Timeline.Services.Mapper;
+using Timeline.Services.Timeline;
+using Timeline.Services.User;
 
 namespace Timeline.Controllers
 {
diff --git a/BackEnd/Timeline/Controllers/SearchController.cs b/BackEnd/Timeline/Controllers/SearchController.cs
index b2266c18..33e50e59 100644
--- a/BackEnd/Timeline/Controllers/SearchController.cs
+++ b/BackEnd/Timeline/Controllers/SearchController.cs
@@ -5,8 +5,9 @@ using System.Linq;
 using System.Threading.Tasks;
 using Timeline.Entities;
 using Timeline.Models.Http;
-using Timeline.Models.Mapper;
-using Timeline.Services;
+using Timeline.Services.Api;
+using Timeline.Services.Mapper;
+using Timeline.Services.User;
 
 namespace Timeline.Controllers
 {
diff --git a/BackEnd/Timeline/Controllers/TimelineController.cs b/BackEnd/Timeline/Controllers/TimelineController.cs
index b20ab227..fc28daa4 100644
--- a/BackEnd/Timeline/Controllers/TimelineController.cs
+++ b/BackEnd/Timeline/Controllers/TimelineController.cs
@@ -9,10 +9,11 @@ using Timeline.Entities;
 using Timeline.Filters;
 using Timeline.Models;
 using Timeline.Models.Http;
-using Timeline.Models.Mapper;
 using Timeline.Models.Validation;
 using Timeline.Services;
-using Timeline.Services.Exceptions;
+using Timeline.Services.Mapper;
+using Timeline.Services.Timeline;
+using Timeline.Services.User;
 
 namespace Timeline.Controllers
 {
diff --git a/BackEnd/Timeline/Controllers/TimelinePostController.cs b/BackEnd/Timeline/Controllers/TimelinePostController.cs
index 86c5c8cf..ef139201 100644
--- a/BackEnd/Timeline/Controllers/TimelinePostController.cs
+++ b/BackEnd/Timeline/Controllers/TimelinePostController.cs
@@ -3,16 +3,17 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using System.ComponentModel.DataAnnotations;
+using System.Threading.Tasks;
+using Timeline.Entities;
 using Timeline.Filters;
 using Timeline.Helpers.Cache;
 using Timeline.Models;
 using Timeline.Models.Http;
-using Timeline.Models.Mapper;
 using Timeline.Models.Validation;
-using Timeline.Services;
-using Timeline.Entities;
+using Timeline.Services.Mapper;
+using Timeline.Services.Timeline;
+using Timeline.Services.User;
 
 namespace Timeline.Controllers
 {
diff --git a/BackEnd/Timeline/Controllers/TokenController.cs b/BackEnd/Timeline/Controllers/TokenController.cs
index 7df3891c..1de45754 100644
--- a/BackEnd/Timeline/Controllers/TokenController.cs
+++ b/BackEnd/Timeline/Controllers/TokenController.cs
@@ -7,10 +7,10 @@ using System.Globalization;
 using System.Threading.Tasks;
 using Timeline.Helpers;
 using Timeline.Models.Http;
-using Timeline.Models.Mapper;
 using Timeline.Services;
-using Timeline.Services.Exceptions;
+using Timeline.Services.Mapper;
 using Timeline.Services.Token;
+using Timeline.Services.User;
 using static Timeline.Resources.Controllers.TokenController;
 
 namespace Timeline.Controllers
diff --git a/BackEnd/Timeline/Controllers/UserAvatarController.cs b/BackEnd/Timeline/Controllers/UserAvatarController.cs
index fa13f0f6..158c342e 100644
--- a/BackEnd/Timeline/Controllers/UserAvatarController.cs
+++ b/BackEnd/Timeline/Controllers/UserAvatarController.cs
@@ -2,7 +2,6 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
-using Microsoft.Net.Http.Headers;
 using System;
 using System.Threading.Tasks;
 using Timeline.Filters;
@@ -11,8 +10,8 @@ using Timeline.Helpers.Cache;
 using Timeline.Models;
 using Timeline.Models.Http;
 using Timeline.Models.Validation;
-using Timeline.Services;
-using Timeline.Services.Exceptions;
+using Timeline.Services.Imaging;
+using Timeline.Services.User;
 using static Timeline.Resources.Controllers.UserAvatarController;
 
 namespace Timeline.Controllers
diff --git a/BackEnd/Timeline/Controllers/UserController.cs b/BackEnd/Timeline/Controllers/UserController.cs
index 76d6042f..95f65d25 100644
--- a/BackEnd/Timeline/Controllers/UserController.cs
+++ b/BackEnd/Timeline/Controllers/UserController.cs
@@ -8,10 +8,10 @@ using System.Threading.Tasks;
 using Timeline.Auth;
 using Timeline.Helpers;
 using Timeline.Models.Http;
-using Timeline.Models.Mapper;
 using Timeline.Models.Validation;
 using Timeline.Services;
-using Timeline.Services.Exceptions;
+using Timeline.Services.Mapper;
+using Timeline.Services.User;
 using static Timeline.Resources.Controllers.UserController;
 using static Timeline.Resources.Messages;