diff --git a/Chatbot.Application/Chatbot.Api.Application.csproj b/Chatbot.Api.Application/Chatbot.Api.Application.csproj
similarity index 91%
rename from Chatbot.Application/Chatbot.Api.Application.csproj
rename to Chatbot.Api.Application/Chatbot.Api.Application.csproj
index edf00d3..f09fd55 100644
--- a/Chatbot.Application/Chatbot.Api.Application.csproj
+++ b/Chatbot.Api.Application/Chatbot.Api.Application.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/Chatbot.Application/CommandHandlers/CloseChatHandler.cs b/Chatbot.Api.Application/CommandHandlers/CloseChatHandler.cs
similarity index 100%
rename from Chatbot.Application/CommandHandlers/CloseChatHandler.cs
rename to Chatbot.Api.Application/CommandHandlers/CloseChatHandler.cs
diff --git a/Chatbot.Application/CommandHandlers/SaveChatMessageHandler.cs b/Chatbot.Api.Application/CommandHandlers/SaveChatMessageHandler.cs
similarity index 100%
rename from Chatbot.Application/CommandHandlers/SaveChatMessageHandler.cs
rename to Chatbot.Api.Application/CommandHandlers/SaveChatMessageHandler.cs
diff --git a/Chatbot.Application/Commands/CloseChat.cs b/Chatbot.Api.Application/Commands/CloseChat.cs
similarity index 100%
rename from Chatbot.Application/Commands/CloseChat.cs
rename to Chatbot.Api.Application/Commands/CloseChat.cs
diff --git a/Chatbot.Application/Commands/Command.cs b/Chatbot.Api.Application/Commands/Command.cs
similarity index 100%
rename from Chatbot.Application/Commands/Command.cs
rename to Chatbot.Api.Application/Commands/Command.cs
diff --git a/Chatbot.Application/Commands/Metadata.cs b/Chatbot.Api.Application/Commands/Metadata.cs
similarity index 100%
rename from Chatbot.Application/Commands/Metadata.cs
rename to Chatbot.Api.Application/Commands/Metadata.cs
diff --git a/Chatbot.Application/Commands/SaveChatMessage.cs b/Chatbot.Api.Application/Commands/SaveChatMessage.cs
similarity index 100%
rename from Chatbot.Application/Commands/SaveChatMessage.cs
rename to Chatbot.Api.Application/Commands/SaveChatMessage.cs
diff --git a/Chatbot.Application/DependencyInjectionExtensions.cs b/Chatbot.Api.Application/DependencyInjectionExtensions.cs
similarity index 100%
rename from Chatbot.Application/DependencyInjectionExtensions.cs
rename to Chatbot.Api.Application/DependencyInjectionExtensions.cs
diff --git a/Chatbot.Application/Events/ChatClosed.cs b/Chatbot.Api.Application/Events/ChatClosed.cs
similarity index 100%
rename from Chatbot.Application/Events/ChatClosed.cs
rename to Chatbot.Api.Application/Events/ChatClosed.cs
diff --git a/Chatbot.Application/Events/ChatMessageSaved.cs b/Chatbot.Api.Application/Events/ChatMessageSaved.cs
similarity index 100%
rename from Chatbot.Application/Events/ChatMessageSaved.cs
rename to Chatbot.Api.Application/Events/ChatMessageSaved.cs
diff --git a/Chatbot.Application/Mappings/MappingProfile.cs b/Chatbot.Api.Application/Mappings/MappingProfile.cs
similarity index 100%
rename from Chatbot.Application/Mappings/MappingProfile.cs
rename to Chatbot.Api.Application/Mappings/MappingProfile.cs
diff --git a/Chatbot.Application/Queries/GetBots.cs b/Chatbot.Api.Application/Queries/GetBots.cs
similarity index 100%
rename from Chatbot.Application/Queries/GetBots.cs
rename to Chatbot.Api.Application/Queries/GetBots.cs
diff --git a/Chatbot.Application/Queries/GetChat.cs b/Chatbot.Api.Application/Queries/GetChat.cs
similarity index 100%
rename from Chatbot.Application/Queries/GetChat.cs
rename to Chatbot.Api.Application/Queries/GetChat.cs
diff --git a/Chatbot.Application/Queries/GetSession.cs b/Chatbot.Api.Application/Queries/GetSession.cs
similarity index 100%
rename from Chatbot.Application/Queries/GetSession.cs
rename to Chatbot.Api.Application/Queries/GetSession.cs
diff --git a/Chatbot.Application/Queries/Query.cs b/Chatbot.Api.Application/Queries/Query.cs
similarity index 100%
rename from Chatbot.Application/Queries/Query.cs
rename to Chatbot.Api.Application/Queries/Query.cs
diff --git a/Chatbot.Application/Services/ParamProvider.cs b/Chatbot.Api.Application/Services/ParamProvider.cs
similarity index 100%
rename from Chatbot.Application/Services/ParamProvider.cs
rename to Chatbot.Api.Application/Services/ParamProvider.cs
diff --git a/Chatbot.Application/Services/UserService.cs b/Chatbot.Api.Application/Services/UserService.cs
similarity index 100%
rename from Chatbot.Application/Services/UserService.cs
rename to Chatbot.Api.Application/Services/UserService.cs
diff --git a/Chatbot.Domain.Data/Chatbot.Api.Domain.Data.csproj b/Chatbot.Api.Domain.Data/Chatbot.Api.Domain.Data.csproj
similarity index 79%
rename from Chatbot.Domain.Data/Chatbot.Api.Domain.Data.csproj
rename to Chatbot.Api.Domain.Data/Chatbot.Api.Domain.Data.csproj
index 4c4501c..ec6e150 100644
--- a/Chatbot.Domain.Data/Chatbot.Api.Domain.Data.csproj
+++ b/Chatbot.Api.Domain.Data/Chatbot.Api.Domain.Data.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/Chatbot.Domain.Data/DbContexts/BotDbContext.cs b/Chatbot.Api.Domain.Data/DbContexts/BotDbContext.cs
similarity index 100%
rename from Chatbot.Domain.Data/DbContexts/BotDbContext.cs
rename to Chatbot.Api.Domain.Data/DbContexts/BotDbContext.cs
diff --git a/Chatbot.Domain.Data/DbContexts/ChatDbContext.cs b/Chatbot.Api.Domain.Data/DbContexts/ChatDbContext.cs
similarity index 100%
rename from Chatbot.Domain.Data/DbContexts/ChatDbContext.cs
rename to Chatbot.Api.Domain.Data/DbContexts/ChatDbContext.cs
diff --git a/Chatbot.Domain.Data/DbContexts/SessionDbContext.cs b/Chatbot.Api.Domain.Data/DbContexts/SessionDbContext.cs
similarity index 100%
rename from Chatbot.Domain.Data/DbContexts/SessionDbContext.cs
rename to Chatbot.Api.Domain.Data/DbContexts/SessionDbContext.cs
diff --git a/Chatbot.Domain.Data/DependencyInjectionExtensions.cs b/Chatbot.Api.Domain.Data/DependencyInjectionExtensions.cs
similarity index 100%
rename from Chatbot.Domain.Data/DependencyInjectionExtensions.cs
rename to Chatbot.Api.Domain.Data/DependencyInjectionExtensions.cs
diff --git a/Chatbot.Domain.Data/EntityTypeConfiguration/BotConfiguration.cs b/Chatbot.Api.Domain.Data/EntityTypeConfiguration/BotConfiguration.cs
similarity index 100%
rename from Chatbot.Domain.Data/EntityTypeConfiguration/BotConfiguration.cs
rename to Chatbot.Api.Domain.Data/EntityTypeConfiguration/BotConfiguration.cs
diff --git a/Chatbot.Domain.Data/EntityTypeConfiguration/BotSessionConfiguration.cs b/Chatbot.Api.Domain.Data/EntityTypeConfiguration/BotSessionConfiguration.cs
similarity index 100%
rename from Chatbot.Domain.Data/EntityTypeConfiguration/BotSessionConfiguration.cs
rename to Chatbot.Api.Domain.Data/EntityTypeConfiguration/BotSessionConfiguration.cs
diff --git a/Chatbot.Domain.Data/EntityTypeConfiguration/ChatConfiguration.cs b/Chatbot.Api.Domain.Data/EntityTypeConfiguration/ChatConfiguration.cs
similarity index 100%
rename from Chatbot.Domain.Data/EntityTypeConfiguration/ChatConfiguration.cs
rename to Chatbot.Api.Domain.Data/EntityTypeConfiguration/ChatConfiguration.cs
diff --git a/Chatbot.Domain.Data/EntityTypeConfiguration/ChatMessageConfiguration.cs b/Chatbot.Api.Domain.Data/EntityTypeConfiguration/ChatMessageConfiguration.cs
similarity index 100%
rename from Chatbot.Domain.Data/EntityTypeConfiguration/ChatMessageConfiguration.cs
rename to Chatbot.Api.Domain.Data/EntityTypeConfiguration/ChatMessageConfiguration.cs
diff --git a/Chatbot.Domain.Data/Repositories/BotRepository.cs b/Chatbot.Api.Domain.Data/Repositories/BotRepository.cs
similarity index 100%
rename from Chatbot.Domain.Data/Repositories/BotRepository.cs
rename to Chatbot.Api.Domain.Data/Repositories/BotRepository.cs
diff --git a/Chatbot.Domain.Data/Repositories/ChatRepository.cs b/Chatbot.Api.Domain.Data/Repositories/ChatRepository.cs
similarity index 100%
rename from Chatbot.Domain.Data/Repositories/ChatRepository.cs
rename to Chatbot.Api.Domain.Data/Repositories/ChatRepository.cs
diff --git a/Chatbot.Domain.Data/Repositories/SessionRepository.cs b/Chatbot.Api.Domain.Data/Repositories/SessionRepository.cs
similarity index 100%
rename from Chatbot.Domain.Data/Repositories/SessionRepository.cs
rename to Chatbot.Api.Domain.Data/Repositories/SessionRepository.cs
diff --git a/Chatbot.Domain.Data/Scripts/01.Chatbot tables.sql b/Chatbot.Api.Domain.Data/Scripts/01.Chatbot tables.sql
similarity index 100%
rename from Chatbot.Domain.Data/Scripts/01.Chatbot tables.sql
rename to Chatbot.Api.Domain.Data/Scripts/01.Chatbot tables.sql
diff --git a/Chatbot.Domain.Data/Scripts/02.Insert into MessageSource.sql b/Chatbot.Api.Domain.Data/Scripts/02.Insert into MessageSource.sql
similarity index 100%
rename from Chatbot.Domain.Data/Scripts/02.Insert into MessageSource.sql
rename to Chatbot.Api.Domain.Data/Scripts/02.Insert into MessageSource.sql
diff --git a/Chatbot.Domain.Data/Scripts/03.BotSession ExternalId update.sql b/Chatbot.Api.Domain.Data/Scripts/03.BotSession ExternalId update.sql
similarity index 100%
rename from Chatbot.Domain.Data/Scripts/03.BotSession ExternalId update.sql
rename to Chatbot.Api.Domain.Data/Scripts/03.BotSession ExternalId update.sql
diff --git a/Chatbot.Domain/Chatbot.Api.Domain.csproj b/Chatbot.Api.Domain/Chatbot.Api.Domain.csproj
similarity index 100%
rename from Chatbot.Domain/Chatbot.Api.Domain.csproj
rename to Chatbot.Api.Domain/Chatbot.Api.Domain.csproj
diff --git a/Chatbot.Domain/Entities/Bot.cs b/Chatbot.Api.Domain/Entities/Bot.cs
similarity index 100%
rename from Chatbot.Domain/Entities/Bot.cs
rename to Chatbot.Api.Domain/Entities/Bot.cs
diff --git a/Chatbot.Domain/Entities/BotSession.cs b/Chatbot.Api.Domain/Entities/BotSession.cs
similarity index 100%
rename from Chatbot.Domain/Entities/BotSession.cs
rename to Chatbot.Api.Domain/Entities/BotSession.cs
diff --git a/Chatbot.Domain/Entities/Chat.cs b/Chatbot.Api.Domain/Entities/Chat.cs
similarity index 100%
rename from Chatbot.Domain/Entities/Chat.cs
rename to Chatbot.Api.Domain/Entities/Chat.cs
diff --git a/Chatbot.Domain/Entities/ChatMessage.cs b/Chatbot.Api.Domain/Entities/ChatMessage.cs
similarity index 100%
rename from Chatbot.Domain/Entities/ChatMessage.cs
rename to Chatbot.Api.Domain/Entities/ChatMessage.cs
diff --git a/Chatbot.Domain/Entities/User.cs b/Chatbot.Api.Domain/Entities/User.cs
similarity index 100%
rename from Chatbot.Domain/Entities/User.cs
rename to Chatbot.Api.Domain/Entities/User.cs
diff --git a/Chatbot.Domain/Models/Settings/Credentials.cs b/Chatbot.Api.Domain/Models/Settings/Credentials.cs
similarity index 100%
rename from Chatbot.Domain/Models/Settings/Credentials.cs
rename to Chatbot.Api.Domain/Models/Settings/Credentials.cs
diff --git a/Chatbot.Domain/Repositories/IBotRepository.cs b/Chatbot.Api.Domain/Repositories/IBotRepository.cs
similarity index 100%
rename from Chatbot.Domain/Repositories/IBotRepository.cs
rename to Chatbot.Api.Domain/Repositories/IBotRepository.cs
diff --git a/Chatbot.Domain/Repositories/IChatRepository.cs b/Chatbot.Api.Domain/Repositories/IChatRepository.cs
similarity index 100%
rename from Chatbot.Domain/Repositories/IChatRepository.cs
rename to Chatbot.Api.Domain/Repositories/IChatRepository.cs
diff --git a/Chatbot.Domain/Repositories/ISessionRepository.cs b/Chatbot.Api.Domain/Repositories/ISessionRepository.cs
similarity index 100%
rename from Chatbot.Domain/Repositories/ISessionRepository.cs
rename to Chatbot.Api.Domain/Repositories/ISessionRepository.cs
diff --git a/Chatbot.Domain/Services/IParamProvider.cs b/Chatbot.Api.Domain/Services/IParamProvider.cs
similarity index 100%
rename from Chatbot.Domain/Services/IParamProvider.cs
rename to Chatbot.Api.Domain/Services/IParamProvider.cs
diff --git a/Chatbot.Api/Chatbot.Api.csproj b/Chatbot.Api/Chatbot.Api.csproj
index 2a9c58c..e4359f3 100644
--- a/Chatbot.Api/Chatbot.Api.csproj
+++ b/Chatbot.Api/Chatbot.Api.csproj
@@ -21,8 +21,8 @@
-
-
+
+
diff --git a/Chatbot.sln b/Chatbot.sln
index 5a74588..f5eb932 100644
--- a/Chatbot.sln
+++ b/Chatbot.sln
@@ -14,11 +14,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
Notes.txt = Notes.txt
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chatbot.Api.Application", "Chatbot.Application\Chatbot.Api.Application.csproj", "{3759725E-8E75-44F4-86A3-34CC1EAC1D6C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chatbot.Api.Application", "Chatbot.Api.Application\Chatbot.Api.Application.csproj", "{3759725E-8E75-44F4-86A3-34CC1EAC1D6C}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chatbot.Api.Domain", "Chatbot.Domain\Chatbot.Api.Domain.csproj", "{1FDA8402-A777-48AF-91A3-34B7D033A8A5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chatbot.Api.Domain", "Chatbot.Api.Domain\Chatbot.Api.Domain.csproj", "{1FDA8402-A777-48AF-91A3-34B7D033A8A5}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chatbot.Api.Domain.Data", "Chatbot.Domain.Data\Chatbot.Api.Domain.Data.csproj", "{999F5359-3CD8-4A0C-86B8-E3DC5421AA0C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chatbot.Api.Domain.Data", "Chatbot.Api.Domain.Data\Chatbot.Api.Domain.Data.csproj", "{999F5359-3CD8-4A0C-86B8-E3DC5421AA0C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Api", "Api", "{3AC727D4-4E65-4D98-A532-04C489540A74}"
EndProject