Revert namespace name change.

120 files changed, 260 insertions, 264 deletions

diff --git a/ErrorResponseCodeGenerator/ErrorResponseCodeGenerator.csproj b/ErrorResponseCodeGenerator/ErrorResponseCodeGenerator.csproj
index a4ce64e6..8524b2e4 100644
--- a/ErrorResponseCodeGenerator/ErrorResponseCodeGenerator.csproj
+++ b/ErrorResponseCodeGenerator/ErrorResponseCodeGenerator.csproj
@@ -10,7 +10,7 @@
   </ItemGroup>

 

   <ItemGroup>

-    <ProjectReference Include="..\Timeline.ErrorCodes\TimelineApp.ErrorCodes.csproj" />

+    <ProjectReference Include="..\Timeline.ErrorCodes\Timeline.ErrorCodes.csproj" />

   </ItemGroup>

 

 </Project>

diff --git a/ErrorResponseCodeGenerator/Program.cs b/ErrorResponseCodeGenerator/Program.cs
index 0d2b2a3e..5ea8aaca 100644
--- a/ErrorResponseCodeGenerator/Program.cs
+++ b/ErrorResponseCodeGenerator/Program.cs
@@ -45,7 +45,7 @@ namespace ErrorResponseCodeGenerator
 ";

             }

 

-            RecursiveAddErrorCode(typeof(TimelineApp.Models.Http.ErrorCodes), true);

+            RecursiveAddErrorCode(typeof(Timeline.Models.Http.ErrorCodes), true);

 

             code = @"

 using static Timeline.Resources.Messages;

diff --git a/Timeline.ErrorCodes/ErrorCodes.cs b/Timeline.ErrorCodes/ErrorCodes.cs
index b60a96ac..eca0e18b 100644
--- a/Timeline.ErrorCodes/ErrorCodes.cs
+++ b/Timeline.ErrorCodes/ErrorCodes.cs
@@ -1,4 +1,4 @@
-namespace TimelineApp.Models.Http

+namespace Timeline.Models.Http

 {

     /// <summary>

     /// All error code constants.

diff --git a/Timeline.ErrorCodes/TimelineApp.ErrorCodes.csproj b/Timeline.ErrorCodes/Timeline.ErrorCodes.csproj
index 01ca2568..01ca2568 100644
--- a/Timeline.ErrorCodes/TimelineApp.ErrorCodes.csproj
+++ b/Timeline.ErrorCodes/Timeline.ErrorCodes.csproj
diff --git a/Timeline.Tests/ErrorCodeTest.cs b/Timeline.Tests/ErrorCodeTest.cs
index 3f8c855c..258ebf4e 100644
--- a/Timeline.Tests/ErrorCodeTest.cs
+++ b/Timeline.Tests/ErrorCodeTest.cs
@@ -3,11 +3,11 @@ using System;
 using System.Collections.Generic;

 using System.Linq;

 using System.Reflection;

-using TimelineApp.Models.Http;

+using Timeline.Models.Http;

 using Xunit;

 using Xunit.Abstractions;

 

-namespace TimelineApp.Tests

+namespace Timeline.Tests

 {

     public class ErrorCodeTest

     {

diff --git a/Timeline.Tests/Helpers/AsyncFunctionAssertionsExtensions.cs b/Timeline.Tests/Helpers/AsyncFunctionAssertionsExtensions.cs
index 516c34e9..b78309c0 100644
--- a/Timeline.Tests/Helpers/AsyncFunctionAssertionsExtensions.cs
+++ b/Timeline.Tests/Helpers/AsyncFunctionAssertionsExtensions.cs
@@ -4,7 +4,7 @@ using FluentAssertions.Specialized;
 using System;

 using System.Threading.Tasks;

 

-namespace TimelineApp.Tests.Helpers

+namespace Timeline.Tests.Helpers

 {

     public static class AsyncFunctionAssertionsExtensions

     {

diff --git a/Timeline.Tests/Helpers/HttpClientExtensions.cs b/Timeline.Tests/Helpers/HttpClientExtensions.cs
index 952266b3..6513bbe7 100644
--- a/Timeline.Tests/Helpers/HttpClientExtensions.cs
+++ b/Timeline.Tests/Helpers/HttpClientExtensions.cs
@@ -6,7 +6,7 @@ using System.Net.Mime;
 using System.Text;

 using System.Threading.Tasks;

 

-namespace TimelineApp.Tests.Helpers

+namespace Timeline.Tests.Helpers

 {

     public static class HttpClientExtensions

     {

diff --git a/Timeline.Tests/Helpers/ImageHelper.cs b/Timeline.Tests/Helpers/ImageHelper.cs
index ffbb38ae..9bed0917 100644
--- a/Timeline.Tests/Helpers/ImageHelper.cs
+++ b/Timeline.Tests/Helpers/ImageHelper.cs
@@ -3,7 +3,7 @@ using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.PixelFormats;

 using System.IO;

 

-namespace TimelineApp.Tests.Helpers

+namespace Timeline.Tests.Helpers

 {

     public static class ImageHelper

     {

diff --git a/Timeline.Tests/Helpers/ParameterInfoAssertions.cs b/Timeline.Tests/Helpers/ParameterInfoAssertions.cs
index a714f410..d3e5a41e 100644
--- a/Timeline.Tests/Helpers/ParameterInfoAssertions.cs
+++ b/Timeline.Tests/Helpers/ParameterInfoAssertions.cs
@@ -5,7 +5,7 @@ using FluentAssertions.Primitives;
 using System;

 using System.Reflection;

 

-namespace TimelineApp.Tests.Helpers

+namespace Timeline.Tests.Helpers

 {

     public class ParameterInfoValueFormatter : IValueFormatter

     {

diff --git a/Timeline.Tests/Helpers/ReflectionHelper.cs b/Timeline.Tests/Helpers/ReflectionHelper.cs
index 16d68bb1..3f6036e3 100644
--- a/Timeline.Tests/Helpers/ReflectionHelper.cs
+++ b/Timeline.Tests/Helpers/ReflectionHelper.cs
@@ -1,7 +1,7 @@
 using System.Linq;

 using System.Reflection;

 

-namespace TimelineApp.Tests.Helpers

+namespace Timeline.Tests.Helpers

 {

     public static class ReflectionHelper

     {

diff --git a/Timeline.Tests/Helpers/ResponseAssertions.cs b/Timeline.Tests/Helpers/ResponseAssertions.cs
index 4984d224..f01a0677 100644
--- a/Timeline.Tests/Helpers/ResponseAssertions.cs
+++ b/Timeline.Tests/Helpers/ResponseAssertions.cs
@@ -9,10 +9,10 @@ using System.Net.Http;
 using System.Text;

 using System.Text.Json;

 using System.Text.Json.Serialization;

-using TimelineApp.Models.Converters;

-using TimelineApp.Models.Http;

+using Timeline.Models.Converters;

+using Timeline.Models.Http;

 

-namespace TimelineApp.Tests.Helpers

+namespace Timeline.Tests.Helpers

 {

     public class HttpResponseMessageValueFormatter : IValueFormatter

     {

diff --git a/Timeline.Tests/Helpers/TestApplication.cs b/Timeline.Tests/Helpers/TestApplication.cs
index c655d337..52c2f2e2 100644
--- a/Timeline.Tests/Helpers/TestApplication.cs
+++ b/Timeline.Tests/Helpers/TestApplication.cs
@@ -6,10 +6,10 @@ using Microsoft.Extensions.DependencyInjection;
 using System;

 using System.Collections.Generic;

 using System.IO;

-using TimelineApp.Entities;

-using TimelineApp.Migrations;

+using Timeline.Entities;

+using Timeline.Migrations;

 

-namespace TimelineApp.Tests.Helpers

+namespace Timeline.Tests.Helpers

 {

     public class TestApplication : IDisposable

     {

diff --git a/Timeline.Tests/IntegratedTests/AuthorizationTest.cs b/Timeline.Tests/IntegratedTests/AuthorizationTest.cs
index 69be9187..4aa6b3ae 100644
--- a/Timeline.Tests/IntegratedTests/AuthorizationTest.cs
+++ b/Timeline.Tests/IntegratedTests/AuthorizationTest.cs
@@ -2,10 +2,10 @@ using FluentAssertions;
 using Microsoft.AspNetCore.Mvc.Testing;

 using System.Net;

 using System.Threading.Tasks;

-using TimelineApp.Tests.Helpers;

+using Timeline.Tests.Helpers;

 using Xunit;

 

-namespace TimelineApp.Tests.IntegratedTests

+namespace Timeline.Tests.IntegratedTests

 {

     public class AuthorizationTest : IntegratedTestBase

     {

diff --git a/Timeline.Tests/IntegratedTests/IntegratedTestBase.cs b/Timeline.Tests/IntegratedTests/IntegratedTestBase.cs
index e265c16e..dfde2ea5 100644
--- a/Timeline.Tests/IntegratedTests/IntegratedTestBase.cs
+++ b/Timeline.Tests/IntegratedTests/IntegratedTestBase.cs
@@ -5,12 +5,12 @@ using System;
 using System.Collections.Generic;

 using System.Net.Http;
 using System.Threading.Tasks;
-using TimelineApp.Models.Http;
-using TimelineApp.Services;

-using TimelineApp.Tests.Helpers;
+using Timeline.Models.Http;
+using Timeline.Services;

+using Timeline.Tests.Helpers;
 using Xunit;
 
-namespace TimelineApp.Tests.IntegratedTests
+namespace Timeline.Tests.IntegratedTests
 {
     public abstract class IntegratedTestBase : IClassFixture<WebApplicationFactory<Startup>>, IDisposable
     {
diff --git a/Timeline.Tests/IntegratedTests/PersonalTimelineTest.cs b/Timeline.Tests/IntegratedTests/PersonalTimelineTest.cs
index b6d3e827..7d0a68e8 100644
--- a/Timeline.Tests/IntegratedTests/PersonalTimelineTest.cs
+++ b/Timeline.Tests/IntegratedTests/PersonalTimelineTest.cs
@@ -5,11 +5,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using TimelineApp.Models.Http;
-using TimelineApp.Tests.Helpers;
+using Timeline.Models.Http;
+using Timeline.Tests.Helpers;
 using Xunit;
 
-namespace TimelineApp.Tests.IntegratedTests
+namespace Timeline.Tests.IntegratedTests
 {
     public class PersonalTimelineTest : IntegratedTestBase
     {
diff --git a/Timeline.Tests/IntegratedTests/TimelineTest.cs b/Timeline.Tests/IntegratedTests/TimelineTest.cs
index cad74e6c..14a0a59e 100644
--- a/Timeline.Tests/IntegratedTests/TimelineTest.cs
+++ b/Timeline.Tests/IntegratedTests/TimelineTest.cs
@@ -6,11 +6,11 @@ using System.Linq;
 using System.Net;

 using System.Net.Http;

 using System.Threading.Tasks;

-using TimelineApp.Models.Http;

-using TimelineApp.Tests.Helpers;

+using Timeline.Models.Http;

+using Timeline.Tests.Helpers;

 using Xunit;

 

-namespace TimelineApp.Tests.IntegratedTests

+namespace Timeline.Tests.IntegratedTests

 {

     public class TimelineTest : IntegratedTestBase

     {

diff --git a/Timeline.Tests/IntegratedTests/TokenTest.cs b/Timeline.Tests/IntegratedTests/TokenTest.cs
index 10af46af..928d546c 100644
--- a/Timeline.Tests/IntegratedTests/TokenTest.cs
+++ b/Timeline.Tests/IntegratedTests/TokenTest.cs
@@ -4,12 +4,12 @@ using Microsoft.Extensions.DependencyInjection;
 using System.Collections.Generic;

 using System.Net.Http;

 using System.Threading.Tasks;

-using TimelineApp.Models.Http;

-using TimelineApp.Services;

-using TimelineApp.Tests.Helpers;

+using Timeline.Models.Http;

+using Timeline.Services;

+using Timeline.Tests.Helpers;

 using Xunit;

 

-namespace TimelineApp.Tests.IntegratedTests

+namespace Timeline.Tests.IntegratedTests

 {

     public class TokenTest : IntegratedTestBase

     {

diff --git a/Timeline.Tests/IntegratedTests/UserAvatarTest.cs b/Timeline.Tests/IntegratedTests/UserAvatarTest.cs
index 8fd1d687..fa0120f1 100644
--- a/Timeline.Tests/IntegratedTests/UserAvatarTest.cs
+++ b/Timeline.Tests/IntegratedTests/UserAvatarTest.cs
@@ -13,12 +13,12 @@ using System.Net;
 using System.Net.Http;

 using System.Net.Http.Headers;

 using System.Threading.Tasks;

-using TimelineApp.Models.Http;

-using TimelineApp.Services;

-using TimelineApp.Tests.Helpers;

+using Timeline.Models.Http;

+using Timeline.Services;

+using Timeline.Tests.Helpers;

 using Xunit;

 

-namespace TimelineApp.Tests.IntegratedTests

+namespace Timeline.Tests.IntegratedTests

 {

     public class UserAvatarTest : IntegratedTestBase

     {

diff --git a/Timeline.Tests/IntegratedTests/UserTest.cs b/Timeline.Tests/IntegratedTests/UserTest.cs
index eed13565..8ce76299 100644
--- a/Timeline.Tests/IntegratedTests/UserTest.cs
+++ b/Timeline.Tests/IntegratedTests/UserTest.cs
@@ -4,11 +4,11 @@ using System.Collections.Generic;
 using System.Net;

 using System.Net.Http;

 using System.Threading.Tasks;

-using TimelineApp.Models.Http;

-using TimelineApp.Tests.Helpers;

+using Timeline.Models.Http;

+using Timeline.Tests.Helpers;

 using Xunit;

 

-namespace TimelineApp.Tests.IntegratedTests

+namespace Timeline.Tests.IntegratedTests

 {

     public class UserTest : IntegratedTestBase

     {

diff --git a/Timeline.Tests/PasswordGenerator.cs b/Timeline.Tests/PasswordGenerator.cs
index bb6c538d..6c07836b 100644
--- a/Timeline.Tests/PasswordGenerator.cs
+++ b/Timeline.Tests/PasswordGenerator.cs
@@ -1,9 +1,9 @@
 using System;

-using TimelineApp.Services;

+using Timeline.Services;

 using Xunit;

 using Xunit.Abstractions;

 

-namespace TimelineApp.Tests

+namespace Timeline.Tests

 {

     public class PasswordGenerator

     {

diff --git a/Timeline.Tests/TimelineApp.Tests.csproj b/Timeline.Tests/Timeline.Tests.csproj
index 1f445f8b..1f00cc6c 100644
--- a/Timeline.Tests/TimelineApp.Tests.csproj
+++ b/Timeline.Tests/Timeline.Tests.csproj
@@ -28,6 +28,6 @@
     </ItemGroup>

 

     <ItemGroup>

-      <ProjectReference Include="..\Timeline\TimelineApp.csproj" />

+      <ProjectReference Include="..\Timeline\Timeline.csproj" />

     </ItemGroup>

 </Project>

diff --git a/Timeline.Tests/UsernameValidatorUnitTest.cs b/Timeline.Tests/UsernameValidatorUnitTest.cs
index f436c091..8824362b 100644
--- a/Timeline.Tests/UsernameValidatorUnitTest.cs
+++ b/Timeline.Tests/UsernameValidatorUnitTest.cs
@@ -1,9 +1,9 @@
 using FluentAssertions;

-using TimelineApp.Models.Validation;

-using TimelineApp.Tests.Helpers;

+using Timeline.Models.Validation;

+using Timeline.Tests.Helpers;

 using Xunit;

 

-namespace TimelineApp.Tests

+namespace Timeline.Tests

 {

     public class UsernameValidatorUnitTest : IClassFixture<UsernameValidator>

     {

diff --git a/Timeline.sln b/Timeline.sln
index fc6e0d50..dfffe385 100644
--- a/Timeline.sln
+++ b/Timeline.sln
@@ -2,13 +2,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16

 VisualStudioVersion = 16.0.29709.97

 MinimumVisualStudioVersion = 10.0.40219.1

-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TimelineApp", "Timeline\TimelineApp.csproj", "{A34D323C-5233-4754-B14F-4819CE9C27CA}"

+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Timeline", "Timeline\Timeline.csproj", "{A34D323C-5233-4754-B14F-4819CE9C27CA}"

 EndProject

-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TimelineApp.Tests", "Timeline.Tests\TimelineApp.Tests.csproj", "{3D76D578-37BC-43C2-97BF-9C6DD3825F10}"

+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Timeline.Tests", "Timeline.Tests\Timeline.Tests.csproj", "{3D76D578-37BC-43C2-97BF-9C6DD3825F10}"

 EndProject

 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ErrorResponseCodeGenerator", "ErrorResponseCodeGenerator\ErrorResponseCodeGenerator.csproj", "{F325F802-75DE-4527-A299-F668281B0E4D}"

 EndProject

-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TimelineApp.ErrorCodes", "Timeline.ErrorCodes\TimelineApp.ErrorCodes.csproj", "{1044E3B0-1010-47CA-956E-B6E8FE87055B}"

+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Timeline.ErrorCodes", "Timeline.ErrorCodes\Timeline.ErrorCodes.csproj", "{1044E3B0-1010-47CA-956E-B6E8FE87055B}"

 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Timeline/Auth/Attribute.cs b/Timeline/Auth/Attribute.cs
index 51e20bdf..86d0109b 100644
--- a/Timeline/Auth/Attribute.cs
+++ b/Timeline/Auth/Attribute.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Authorization;

-using TimelineApp.Entities;

+using Timeline.Entities;

 

-namespace TimelineApp.Auth

+namespace Timeline.Auth

 {

     public class AdminAuthorizeAttribute : AuthorizeAttribute

     {

diff --git a/Timeline/Auth/MyAuthenticationHandler.cs b/Timeline/Auth/MyAuthenticationHandler.cs
index 5e119b69..3c97c329 100644
--- a/Timeline/Auth/MyAuthenticationHandler.cs
+++ b/Timeline/Auth/MyAuthenticationHandler.cs
@@ -8,10 +8,10 @@ using System.Linq;
 using System.Security.Claims;

 using System.Text.Encodings.Web;

 using System.Threading.Tasks;

-using TimelineApp.Services;

-using static TimelineApp.Resources.Authentication.AuthHandler;

+using Timeline.Services;

+using static Timeline.Resources.Authentication.AuthHandler;

 

-namespace TimelineApp.Auth

+namespace Timeline.Auth

 {

     public static class AuthenticationConstants

     {

diff --git a/Timeline/Auth/PrincipalExtensions.cs b/Timeline/Auth/PrincipalExtensions.cs
index e7eb04b7..ad7a887f 100644
--- a/Timeline/Auth/PrincipalExtensions.cs
+++ b/Timeline/Auth/PrincipalExtensions.cs
@@ -1,7 +1,7 @@
 using System.Security.Principal;

-using TimelineApp.Entities;

+using Timeline.Entities;

 

-namespace TimelineApp.Auth

+namespace Timeline.Auth

 {

     internal static class PrincipalExtensions

     {

diff --git a/Timeline/Configs/JwtConfiguration.cs b/Timeline/Configs/JwtConfiguration.cs
index ce8dd48b..af8052de 100644
--- a/Timeline/Configs/JwtConfiguration.cs
+++ b/Timeline/Configs/JwtConfiguration.cs
@@ -1,4 +1,4 @@
-namespace TimelineApp.Configs

+namespace Timeline.Configs

 {

     public class JwtConfiguration

     {

diff --git a/Timeline/Controllers/ControllerAuthExtensions.cs b/Timeline/Controllers/ControllerAuthExtensions.cs
index 9c7ea601..00a65454 100644
--- a/Timeline/Controllers/ControllerAuthExtensions.cs
+++ b/Timeline/Controllers/ControllerAuthExtensions.cs
@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;

 using System;

 using System.Security.Claims;

-using TimelineApp.Auth;

-using static TimelineApp.Resources.Controllers.ControllerAuthExtensions;

+using Timeline.Auth;

+using static Timeline.Resources.Controllers.ControllerAuthExtensions;

 

-namespace TimelineApp.Controllers

+namespace Timeline.Controllers

 {

     public static class ControllerAuthExtensions

     {

diff --git a/Timeline/Controllers/PersonalTimelineController.cs b/Timeline/Controllers/PersonalTimelineController.cs
index 0c0694cb..cef04a97 100644
--- a/Timeline/Controllers/PersonalTimelineController.cs
+++ b/Timeline/Controllers/PersonalTimelineController.cs
@@ -4,12 +4,12 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;

 using System.Collections.Generic;

 using System.Threading.Tasks;

-using TimelineApp.Filters;

-using TimelineApp.Models.Http;

-using TimelineApp.Models.Validation;

-using TimelineApp.Services;

+using Timeline.Filters;

+using Timeline.Models.Http;

+using Timeline.Models.Validation;

+using Timeline.Services;

 

-namespace TimelineApp.Controllers

+namespace Timeline.Controllers

 {

     [ApiController]

     [CatchTimelineNotExistException]

diff --git a/Timeline/Controllers/Testing/TestingAuthController.cs b/Timeline/Controllers/Testing/TestingAuthController.cs
index 6061f003..4d3b3ec7 100644
--- a/Timeline/Controllers/Testing/TestingAuthController.cs
+++ b/Timeline/Controllers/Testing/TestingAuthController.cs
@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Authorization;

 using Microsoft.AspNetCore.Mvc;

-using TimelineApp.Auth;

+using Timeline.Auth;

 

-namespace TimelineApp.Controllers.Testing

+namespace Timeline.Controllers.Testing

 {

     [Route("testing/auth")]

     [ApiController]

diff --git a/Timeline/Controllers/TimelineController.cs b/Timeline/Controllers/TimelineController.cs
index e3baff12..25290ca5 100644
--- a/Timeline/Controllers/TimelineController.cs
+++ b/Timeline/Controllers/TimelineController.cs
@@ -7,13 +7,13 @@ using System;
 using System.Collections.Generic;

 using System.ComponentModel.DataAnnotations;

 using System.Threading.Tasks;

-using TimelineApp.Filters;

-using TimelineApp.Models;

-using TimelineApp.Models.Http;

-using TimelineApp.Models.Validation;

-using TimelineApp.Services;

+using Timeline.Filters;

+using Timeline.Models;

+using Timeline.Models.Http;

+using Timeline.Models.Validation;

+using Timeline.Services;

 

-namespace TimelineApp.Controllers

+namespace Timeline.Controllers

 {

     [ApiController]

     [CatchTimelineNotExistException]

diff --git a/Timeline/Controllers/TokenController.cs b/Timeline/Controllers/TokenController.cs
index 47dcc0aa..1fb0b17a 100644
--- a/Timeline/Controllers/TokenController.cs
+++ b/Timeline/Controllers/TokenController.cs
@@ -5,12 +5,12 @@ using Microsoft.Extensions.Logging;
 using System;

 using System.Globalization;

 using System.Threading.Tasks;

-using TimelineApp.Helpers;

-using TimelineApp.Models.Http;

-using TimelineApp.Services;

-using static TimelineApp.Resources.Controllers.TokenController;

+using Timeline.Helpers;

+using Timeline.Models.Http;

+using Timeline.Services;

+using static Timeline.Resources.Controllers.TokenController;

 

-namespace TimelineApp.Controllers

+namespace Timeline.Controllers

 {

     [Route("token")]

     [ApiController]

diff --git a/Timeline/Controllers/UserAvatarController.cs b/Timeline/Controllers/UserAvatarController.cs
index 089cef94..f4f3db3e 100644
--- a/Timeline/Controllers/UserAvatarController.cs
+++ b/Timeline/Controllers/UserAvatarController.cs
@@ -6,15 +6,15 @@ using Microsoft.Net.Http.Headers;
 using System;

 using System.Linq;

 using System.Threading.Tasks;

-using TimelineApp.Auth;

-using TimelineApp.Filters;

-using TimelineApp.Helpers;

-using TimelineApp.Models.Http;

-using TimelineApp.Models.Validation;

-using TimelineApp.Services;

-using static TimelineApp.Resources.Controllers.UserAvatarController;

-

-namespace TimelineApp.Controllers

+using Timeline.Auth;

+using Timeline.Filters;

+using Timeline.Helpers;

+using Timeline.Models.Http;

+using Timeline.Models.Validation;

+using Timeline.Services;

+using static Timeline.Resources.Controllers.UserAvatarController;

+

+namespace Timeline.Controllers

 {

     [ApiController]

     public class UserAvatarController : Controller

diff --git a/Timeline/Controllers/UserController.cs b/Timeline/Controllers/UserController.cs
index 4106c750..a3e8d816 100644
--- a/Timeline/Controllers/UserController.cs
+++ b/Timeline/Controllers/UserController.cs
@@ -5,15 +5,15 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;

 using System.Linq;

 using System.Threading.Tasks;

-using TimelineApp.Auth;

-using TimelineApp.Helpers;

-using TimelineApp.Models.Http;

-using TimelineApp.Models.Validation;

-using TimelineApp.Services;

-using static TimelineApp.Resources.Controllers.UserController;

-using static TimelineApp.Resources.Messages;

+using Timeline.Auth;

+using Timeline.Helpers;

+using Timeline.Models.Http;

+using Timeline.Models.Validation;

+using Timeline.Services;

+using static Timeline.Resources.Controllers.UserController;

+using static Timeline.Resources.Messages;

 

-namespace TimelineApp.Controllers

+namespace Timeline.Controllers

 {

     [ApiController]

     public class UserController : Controller

diff --git a/Timeline/Entities/DataEntity.cs b/Timeline/Entities/DataEntity.cs
index dd8a8ae7..b21e2dbf 100644
--- a/Timeline/Entities/DataEntity.cs
+++ b/Timeline/Entities/DataEntity.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;

 using System.ComponentModel.DataAnnotations.Schema;

 

-namespace TimelineApp.Entities

+namespace Timeline.Entities

 {

     [Table("data")]

     public class DataEntity

diff --git a/Timeline/Entities/DatabaseContext.cs b/Timeline/Entities/DatabaseContext.cs
index 5c074d2c..8899308c 100644
--- a/Timeline/Entities/DatabaseContext.cs
+++ b/Timeline/Entities/DatabaseContext.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;

 

-namespace TimelineApp.Entities

+namespace Timeline.Entities

 {

     public class DatabaseContext : DbContext

     {

diff --git a/Timeline/Entities/JwtTokenEntity.cs b/Timeline/Entities/JwtTokenEntity.cs
index 6e5ae9a8..40cb230a 100644
--- a/Timeline/Entities/JwtTokenEntity.cs
+++ b/Timeline/Entities/JwtTokenEntity.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;

 using System.ComponentModel.DataAnnotations.Schema;

 

-namespace TimelineApp.Entities

+namespace Timeline.Entities

 {

     [Table("jwt_token")]

     public class JwtTokenEntity

diff --git a/Timeline/Entities/TimelineEntity.cs b/Timeline/Entities/TimelineEntity.cs
index c902a690..56b36d4e 100644
--- a/Timeline/Entities/TimelineEntity.cs
+++ b/Timeline/Entities/TimelineEntity.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;

 using System.ComponentModel.DataAnnotations;

 using System.ComponentModel.DataAnnotations.Schema;

-using TimelineApp.Models.Http;

+using Timeline.Models.Http;

 

-namespace TimelineApp.Entities

+namespace Timeline.Entities

 {

 #pragma warning disable CA2227 // Collection properties should be read only

     // TODO: Create index for this table.

diff --git a/Timeline/Entities/TimelineMemberEntity.cs b/Timeline/Entities/TimelineMemberEntity.cs
index e421ca2e..e76f2099 100644
--- a/Timeline/Entities/TimelineMemberEntity.cs
+++ b/Timeline/Entities/TimelineMemberEntity.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;

 using System.ComponentModel.DataAnnotations.Schema;

 

-namespace TimelineApp.Entities

+namespace Timeline.Entities

 {

     [Table("timeline_members")]

     public class TimelineMemberEntity

diff --git a/Timeline/Entities/TimelinePostEntity.cs b/Timeline/Entities/TimelinePostEntity.cs
index 8cdecef5..24bfc7a3 100644
--- a/Timeline/Entities/TimelinePostEntity.cs
+++ b/Timeline/Entities/TimelinePostEntity.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;

 using System.ComponentModel.DataAnnotations.Schema;

 

-namespace TimelineApp.Entities

+namespace Timeline.Entities

 {

     [Table("timeline_posts")]

     public class TimelinePostEntity

diff --git a/Timeline/Entities/UserAvatarEntity.cs b/Timeline/Entities/UserAvatarEntity.cs
index b32faf06..3c2720f7 100644
--- a/Timeline/Entities/UserAvatarEntity.cs
+++ b/Timeline/Entities/UserAvatarEntity.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;

 using System.ComponentModel.DataAnnotations.Schema;

 

-namespace TimelineApp.Entities

+namespace Timeline.Entities

 {

     [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1819:Properties should not return arrays", Justification = "This is data base entity.")]

     [Table("user_avatars")]

diff --git a/Timeline/Entities/UserEntity.cs b/Timeline/Entities/UserEntity.cs
index 6c193da8..1ef3f98c 100644
--- a/Timeline/Entities/UserEntity.cs
+++ b/Timeline/Entities/UserEntity.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;

 using System.ComponentModel.DataAnnotations.Schema;

 

-namespace TimelineApp.Entities

+namespace Timeline.Entities

 {

     public static class UserRoles

     {

diff --git a/Timeline/Filters/Header.cs b/Timeline/Filters/Header.cs
index 3892e451..0db11faf 100644
--- a/Timeline/Filters/Header.cs
+++ b/Timeline/Filters/Header.cs
@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;

 using Microsoft.AspNetCore.Mvc.Filters;

-using TimelineApp.Models.Http;

+using Timeline.Models.Http;

 

-namespace TimelineApp.Filters

+namespace Timeline.Filters

 {

     public class RequireContentTypeAttribute : ActionFilterAttribute

     {

diff --git a/Timeline/Filters/Timeline.cs b/Timeline/Filters/Timeline.cs
index 28ac8818..e133c9d6 100644
--- a/Timeline/Filters/Timeline.cs
+++ b/Timeline/Filters/Timeline.cs
@@ -1,9 +1,9 @@
 using Microsoft.AspNetCore.Mvc;

 using Microsoft.AspNetCore.Mvc.Filters;

-using TimelineApp.Models.Http;

-using TimelineApp.Services;

+using Timeline.Models.Http;

+using Timeline.Services;

 

-namespace TimelineApp.Filters

+namespace Timeline.Filters

 {

     public class CatchTimelineNotExistExceptionAttribute : ExceptionFilterAttribute

     {

diff --git a/Timeline/Formatters/StringInputFormatter.cs b/Timeline/Formatters/StringInputFormatter.cs
index e6831d0a..b1924268 100644
--- a/Timeline/Formatters/StringInputFormatter.cs
+++ b/Timeline/Formatters/StringInputFormatter.cs
@@ -5,7 +5,7 @@ using System.Net.Mime;
 using System.Text;

 using System.Threading.Tasks;

 

-namespace TimelineApp.Formatters

+namespace Timeline.Formatters

 {

     public class StringInputFormatter : TextInputFormatter

     {

diff --git a/Timeline/Helpers/InvalidModelResponseFactory.cs b/Timeline/Helpers/InvalidModelResponseFactory.cs
index 09273657..9b253e7d 100644
--- a/Timeline/Helpers/InvalidModelResponseFactory.cs
+++ b/Timeline/Helpers/InvalidModelResponseFactory.cs
@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;

 using System.Text;

-using TimelineApp.Models.Http;

+using Timeline.Models.Http;

 

-namespace TimelineApp.Helpers

+namespace Timeline.Helpers

 {

     public static class InvalidModelResponseFactory

     {

diff --git a/Timeline/Helpers/LanguageHelper.cs b/Timeline/Helpers/LanguageHelper.cs
index c5272253..b0156b8b 100644
--- a/Timeline/Helpers/LanguageHelper.cs
+++ b/Timeline/Helpers/LanguageHelper.cs
@@ -1,6 +1,6 @@
 using System.Linq;

 

-namespace TimelineApp.Helpers

+namespace Timeline.Helpers

 {

     public static class LanguageHelper

     {

diff --git a/Timeline/Helpers/Log.cs b/Timeline/Helpers/Log.cs
index bc122e76..68c975fa 100644
--- a/Timeline/Helpers/Log.cs
+++ b/Timeline/Helpers/Log.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;

 using System.Text;

 

-namespace TimelineApp.Helpers

+namespace Timeline.Helpers

 {

     public static class Log

     {

diff --git a/Timeline/Helpers/StringLocalizerFactoryExtensions.cs b/Timeline/Helpers/StringLocalizerFactoryExtensions.cs
index 45994c36..c2252b2c 100644
--- a/Timeline/Helpers/StringLocalizerFactoryExtensions.cs
+++ b/Timeline/Helpers/StringLocalizerFactoryExtensions.cs
@@ -2,7 +2,7 @@
 using Microsoft.Extensions.Localization;

 using System.Reflection;

 

-namespace TimelineApp.Helpers

+namespace Timeline.Helpers

 {

     internal static class StringLocalizerFactoryExtensions

     {

diff --git a/Timeline/Migrations/20200105150407_Initialize.Designer.cs b/Timeline/Migrations/20200105150407_Initialize.Designer.cs
index 46670fa5..99e4eaac 100644
--- a/Timeline/Migrations/20200105150407_Initialize.Designer.cs
+++ b/Timeline/Migrations/20200105150407_Initialize.Designer.cs
@@ -4,9 +4,9 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;

 using Microsoft.EntityFrameworkCore.Migrations;

 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;

-using TimelineApp.Entities;

+using Timeline.Entities;

 

-namespace TimelineApp.Migrations

+namespace Timeline.Migrations

 {

     [DbContext(typeof(DatabaseContext))]

     [Migration("20200105150407_Initialize")]

diff --git a/Timeline/Migrations/20200105150407_Initialize.cs b/Timeline/Migrations/20200105150407_Initialize.cs
index 0013259c..4e12ef83 100644
--- a/Timeline/Migrations/20200105150407_Initialize.cs
+++ b/Timeline/Migrations/20200105150407_Initialize.cs
@@ -1,7 +1,7 @@
 using System;

 using Microsoft.EntityFrameworkCore.Migrations;

 

-namespace TimelineApp.Migrations

+namespace Timeline.Migrations

 {

     public partial class Initialize : Migration

     {

diff --git a/Timeline/Migrations/20200131100517_RefactorUser.Designer.cs b/Timeline/Migrations/20200131100517_RefactorUser.Designer.cs
index 02fde575..9b78eb15 100644
--- a/Timeline/Migrations/20200131100517_RefactorUser.Designer.cs
+++ b/Timeline/Migrations/20200131100517_RefactorUser.Designer.cs
@@ -4,9 +4,9 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;

 using Microsoft.EntityFrameworkCore.Migrations;

 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;

-using TimelineApp.Entities;

+using Timeline.Entities;

 

-namespace TimelineApp.Migrations

+namespace Timeline.Migrations

 {

     [DbContext(typeof(DatabaseContext))]

     [Migration("20200131100517_RefactorUser")]

diff --git a/Timeline/Migrations/20200131100517_RefactorUser.cs b/Timeline/Migrations/20200131100517_RefactorUser.cs
index af6235e1..8597ed50 100644
--- a/Timeline/Migrations/20200131100517_RefactorUser.cs
+++ b/Timeline/Migrations/20200131100517_RefactorUser.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore.Migrations;

 

-namespace TimelineApp.Migrations

+namespace Timeline.Migrations

 {

     public partial class RefactorUser : Migration

     {

diff --git a/Timeline/Migrations/20200221064341_AddJwtToken.Designer.cs b/Timeline/Migrations/20200221064341_AddJwtToken.Designer.cs
index 7c5b26b8..eb328b52 100644
--- a/Timeline/Migrations/20200221064341_AddJwtToken.Designer.cs
+++ b/Timeline/Migrations/20200221064341_AddJwtToken.Designer.cs
@@ -4,9 +4,9 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;

 using Microsoft.EntityFrameworkCore.Migrations;

 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;

-using TimelineApp.Entities;

+using Timeline.Entities;

 

-namespace TimelineApp.Migrations

+namespace Timeline.Migrations

 {

     [DbContext(typeof(DatabaseContext))]

     [Migration("20200221064341_AddJwtToken")]

diff --git a/Timeline/Migrations/20200221064341_AddJwtToken.cs b/Timeline/Migrations/20200221064341_AddJwtToken.cs
index 00d23d0f..628970c6 100644
--- a/Timeline/Migrations/20200221064341_AddJwtToken.cs
+++ b/Timeline/Migrations/20200221064341_AddJwtToken.cs
@@ -2,7 +2,7 @@
 using System.Security.Cryptography;

 using Microsoft.EntityFrameworkCore.Migrations;

 

-namespace TimelineApp.Migrations

+namespace Timeline.Migrations

 {

     public static class JwtTokenGenerateHelper

     {

diff --git a/Timeline/Migrations/20200229103848_AddPostLocalId.Designer.cs b/Timeline/Migrations/20200229103848_AddPostLocalId.Designer.cs
index 3abac60e..cf6ae8a3 100644
--- a/Timeline/Migrations/20200229103848_AddPostLocalId.Designer.cs
+++ b/Timeline/Migrations/20200229103848_AddPostLocalId.Designer.cs
@@ -4,9 +4,9 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;

 using Microsoft.EntityFrameworkCore.Migrations;

 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;

-using TimelineApp.Entities;

+using Timeline.Entities;

 

-namespace TimelineApp.Migrations

+namespace Timeline.Migrations

 {

     [DbContext(typeof(DatabaseContext))]

     [Migration("20200229103848_AddPostLocalId")]

diff --git a/Timeline/Migrations/20200229103848_AddPostLocalId.cs b/Timeline/Migrations/20200229103848_AddPostLocalId.cs
index 029498ba..497b38a1 100644
--- a/Timeline/Migrations/20200229103848_AddPostLocalId.cs
+++ b/Timeline/Migrations/20200229103848_AddPostLocalId.cs
@@ -1,7 +1,7 @@
 using System;

 using Microsoft.EntityFrameworkCore.Migrations;

 

-namespace TimelineApp.Migrations

+namespace Timeline.Migrations

 {

     public partial class AddPostLocalId : Migration

     {

diff --git a/Timeline/Migrations/20200306110049_AddDataTable.Designer.cs b/Timeline/Migrations/20200306110049_AddDataTable.Designer.cs
index e7fdd35a..336ffc18 100644
--- a/Timeline/Migrations/20200306110049_AddDataTable.Designer.cs
+++ b/Timeline/Migrations/20200306110049_AddDataTable.Designer.cs
@@ -4,9 +4,9 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;

 using Microsoft.EntityFrameworkCore.Migrations;

 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;

-using TimelineApp.Entities;

+using Timeline.Entities;

 

-namespace TimelineApp.Migrations

+namespace Timeline.Migrations

 {

     [DbContext(typeof(DatabaseContext))]

     [Migration("20200306110049_AddDataTable")]

diff --git a/Timeline/Migrations/20200306110049_AddDataTable.cs b/Timeline/Migrations/20200306110049_AddDataTable.cs
index 81a1b67f..e33bf4c9 100644
--- a/Timeline/Migrations/20200306110049_AddDataTable.cs
+++ b/Timeline/Migrations/20200306110049_AddDataTable.cs
@@ -1,7 +1,7 @@
 using System;

 using Microsoft.EntityFrameworkCore.Migrations;

 

-namespace TimelineApp.Migrations

+namespace Timeline.Migrations

 {

     public partial class AddDataTable : Migration

     {

diff --git a/Timeline/Migrations/20200306111553_DropUserDetails.Designer.cs b/Timeline/Migrations/20200306111553_DropUserDetails.Designer.cs
index 775665ac..f0c4dc08 100644
--- a/Timeline/Migrations/20200306111553_DropUserDetails.Designer.cs
+++ b/Timeline/Migrations/20200306111553_DropUserDetails.Designer.cs
@@ -4,9 +4,9 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;

 using Microsoft.EntityFrameworkCore.Migrations;

 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;

-using TimelineApp.Entities;

+using Timeline.Entities;

 

-namespace TimelineApp.Migrations

+namespace Timeline.Migrations

 {

     [DbContext(typeof(DatabaseContext))]

     [Migration("20200306111553_DropUserDetails")]

diff --git a/Timeline/Migrations/20200306111553_DropUserDetails.cs b/Timeline/Migrations/20200306111553_DropUserDetails.cs
index d5d74cce..0a176461 100644
--- a/Timeline/Migrations/20200306111553_DropUserDetails.cs
+++ b/Timeline/Migrations/20200306111553_DropUserDetails.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore.Migrations;

 

-namespace TimelineApp.Migrations

+namespace Timeline.Migrations

 {

     public partial class DropUserDetails : Migration

     {

diff --git a/Timeline/Migrations/DatabaseContextModelSnapshot.cs b/Timeline/Migrations/DatabaseContextModelSnapshot.cs
index 50094f3e..8170b2f0 100644
--- a/Timeline/Migrations/DatabaseContextModelSnapshot.cs
+++ b/Timeline/Migrations/DatabaseContextModelSnapshot.cs
@@ -3,9 +3,9 @@ using System;
 using Microsoft.EntityFrameworkCore;

 using Microsoft.EntityFrameworkCore.Infrastructure;

 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;

-using TimelineApp.Entities;

+using Timeline.Entities;

 

-namespace TimelineApp.Migrations

+namespace Timeline.Migrations

 {

     [DbContext(typeof(DatabaseContext))]

     partial class DatabaseContextModelSnapshot : ModelSnapshot

diff --git a/Timeline/Models/Converters/JsonDateTimeConverter.cs b/Timeline/Models/Converters/JsonDateTimeConverter.cs
index 057186de..ef129a01 100644
--- a/Timeline/Models/Converters/JsonDateTimeConverter.cs
+++ b/Timeline/Models/Converters/JsonDateTimeConverter.cs
@@ -4,7 +4,7 @@ using System.Globalization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace TimelineApp.Models.Converters
+namespace Timeline.Models.Converters
 {
     public class JsonDateTimeConverter : JsonConverter<DateTime>
     {
diff --git a/Timeline/Models/Http/Common.cs b/Timeline/Models/Http/Common.cs
index f30fdb0d..a9fc8a79 100644
--- a/Timeline/Models/Http/Common.cs
+++ b/Timeline/Models/Http/Common.cs
@@ -1,6 +1,6 @@
-using static TimelineApp.Resources.Models.Http.Common;

+using static Timeline.Resources.Models.Http.Common;

 

-namespace TimelineApp.Models.Http

+namespace Timeline.Models.Http

 {

     public class CommonResponse

     {

diff --git a/Timeline/Models/Http/ErrorResponse.cs b/Timeline/Models/Http/ErrorResponse.cs
index d6cb5ca0..9f7e70e1 100644
--- a/Timeline/Models/Http/ErrorResponse.cs
+++ b/Timeline/Models/Http/ErrorResponse.cs
@@ -1,7 +1,7 @@
 

-using static TimelineApp.Resources.Messages;

+using static Timeline.Resources.Messages;

 

-namespace TimelineApp.Models.Http

+namespace Timeline.Models.Http

 {

 

     public static class ErrorResponse

diff --git a/Timeline/Models/Http/Timeline.cs b/Timeline/Models/Http/Timeline.cs
index 637a775d..55c3a3bf 100644
--- a/Timeline/Models/Http/Timeline.cs
+++ b/Timeline/Models/Http/Timeline.cs
@@ -4,9 +4,9 @@ using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.AspNetCore.Mvc.Routing;

 using System;

 using System.Collections.Generic;

-using TimelineApp.Controllers;

+using Timeline.Controllers;

 

-namespace TimelineApp.Models.Http

+namespace Timeline.Models.Http

 {

     public class TimelinePostContentInfo

     {

diff --git a/Timeline/Models/Http/TimelineController.cs b/Timeline/Models/Http/TimelineController.cs
index b389c549..ce5f3b98 100644
--- a/Timeline/Models/Http/TimelineController.cs
+++ b/Timeline/Models/Http/TimelineController.cs
@@ -1,8 +1,8 @@
 using System;

 using System.ComponentModel.DataAnnotations;

-using TimelineApp.Models.Validation;

+using Timeline.Models.Validation;

 

-namespace TimelineApp.Models.Http

+namespace Timeline.Models.Http

 {

     public class TimelinePostCreateRequestContent

     {

diff --git a/Timeline/Models/Http/TokenController.cs b/Timeline/Models/Http/TokenController.cs
index 3376fb61..ea8b59ed 100644
--- a/Timeline/Models/Http/TokenController.cs
+++ b/Timeline/Models/Http/TokenController.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;

 

-namespace TimelineApp.Models.Http

+namespace Timeline.Models.Http

 {

     public class CreateTokenRequest

     {

diff --git a/Timeline/Models/Http/UserController.cs b/Timeline/Models/Http/UserController.cs
index c024c757..e4c95cbd 100644
--- a/Timeline/Models/Http/UserController.cs
+++ b/Timeline/Models/Http/UserController.cs
@@ -1,9 +1,9 @@
 using AutoMapper;

 using System.ComponentModel.DataAnnotations;

-using TimelineApp.Models.Validation;

-using TimelineApp.Services;

+using Timeline.Models.Validation;

+using Timeline.Services;

 

-namespace TimelineApp.Models.Http

+namespace Timeline.Models.Http

 {

     public class UserPatchRequest

     {

diff --git a/Timeline/Models/Http/UserInfo.cs b/Timeline/Models/Http/UserInfo.cs
index fcbbe7c9..4f887549 100644
--- a/Timeline/Models/Http/UserInfo.cs
+++ b/Timeline/Models/Http/UserInfo.cs
@@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Infrastructure;

 using Microsoft.AspNetCore.Mvc.Routing;

 using System;

-using TimelineApp.Controllers;

+using Timeline.Controllers;

 

-namespace TimelineApp.Models.Http

+namespace Timeline.Models.Http

 {

     public class UserInfo

     {

diff --git a/Timeline/Models/Timeline.cs b/Timeline/Models/Timeline.cs
index 52f38e42..e2ff525e 100644
--- a/Timeline/Models/Timeline.cs
+++ b/Timeline/Models/Timeline.cs
@@ -1,7 +1,7 @@
 using System;

 using System.Collections.Generic;

 

-namespace TimelineApp.Models

+namespace Timeline.Models

 {

     public enum TimelineVisibility

     {

diff --git a/Timeline/Models/User.cs b/Timeline/Models/User.cs
index 3b88a1b3..37777eba 100644
--- a/Timeline/Models/User.cs
+++ b/Timeline/Models/User.cs
@@ -1,4 +1,4 @@
-namespace TimelineApp.Models

+namespace Timeline.Models

 {

     public class User

     {

diff --git a/Timeline/Models/Validation/NameValidator.cs b/Timeline/Models/Validation/NameValidator.cs
index cf276309..dec2b872 100644
--- a/Timeline/Models/Validation/NameValidator.cs
+++ b/Timeline/Models/Validation/NameValidator.cs
@@ -1,7 +1,7 @@
 using System.Linq;

-using static TimelineApp.Resources.Models.Validation.NameValidator;

+using static Timeline.Resources.Models.Validation.NameValidator;

 

-namespace TimelineApp.Models.Validation

+namespace Timeline.Models.Validation

 {

     public class NameValidator : Validator<string>

     {

diff --git a/Timeline/Models/Validation/NicknameValidator.cs b/Timeline/Models/Validation/NicknameValidator.cs
index cef80b9f..1d6ab163 100644
--- a/Timeline/Models/Validation/NicknameValidator.cs
+++ b/Timeline/Models/Validation/NicknameValidator.cs
@@ -1,7 +1,7 @@
 using System;

-using static TimelineApp.Resources.Models.Validation.NicknameValidator;

+using static Timeline.Resources.Models.Validation.NicknameValidator;

 

-namespace TimelineApp.Models.Validation

+namespace Timeline.Models.Validation

 {

     public class NicknameValidator : Validator<string>

     {

diff --git a/Timeline/Models/Validation/TimelineNameValidator.cs b/Timeline/Models/Validation/TimelineNameValidator.cs
index 68110466..f1ab54e8 100644
--- a/Timeline/Models/Validation/TimelineNameValidator.cs
+++ b/Timeline/Models/Validation/TimelineNameValidator.cs
@@ -1,6 +1,6 @@
 using System;

 

-namespace TimelineApp.Models.Validation

+namespace Timeline.Models.Validation

 {

     public class TimelineNameValidator : NameValidator

     {

diff --git a/Timeline/Models/Validation/UsernameValidator.cs b/Timeline/Models/Validation/UsernameValidator.cs
index bc0a9fe4..87bbf85f 100644
--- a/Timeline/Models/Validation/UsernameValidator.cs
+++ b/Timeline/Models/Validation/UsernameValidator.cs
@@ -1,6 +1,6 @@
 using System;

 

-namespace TimelineApp.Models.Validation

+namespace Timeline.Models.Validation

 {

     public class UsernameValidator : NameValidator

     {

diff --git a/Timeline/Models/Validation/Validator.cs b/Timeline/Models/Validation/Validator.cs
index 2c61705e..ead7dbef 100644
--- a/Timeline/Models/Validation/Validator.cs
+++ b/Timeline/Models/Validation/Validator.cs
@@ -2,10 +2,10 @@
 using Microsoft.Extensions.Localization;

 using System;

 using System.ComponentModel.DataAnnotations;

-using TimelineApp.Helpers;

-using static TimelineApp.Resources.Models.Validation.Validator;

+using Timeline.Helpers;

+using static Timeline.Resources.Models.Validation.Validator;

 

-namespace TimelineApp.Models.Validation

+namespace Timeline.Models.Validation

 {

     /// <summary>

     /// A validator to validate value.

diff --git a/Timeline/Program.cs b/Timeline/Program.cs
index 70c67d87..c49f74b0 100644
--- a/Timeline/Program.cs
+++ b/Timeline/Program.cs
@@ -4,11 +4,11 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;

 using Microsoft.Extensions.Hosting;

 using System.Resources;

-using TimelineApp.Entities;

+using Timeline.Entities;

 

 [assembly: NeutralResourcesLanguage("en")]

 

-namespace TimelineApp

+namespace Timeline

 {

     public static class Program

     {

diff --git a/Timeline/Resources/Authentication/AuthHandler.Designer.cs b/Timeline/Resources/Authentication/AuthHandler.Designer.cs
index 6005e2cd..fd4540ea 100644
--- a/Timeline/Resources/Authentication/AuthHandler.Designer.cs
+++ b/Timeline/Resources/Authentication/AuthHandler.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>

 //------------------------------------------------------------------------------

 

-namespace TimelineApp.Resources.Authentication {

+namespace Timeline.Resources.Authentication {

     using System;

     

     

@@ -39,7 +39,7 @@ namespace TimelineApp.Resources.Authentication {
         internal static global::System.Resources.ResourceManager ResourceManager {

             get {

                 if (object.ReferenceEquals(resourceMan, null)) {

-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TimelineApp.Resources.Authentication.AuthHandler", typeof(AuthHandler).Assembly);

+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Authentication.AuthHandler", typeof(AuthHandler).Assembly);

                     resourceMan = temp;

                 }

                 return resourceMan;

diff --git a/Timeline/Resources/Controllers/ControllerAuthExtensions.Designer.cs b/Timeline/Resources/Controllers/ControllerAuthExtensions.Designer.cs
index 019699d9..70a1d605 100644
--- a/Timeline/Resources/Controllers/ControllerAuthExtensions.Designer.cs
+++ b/Timeline/Resources/Controllers/ControllerAuthExtensions.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>

 //------------------------------------------------------------------------------

 

-namespace TimelineApp.Resources.Controllers {

+namespace Timeline.Resources.Controllers {

     using System;

     

     

@@ -39,7 +39,7 @@ namespace TimelineApp.Resources.Controllers {
         internal static global::System.Resources.ResourceManager ResourceManager {

             get {

                 if (object.ReferenceEquals(resourceMan, null)) {

-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TimelineApp.Resources.Controllers.ControllerAuthExtensions", typeof(ControllerAuthExtensions).Assembly);

+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Controllers.ControllerAuthExtensions", typeof(ControllerAuthExtensions).Assembly);

                     resourceMan = temp;

                 }

                 return resourceMan;

diff --git a/Timeline/Resources/Controllers/TimelineController.Designer.cs b/Timeline/Resources/Controllers/TimelineController.Designer.cs
index 0560dd08..ae6414e6 100644
--- a/Timeline/Resources/Controllers/TimelineController.Designer.cs
+++ b/Timeline/Resources/Controllers/TimelineController.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>

 //------------------------------------------------------------------------------

 

-namespace TimelineApp.Resources.Controllers {

+namespace Timeline.Resources.Controllers {

     using System;

     

     

@@ -39,7 +39,7 @@ namespace TimelineApp.Resources.Controllers {
         internal static global::System.Resources.ResourceManager ResourceManager {

             get {

                 if (object.ReferenceEquals(resourceMan, null)) {

-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TimelineApp.Resources.Controllers.TimelineController", typeof(TimelineController).Assembly);

+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Controllers.TimelineController", typeof(TimelineController).Assembly);

                     resourceMan = temp;

                 }

                 return resourceMan;

diff --git a/Timeline/Resources/Controllers/TokenController.Designer.cs b/Timeline/Resources/Controllers/TokenController.Designer.cs
index a4ea9657..a7c2864b 100644
--- a/Timeline/Resources/Controllers/TokenController.Designer.cs
+++ b/Timeline/Resources/Controllers/TokenController.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>

 //------------------------------------------------------------------------------

 

-namespace TimelineApp.Resources.Controllers {

+namespace Timeline.Resources.Controllers {

     using System;

     

     

@@ -39,7 +39,7 @@ namespace TimelineApp.Resources.Controllers {
         internal static global::System.Resources.ResourceManager ResourceManager {

             get {

                 if (object.ReferenceEquals(resourceMan, null)) {

-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TimelineApp.Resources.Controllers.TokenController", typeof(TokenController).Assembly);

+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Controllers.TokenController", typeof(TokenController).Assembly);

                     resourceMan = temp;

                 }

                 return resourceMan;

diff --git a/Timeline/Resources/Controllers/UserAvatarController.Designer.cs b/Timeline/Resources/Controllers/UserAvatarController.Designer.cs
index 0165c4f0..e6eeb1e8 100644
--- a/Timeline/Resources/Controllers/UserAvatarController.Designer.cs
+++ b/Timeline/Resources/Controllers/UserAvatarController.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>

 //------------------------------------------------------------------------------

 

-namespace TimelineApp.Resources.Controllers {

+namespace Timeline.Resources.Controllers {

     using System;

     

     

@@ -39,7 +39,7 @@ namespace TimelineApp.Resources.Controllers {
         internal static global::System.Resources.ResourceManager ResourceManager {

             get {

                 if (object.ReferenceEquals(resourceMan, null)) {

-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TimelineApp.Resources.Controllers.UserAvatarController", typeof(UserAvatarController).Assembly);

+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Controllers.UserAvatarController", typeof(UserAvatarController).Assembly);

                     resourceMan = temp;

                 }

                 return resourceMan;

diff --git a/Timeline/Resources/Controllers/UserController.Designer.cs b/Timeline/Resources/Controllers/UserController.Designer.cs
index 277b85e0..c8067614 100644
--- a/Timeline/Resources/Controllers/UserController.Designer.cs
+++ b/Timeline/Resources/Controllers/UserController.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>

 //------------------------------------------------------------------------------

 

-namespace TimelineApp.Resources.Controllers {

+namespace Timeline.Resources.Controllers {

     using System;

     

     

@@ -39,7 +39,7 @@ namespace TimelineApp.Resources.Controllers {
         internal static global::System.Resources.ResourceManager ResourceManager {

             get {

                 if (object.ReferenceEquals(resourceMan, null)) {

-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TimelineApp.Resources.Controllers.UserController", typeof(UserController).Assembly);

+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Controllers.UserController", typeof(UserController).Assembly);

                     resourceMan = temp;

                 }

                 return resourceMan;

diff --git a/Timeline/Resources/Filters.Designer.cs b/Timeline/Resources/Filters.Designer.cs
index 3e29398d..dedfe498 100644
--- a/Timeline/Resources/Filters.Designer.cs
+++ b/Timeline/Resources/Filters.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>

 //------------------------------------------------------------------------------

 

-namespace TimelineApp.Resources {

+namespace Timeline.Resources {

     using System;

     

     

@@ -39,7 +39,7 @@ namespace TimelineApp.Resources {
         internal static global::System.Resources.ResourceManager ResourceManager {

             get {

                 if (object.ReferenceEquals(resourceMan, null)) {

-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TimelineApp.Resources.Filters", typeof(Filters).Assembly);

+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Filters", typeof(Filters).Assembly);

                     resourceMan = temp;

                 }

                 return resourceMan;

diff --git a/Timeline/Resources/Messages.Designer.cs b/Timeline/Resources/Messages.Designer.cs
index d85f5399..4123cb8b 100644
--- a/Timeline/Resources/Messages.Designer.cs
+++ b/Timeline/Resources/Messages.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>

 //------------------------------------------------------------------------------

 

-namespace TimelineApp.Resources {

+namespace Timeline.Resources {

     using System;

     

     

@@ -39,7 +39,7 @@ namespace TimelineApp.Resources {
         internal static global::System.Resources.ResourceManager ResourceManager {

             get {

                 if (object.ReferenceEquals(resourceMan, null)) {

-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TimelineApp.Resources.Messages", typeof(Messages).Assembly);

+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Messages", typeof(Messages).Assembly);

                     resourceMan = temp;

                 }

                 return resourceMan;

diff --git a/Timeline/Resources/Models/Http/Common.Designer.cs b/Timeline/Resources/Models/Http/Common.Designer.cs
index fbbdeeca..5165463e 100644
--- a/Timeline/Resources/Models/Http/Common.Designer.cs
+++ b/Timeline/Resources/Models/Http/Common.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>

 //------------------------------------------------------------------------------

 

-namespace TimelineApp.Resources.Models.Http {

+namespace Timeline.Resources.Models.Http {

     using System;

     

     

@@ -39,7 +39,7 @@ namespace TimelineApp.Resources.Models.Http {
         internal static global::System.Resources.ResourceManager ResourceManager {

             get {

                 if (object.ReferenceEquals(resourceMan, null)) {

-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TimelineApp.Resources.Models.Http.Common", typeof(Common).Assembly);

+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Models.Http.Common", typeof(Common).Assembly);

                     resourceMan = temp;

                 }

                 return resourceMan;

diff --git a/Timeline/Resources/Models/Validation/NameValidator.Designer.cs b/Timeline/Resources/Models/Validation/NameValidator.Designer.cs
index af8ceeb7..5b869226 100644
--- a/Timeline/Resources/Models/Validation/NameValidator.Designer.cs
+++ b/Timeline/Resources/Models/Validation/NameValidator.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>

 //------------------------------------------------------------------------------

 

-namespace TimelineApp.Resources.Models.Validation {

+namespace Timeline.Resources.Models.Validation {

     using System;

     

     

@@ -39,7 +39,7 @@ namespace TimelineApp.Resources.Models.Validation {
         internal static global::System.Resources.ResourceManager ResourceManager {

             get {

                 if (object.ReferenceEquals(resourceMan, null)) {

-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TimelineApp.Resources.Models.Validation.NameValidator", typeof(NameValidator).Assembly);

+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Models.Validation.NameValidator", typeof(NameValidator).Assembly);

                     resourceMan = temp;

                 }

                 return resourceMan;

diff --git a/Timeline/Resources/Models/Validation/NicknameValidator.Designer.cs b/Timeline/Resources/Models/Validation/NicknameValidator.Designer.cs
index 04d616b8..522f305a 100644
--- a/Timeline/Resources/Models/Validation/NicknameValidator.Designer.cs
+++ b/Timeline/Resources/Models/Validation/NicknameValidator.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>

 //------------------------------------------------------------------------------

 

-namespace TimelineApp.Resources.Models.Validation {

+namespace Timeline.Resources.Models.Validation {

     using System;

     

     

@@ -39,7 +39,7 @@ namespace TimelineApp.Resources.Models.Validation {
         internal static global::System.Resources.ResourceManager ResourceManager {

             get {

                 if (object.ReferenceEquals(resourceMan, null)) {

-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TimelineApp.Resources.Models.Validation.NicknameValidator", typeof(NicknameValidator).Assembly);

+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Models.Validation.NicknameValidator", typeof(NicknameValidator).Assembly);

                     resourceMan = temp;

                 }

                 return resourceMan;

diff --git a/Timeline/Resources/Models/Validation/Validator.Designer.cs b/Timeline/Resources/Models/Validation/Validator.Designer.cs
index 442c874b..74d4c169 100644
--- a/Timeline/Resources/Models/Validation/Validator.Designer.cs
+++ b/Timeline/Resources/Models/Validation/Validator.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>

 //------------------------------------------------------------------------------

 

-namespace TimelineApp.Resources.Models.Validation {

+namespace Timeline.Resources.Models.Validation {

     using System;

     

     

@@ -39,7 +39,7 @@ namespace TimelineApp.Resources.Models.Validation {
         internal static global::System.Resources.ResourceManager ResourceManager {

             get {

                 if (object.ReferenceEquals(resourceMan, null)) {

-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TimelineApp.Resources.Models.Validation.Validator", typeof(Validator).Assembly);

+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Models.Validation.Validator", typeof(Validator).Assembly);

                     resourceMan = temp;

                 }

                 return resourceMan;

diff --git a/Timeline/Resources/Services/DataManager.Designer.cs b/Timeline/Resources/Services/DataManager.Designer.cs
index e5d5539a..0872059a 100644
--- a/Timeline/Resources/Services/DataManager.Designer.cs
+++ b/Timeline/Resources/Services/DataManager.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>

 //------------------------------------------------------------------------------

 

-namespace TimelineApp.Resources.Services {

+namespace Timeline.Resources.Services {

     using System;

     

     

@@ -39,7 +39,7 @@ namespace TimelineApp.Resources.Services {
         internal static global::System.Resources.ResourceManager ResourceManager {

             get {

                 if (object.ReferenceEquals(resourceMan, null)) {

-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TimelineApp.Resources.Services.DataManager", typeof(DataManager).Assembly);

+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Services.DataManager", typeof(DataManager).Assembly);

                     resourceMan = temp;

                 }

                 return resourceMan;

diff --git a/Timeline/Resources/Services/Exception.Designer.cs b/Timeline/Resources/Services/Exception.Designer.cs
index 2fd350f9..0c721d92 100644
--- a/Timeline/Resources/Services/Exception.Designer.cs
+++ b/Timeline/Resources/Services/Exception.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>

 //------------------------------------------------------------------------------

 

-namespace TimelineApp.Resources.Services {

+namespace Timeline.Resources.Services {

     using System;

     

     

@@ -39,7 +39,7 @@ namespace TimelineApp.Resources.Services {
         internal static global::System.Resources.ResourceManager ResourceManager {

             get {

                 if (object.ReferenceEquals(resourceMan, null)) {

-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TimelineApp.Resources.Services.Exception", typeof(Exception).Assembly);

+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Services.Exception", typeof(Exception).Assembly);

                     resourceMan = temp;

                 }

                 return resourceMan;

diff --git a/Timeline/Resources/Services/TimelineService.Designer.cs b/Timeline/Resources/Services/TimelineService.Designer.cs
index 65f98577..4c3de1cd 100644
--- a/Timeline/Resources/Services/TimelineService.Designer.cs
+++ b/Timeline/Resources/Services/TimelineService.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>

 //------------------------------------------------------------------------------

 

-namespace TimelineApp.Resources.Services {

+namespace Timeline.Resources.Services {

     using System;

     

     

@@ -39,7 +39,7 @@ namespace TimelineApp.Resources.Services {
         internal static global::System.Resources.ResourceManager ResourceManager {

             get {

                 if (object.ReferenceEquals(resourceMan, null)) {

-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TimelineApp.Resources.Services.TimelineService", typeof(TimelineService).Assembly);

+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Services.TimelineService", typeof(TimelineService).Assembly);

                     resourceMan = temp;

                 }

                 return resourceMan;

diff --git a/Timeline/Resources/Services/UserAvatarService.Designer.cs b/Timeline/Resources/Services/UserAvatarService.Designer.cs
index 1bed55f3..c72d4215 100644
--- a/Timeline/Resources/Services/UserAvatarService.Designer.cs
+++ b/Timeline/Resources/Services/UserAvatarService.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>

 //------------------------------------------------------------------------------

 

-namespace TimelineApp.Resources.Services {

+namespace Timeline.Resources.Services {

     using System;

     

     

@@ -39,7 +39,7 @@ namespace TimelineApp.Resources.Services {
         internal static global::System.Resources.ResourceManager ResourceManager {

             get {

                 if (object.ReferenceEquals(resourceMan, null)) {

-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TimelineApp.Resources.Services.UserAvatarService", typeof(UserAvatarService).Assembly);

+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Services.UserAvatarService", typeof(UserAvatarService).Assembly);

                     resourceMan = temp;

                 }

                 return resourceMan;

diff --git a/Timeline/Resources/Services/UserService.Designer.cs b/Timeline/Resources/Services/UserService.Designer.cs
index 73cd7bcd..cdf7f390 100644
--- a/Timeline/Resources/Services/UserService.Designer.cs
+++ b/Timeline/Resources/Services/UserService.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>

 //------------------------------------------------------------------------------

 

-namespace TimelineApp.Resources.Services {

+namespace Timeline.Resources.Services {

     using System;

     

     

@@ -39,7 +39,7 @@ namespace TimelineApp.Resources.Services {
         internal static global::System.Resources.ResourceManager ResourceManager {

             get {

                 if (object.ReferenceEquals(resourceMan, null)) {

-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TimelineApp.Resources.Services.UserService", typeof(UserService).Assembly);

+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Services.UserService", typeof(UserService).Assembly);

                     resourceMan = temp;

                 }

                 return resourceMan;

diff --git a/Timeline/Resources/Services/UserTokenService.Designer.cs b/Timeline/Resources/Services/UserTokenService.Designer.cs
index 6cdca6a9..3c3c7e41 100644
--- a/Timeline/Resources/Services/UserTokenService.Designer.cs
+++ b/Timeline/Resources/Services/UserTokenService.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>

 //------------------------------------------------------------------------------

 

-namespace TimelineApp.Resources.Services {

+namespace Timeline.Resources.Services {

     using System;

     

     

@@ -39,7 +39,7 @@ namespace TimelineApp.Resources.Services {
         internal static global::System.Resources.ResourceManager ResourceManager {

             get {

                 if (object.ReferenceEquals(resourceMan, null)) {

-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TimelineApp.Resources.Services.UserTokenService", typeof(UserTokenService).Assembly);

+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Services.UserTokenService", typeof(UserTokenService).Assembly);

                     resourceMan = temp;

                 }

                 return resourceMan;

diff --git a/Timeline/Services/BadPasswordException.cs b/Timeline/Services/BadPasswordException.cs
index 93251055..f609371d 100644
--- a/Timeline/Services/BadPasswordException.cs
+++ b/Timeline/Services/BadPasswordException.cs
@@ -1,7 +1,7 @@
 using System;

-using TimelineApp.Helpers;

+using Timeline.Helpers;

 

-namespace TimelineApp.Services

+namespace Timeline.Services

 {

     [Serializable]

     public class BadPasswordException : Exception

diff --git a/Timeline/Services/Clock.cs b/Timeline/Services/Clock.cs
index 68441e92..0499c0c6 100644
--- a/Timeline/Services/Clock.cs
+++ b/Timeline/Services/Clock.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;

 using System.Threading.Tasks;

 

-namespace TimelineApp.Services

+namespace Timeline.Services

 {

     /// <summary>

     /// Convenient for unit test.

diff --git a/Timeline/Services/ConflictException.cs b/Timeline/Services/ConflictException.cs
index be9ec2c0..6ede183a 100644
--- a/Timeline/Services/ConflictException.cs
+++ b/Timeline/Services/ConflictException.cs
@@ -1,6 +1,6 @@
 using System;

 

-namespace TimelineApp.Services

+namespace Timeline.Services

 {

     /// <summary>

     /// Thrown when a resource already exists and conflicts with the given resource.

diff --git a/Timeline/Services/DataManager.cs b/Timeline/Services/DataManager.cs
index a4241c1b..d447b0d5 100644
--- a/Timeline/Services/DataManager.cs
+++ b/Timeline/Services/DataManager.cs
@@ -2,9 +2,9 @@
 using System;

 using System.Linq;

 using System.Threading.Tasks;

-using TimelineApp.Entities;

+using Timeline.Entities;

 

-namespace TimelineApp.Services

+namespace Timeline.Services

 {

     /// <summary>

     /// A data manager controlling data.

diff --git a/Timeline/Services/DatabaseCorruptedException.cs b/Timeline/Services/DatabaseCorruptedException.cs
index f5bd0c85..9988e0ad 100644
--- a/Timeline/Services/DatabaseCorruptedException.cs
+++ b/Timeline/Services/DatabaseCorruptedException.cs
@@ -1,6 +1,6 @@
 using System;

 

-namespace TimelineApp.Services

+namespace Timeline.Services

 {

     [Serializable]

     public class DatabaseCorruptedException : Exception

diff --git a/Timeline/Services/ETagGenerator.cs b/Timeline/Services/ETagGenerator.cs
index b7efd037..d328ea20 100644
--- a/Timeline/Services/ETagGenerator.cs
+++ b/Timeline/Services/ETagGenerator.cs
@@ -2,7 +2,7 @@
 using System.Security.Cryptography;

 using System.Threading.Tasks;

 

-namespace TimelineApp.Services

+namespace Timeline.Services

 {

     public interface IETagGenerator

     {

diff --git a/Timeline/Services/ImageException.cs b/Timeline/Services/ImageException.cs
index f3f3b010..c6126aa3 100644
--- a/Timeline/Services/ImageException.cs
+++ b/Timeline/Services/ImageException.cs
@@ -1,7 +1,7 @@
 using System;

 using System.Globalization;

 

-namespace TimelineApp.Services

+namespace Timeline.Services

 {

     [Serializable]

     public class ImageException : Exception

diff --git a/Timeline/Services/ImageValidator.cs b/Timeline/Services/ImageValidator.cs
index f10bb4d0..c331d912 100644
--- a/Timeline/Services/ImageValidator.cs
+++ b/Timeline/Services/ImageValidator.cs
@@ -4,7 +4,7 @@ using System;
 using System.Linq;

 using System.Threading.Tasks;

 

-namespace TimelineApp.Services

+namespace Timeline.Services

 {

     public interface IImageValidator

     {

diff --git a/Timeline/Services/JwtUserTokenBadFormatException.cs b/Timeline/Services/JwtUserTokenBadFormatException.cs
index 81450486..c528c3e3 100644
--- a/Timeline/Services/JwtUserTokenBadFormatException.cs
+++ b/Timeline/Services/JwtUserTokenBadFormatException.cs
@@ -1,8 +1,8 @@
 using System;

 using System.Globalization;

-using static TimelineApp.Resources.Services.Exception;

+using static Timeline.Resources.Services.Exception;

 

-namespace TimelineApp.Services

+namespace Timeline.Services

 {

     [Serializable]

     public class JwtUserTokenBadFormatException : UserTokenBadFormatException

diff --git a/Timeline/Services/PasswordBadFormatException.cs b/Timeline/Services/PasswordBadFormatException.cs
index 4db52092..2029ebb4 100644
--- a/Timeline/Services/PasswordBadFormatException.cs
+++ b/Timeline/Services/PasswordBadFormatException.cs
@@ -1,6 +1,6 @@
 using System;

 

-namespace TimelineApp.Services

+namespace Timeline.Services

 {

 

     [Serializable]

diff --git a/Timeline/Services/PasswordService.cs b/Timeline/Services/PasswordService.cs
index b08fe14d..e04a861b 100644
--- a/Timeline/Services/PasswordService.cs
+++ b/Timeline/Services/PasswordService.cs
@@ -3,7 +3,7 @@ using System;
 using System.Runtime.CompilerServices;

 using System.Security.Cryptography;

 

-namespace TimelineApp.Services

+namespace Timeline.Services

 {

     /// <summary>

     /// Hashed password is of bad format.

diff --git a/Timeline/Services/PathProvider.cs b/Timeline/Services/PathProvider.cs
index 79f309a1..15e66972 100644
--- a/Timeline/Services/PathProvider.cs
+++ b/Timeline/Services/PathProvider.cs
@@ -5,7 +5,7 @@ using System.IO;
 using System.Linq;

 using System.Threading.Tasks;

 

-namespace TimelineApp.Services

+namespace Timeline.Services

 {

     public interface IPathProvider

     {

diff --git a/Timeline/Services/TimelineNotExistException.cs b/Timeline/Services/TimelineNotExistException.cs
index b5bb0580..6dfd0bab 100644
--- a/Timeline/Services/TimelineNotExistException.cs
+++ b/Timeline/Services/TimelineNotExistException.cs
@@ -1,6 +1,6 @@
 using System;

 

-namespace TimelineApp.Services

+namespace Timeline.Services

 {

     [Serializable]

     public class TimelineNotExistException : Exception

diff --git a/Timeline/Services/TimelinePostNotExistException.cs b/Timeline/Services/TimelinePostNotExistException.cs
index 488bfe2b..c542e63e 100644
--- a/Timeline/Services/TimelinePostNotExistException.cs
+++ b/Timeline/Services/TimelinePostNotExistException.cs
@@ -1,6 +1,6 @@
 using System;

 

-namespace TimelineApp.Services

+namespace Timeline.Services

 {

     [Serializable]

     public class TimelinePostNotExistException : Exception

diff --git a/Timeline/Services/TimelineService.cs b/Timeline/Services/TimelineService.cs
index 8c1e62d4..1bccb855 100644
--- a/Timeline/Services/TimelineService.cs
+++ b/Timeline/Services/TimelineService.cs
@@ -6,12 +6,12 @@ using System.Collections.Generic;
 using System.Globalization;

 using System.Linq;

 using System.Threading.Tasks;

-using TimelineApp.Entities;

-using TimelineApp.Models;

-using TimelineApp.Models.Validation;

-using static TimelineApp.Resources.Services.TimelineService;

+using Timeline.Entities;

+using Timeline.Models;

+using Timeline.Models.Validation;

+using static Timeline.Resources.Services.TimelineService;

 

-namespace TimelineApp.Services

+namespace Timeline.Services

 {

     public enum TimelineUserRelationshipType

     {

@@ -67,7 +67,7 @@ namespace TimelineApp.Services
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="name"/> is null.</exception>

         /// <exception cref="ArgumentException">See remarks of <see cref="IBaseTimelineService"/>.</exception>

         /// <exception cref="TimelineNotExistException">See remarks of <see cref="IBaseTimelineService"/>.</exception>

-        Task<Timeline> GetTimeline(string name);

+        Task<Models.Timeline> GetTimeline(string name);

 

         /// <summary>

         /// Set the properties of a timeline. 

@@ -252,7 +252,7 @@ namespace TimelineApp.Services
         /// <remarks>

         /// If user with related user id does not exist, empty list will be returned.

         /// </remarks>

-        Task<List<Timeline>> GetTimelines(TimelineUserRelationship? relate = null, List<TimelineVisibility>? visibility = null);

+        Task<List<Models.Timeline>> GetTimelines(TimelineUserRelationship? relate = null, List<TimelineVisibility>? visibility = null);

 

         /// <summary>

         /// Create a timeline.

@@ -264,7 +264,7 @@ namespace TimelineApp.Services
         /// <exception cref="ArgumentException">Thrown when timeline name is invalid.</exception>

         /// <exception cref="ConflictException">Thrown when the timeline already exists.</exception>

         /// <exception cref="UserNotExistException">Thrown when the owner user does not exist.</exception>

-        Task<Timeline> CreateTimeline(string name, long owner);

+        Task<Models.Timeline> CreateTimeline(string name, long owner);

 

         /// <summary>

         /// Delete a timeline.

@@ -334,7 +334,7 @@ namespace TimelineApp.Services
         /// </remarks>

         protected abstract Task<long> FindTimelineId(string name);

 

-        public async Task<Timeline> GetTimeline(string name)

+        public async Task<Models.Timeline> GetTimeline(string name)

         {

             if (name == null)

                 throw new ArgumentNullException(nameof(name));

@@ -353,7 +353,7 @@ namespace TimelineApp.Services
                 members.Add(await UserService.GetUserById(memberEntity.UserId));

             }

 

-            return new Timeline

+            return new Models.Timeline

             {

                 Name = timelineEntity.Name ?? ("@" + owner.Username),

                 Description = timelineEntity.Description ?? "",

@@ -849,7 +849,7 @@ namespace TimelineApp.Services
             }

         }

 

-        public async Task<List<Timeline>> GetTimelines(TimelineUserRelationship? relate = null, List<TimelineVisibility>? visibility = null)

+        public async Task<List<Models.Timeline>> GetTimelines(TimelineUserRelationship? relate = null, List<TimelineVisibility>? visibility = null)

         {

             List<TimelineEntity> entities;

 

@@ -883,12 +883,12 @@ namespace TimelineApp.Services
                 }

             }

 

-            var result = new List<Timeline>();

+            var result = new List<Models.Timeline>();

 

             foreach (var entity in entities)

             {

                 var owner = await _userService.GetUserById(entity.OwnerId);

-                var timeline = new Timeline

+                var timeline = new Models.Timeline

                 {

                     Name = entity.Name ?? ("@" + owner.Username),

                     Description = entity.Description ?? "",

@@ -908,7 +908,7 @@ namespace TimelineApp.Services
             return result;

         }

 

-        public async Task<Timeline> CreateTimeline(string name, long owner)

+        public async Task<Models.Timeline> CreateTimeline(string name, long owner)

         {

             if (name == null)

                 throw new ArgumentNullException(nameof(name));

@@ -934,7 +934,7 @@ namespace TimelineApp.Services
             _database.Timelines.Add(newEntity);

             await _database.SaveChangesAsync();

 

-            return new Timeline

+            return new Models.Timeline

             {

                 Name = name,

                 Description = "",

@@ -978,7 +978,7 @@ namespace TimelineApp.Services
             }

         }

 

-        public Task<Timeline> GetTimeline(string name)

+        public Task<Models.Timeline> GetTimeline(string name)

         {

             var s = BranchName(name, out var realName);

             return s.GetTimeline(realName);

diff --git a/Timeline/Services/UserAvatarService.cs b/Timeline/Services/UserAvatarService.cs
index 5f2ce4ed..1b1be698 100644
--- a/Timeline/Services/UserAvatarService.cs
+++ b/Timeline/Services/UserAvatarService.cs
@@ -6,10 +6,10 @@ using System;
 using System.IO;

 using System.Linq;

 using System.Threading.Tasks;

-using TimelineApp.Entities;

-using TimelineApp.Helpers;

+using Timeline.Entities;

+using Timeline.Helpers;

 

-namespace TimelineApp.Services

+namespace Timeline.Services

 {

     public class Avatar

     {

diff --git a/Timeline/Services/UserNotExistException.cs b/Timeline/Services/UserNotExistException.cs
index b51378ed..fd0b5ecf 100644
--- a/Timeline/Services/UserNotExistException.cs
+++ b/Timeline/Services/UserNotExistException.cs
@@ -1,7 +1,7 @@
 using System;

-using TimelineApp.Helpers;

+using Timeline.Helpers;

 

-namespace TimelineApp.Services

+namespace Timeline.Services

 {

     /// <summary>

     /// The user requested does not exist.

diff --git a/Timeline/Services/UserRoleConvert.cs b/Timeline/Services/UserRoleConvert.cs
index 78c52ae3..f27ee1bb 100644
--- a/Timeline/Services/UserRoleConvert.cs
+++ b/Timeline/Services/UserRoleConvert.cs
@@ -1,9 +1,9 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using TimelineApp.Entities;

+using Timeline.Entities;

 

-namespace TimelineApp.Services

+namespace Timeline.Services

 {

     public static class UserRoleConvert

     {

diff --git a/Timeline/Services/UserService.cs b/Timeline/Services/UserService.cs
index 3279d2bd..e0a5ab50 100644
--- a/Timeline/Services/UserService.cs
+++ b/Timeline/Services/UserService.cs
@@ -4,13 +4,13 @@ using System;
 using System.Globalization;

 using System.Linq;

 using System.Threading.Tasks;

-using TimelineApp.Entities;

-using TimelineApp.Helpers;

-using TimelineApp.Models;

-using TimelineApp.Models.Validation;

-using static TimelineApp.Resources.Services.UserService;

+using Timeline.Entities;

+using Timeline.Helpers;

+using Timeline.Models;

+using Timeline.Models.Validation;

+using static Timeline.Resources.Services.UserService;

 

-namespace TimelineApp.Services

+namespace Timeline.Services

 {

     public interface IUserService

     {

diff --git a/Timeline/Services/UserTokenException.cs b/Timeline/Services/UserTokenException.cs
index 99d26dec..ed0bae1a 100644
--- a/Timeline/Services/UserTokenException.cs
+++ b/Timeline/Services/UserTokenException.cs
@@ -1,6 +1,6 @@
 using System;

 

-namespace TimelineApp.Services

+namespace Timeline.Services

 {

 

     [Serializable]

diff --git a/Timeline/Services/UserTokenManager.cs b/Timeline/Services/UserTokenManager.cs
index 4a044353..6decf8f9 100644
--- a/Timeline/Services/UserTokenManager.cs
+++ b/Timeline/Services/UserTokenManager.cs
@@ -1,9 +1,9 @@
 using Microsoft.Extensions.Logging;

 using System;

 using System.Threading.Tasks;

-using TimelineApp.Models;

+using Timeline.Models;

 

-namespace TimelineApp.Services

+namespace Timeline.Services

 {

     public class UserTokenCreateResult

     {

diff --git a/Timeline/Services/UserTokenService.cs b/Timeline/Services/UserTokenService.cs
index 76501ce3..86f3a0f7 100644
--- a/Timeline/Services/UserTokenService.cs
+++ b/Timeline/Services/UserTokenService.cs
@@ -5,10 +5,10 @@ using System.Globalization;
 using System.IdentityModel.Tokens.Jwt;

 using System.Linq;

 using System.Security.Claims;

-using TimelineApp.Configs;

-using TimelineApp.Entities;

+using Timeline.Configs;

+using Timeline.Entities;

 

-namespace TimelineApp.Services

+namespace Timeline.Services

 {

     public class UserTokenInfo

     {

diff --git a/Timeline/Startup.cs b/Timeline/Startup.cs
index d34bee25..85822a14 100644
--- a/Timeline/Startup.cs
+++ b/Timeline/Startup.cs
@@ -10,15 +10,15 @@ using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;

 using System;

 using System.Text.Json.Serialization;

-using TimelineApp.Auth;

-using TimelineApp.Configs;

-using TimelineApp.Entities;

-using TimelineApp.Formatters;

-using TimelineApp.Helpers;

-using TimelineApp.Models.Converters;

-using TimelineApp.Services;

-

-namespace TimelineApp

+using Timeline.Auth;

+using Timeline.Configs;

+using Timeline.Entities;

+using Timeline.Formatters;

+using Timeline.Helpers;

+using Timeline.Models.Converters;

+using Timeline.Services;

+

+namespace Timeline

 {

     [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1822:Mark members as static")]

     public class Startup

diff --git a/Timeline/TimelineApp.csproj b/Timeline/Timeline.csproj
index 6fb88ae9..c9da9a2e 100644
--- a/Timeline/TimelineApp.csproj
+++ b/Timeline/Timeline.csproj
@@ -7,10 +7,6 @@
         <LangVersion>8.0</LangVersion>

         <Nullable>enable</Nullable>

     </PropertyGroup>

-    <ItemGroup>

-      <Compile Remove="Migrations\20200306101428_AddDataTable.cs" />

-      <Compile Remove="Migrations\20200306101428_AddDataTable.Designer.cs" />

-    </ItemGroup>

 

     <ItemGroup>

         <Content Include="default-avatar.png">

@@ -37,7 +33,7 @@
     </ItemGroup>

 

     <ItemGroup>

-      <ProjectReference Include="..\Timeline.ErrorCodes\TimelineApp.ErrorCodes.csproj" />

+      <ProjectReference Include="..\Timeline.ErrorCodes\Timeline.ErrorCodes.csproj" />

     </ItemGroup>

 

     <ItemGroup>