diff --git a/Kruzya.TelegramBot.sln b/Kruzya.TelegramBot.sln
index f7c396b..047c393 100644
--- a/Kruzya.TelegramBot.sln
+++ b/Kruzya.TelegramBot.sln
@@ -35,7 +35,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeWatcher", "modules\Code
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StickerTools", "modules\StickerTools\StickerTools.csproj", "{1D4FE1FA-F7FB-4F9E-95A3-EE761F29B159}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomChatAddOns", "CustomChatAddOns\CustomChatAddOns.csproj", "{5632DD5E-620D-4324-99FA-7B189932FCAC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomChatAddOns", "modules\CustomChatAddOns\CustomChatAddOns.csproj", "{5632DD5E-620D-4324-99FA-7B189932FCAC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/CustomChatAddOns/CustomChatAddOns.cs b/modules/CustomChatAddOns/CustomChatAddOns.cs
similarity index 100%
rename from CustomChatAddOns/CustomChatAddOns.cs
rename to modules/CustomChatAddOns/CustomChatAddOns.cs
diff --git a/CustomChatAddOns/CustomChatAddOns.csproj b/modules/CustomChatAddOns/CustomChatAddOns.csproj
similarity index 86%
rename from CustomChatAddOns/CustomChatAddOns.csproj
rename to modules/CustomChatAddOns/CustomChatAddOns.csproj
index 6f0d215..78ffe5f 100644
--- a/CustomChatAddOns/CustomChatAddOns.csproj
+++ b/modules/CustomChatAddOns/CustomChatAddOns.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Core\Core.csproj" />
+    <ProjectReference Include="..\..\Core\Core.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/CustomChatAddOns/Data/InputFile/ICustomInputFile.cs b/modules/CustomChatAddOns/Data/InputFile/ICustomInputFile.cs
similarity index 100%
rename from CustomChatAddOns/Data/InputFile/ICustomInputFile.cs
rename to modules/CustomChatAddOns/Data/InputFile/ICustomInputFile.cs
diff --git a/CustomChatAddOns/Data/InputFile/InputIdFile.cs b/modules/CustomChatAddOns/Data/InputFile/InputIdFile.cs
similarity index 100%
rename from CustomChatAddOns/Data/InputFile/InputIdFile.cs
rename to modules/CustomChatAddOns/Data/InputFile/InputIdFile.cs
diff --git a/CustomChatAddOns/Data/InputFile/InputUrlFile.cs b/modules/CustomChatAddOns/Data/InputFile/InputUrlFile.cs
similarity index 100%
rename from CustomChatAddOns/Data/InputFile/InputUrlFile.cs
rename to modules/CustomChatAddOns/Data/InputFile/InputUrlFile.cs
diff --git a/CustomChatAddOns/Data/NewMessage.cs b/modules/CustomChatAddOns/Data/NewMessage.cs
similarity index 100%
rename from CustomChatAddOns/Data/NewMessage.cs
rename to modules/CustomChatAddOns/Data/NewMessage.cs
diff --git a/CustomChatAddOns/Data/Ping.cs b/modules/CustomChatAddOns/Data/Ping.cs
similarity index 100%
rename from CustomChatAddOns/Data/Ping.cs
rename to modules/CustomChatAddOns/Data/Ping.cs
diff --git a/CustomChatAddOns/Data/Pong.cs b/modules/CustomChatAddOns/Data/Pong.cs
similarity index 100%
rename from CustomChatAddOns/Data/Pong.cs
rename to modules/CustomChatAddOns/Data/Pong.cs
diff --git a/CustomChatAddOns/Data/WebhookCommand/BaseReplyMessage.cs b/modules/CustomChatAddOns/Data/WebhookCommand/BaseReplyMessage.cs
similarity index 100%
rename from CustomChatAddOns/Data/WebhookCommand/BaseReplyMessage.cs
rename to modules/CustomChatAddOns/Data/WebhookCommand/BaseReplyMessage.cs
diff --git a/CustomChatAddOns/Data/WebhookCommand/IWebhookCommand.cs b/modules/CustomChatAddOns/Data/WebhookCommand/IWebhookCommand.cs
similarity index 100%
rename from CustomChatAddOns/Data/WebhookCommand/IWebhookCommand.cs
rename to modules/CustomChatAddOns/Data/WebhookCommand/IWebhookCommand.cs
diff --git a/CustomChatAddOns/Data/WebhookCommand/PhotoReplyMessage.cs b/modules/CustomChatAddOns/Data/WebhookCommand/PhotoReplyMessage.cs
similarity index 100%
rename from CustomChatAddOns/Data/WebhookCommand/PhotoReplyMessage.cs
rename to modules/CustomChatAddOns/Data/WebhookCommand/PhotoReplyMessage.cs
diff --git a/CustomChatAddOns/Data/WebhookCommand/TextReplyMessage.cs b/modules/CustomChatAddOns/Data/WebhookCommand/TextReplyMessage.cs
similarity index 100%
rename from CustomChatAddOns/Data/WebhookCommand/TextReplyMessage.cs
rename to modules/CustomChatAddOns/Data/WebhookCommand/TextReplyMessage.cs
diff --git a/CustomChatAddOns/Handler/Config.cs b/modules/CustomChatAddOns/Handler/Config.cs
similarity index 100%
rename from CustomChatAddOns/Handler/Config.cs
rename to modules/CustomChatAddOns/Handler/Config.cs
diff --git a/CustomChatAddOns/Handler/MessageHandler.cs b/modules/CustomChatAddOns/Handler/MessageHandler.cs
similarity index 100%
rename from CustomChatAddOns/Handler/MessageHandler.cs
rename to modules/CustomChatAddOns/Handler/MessageHandler.cs
diff --git a/CustomChatAddOns/Options/CustomChatHandler.cs b/modules/CustomChatAddOns/Options/CustomChatHandler.cs
similarity index 100%
rename from CustomChatAddOns/Options/CustomChatHandler.cs
rename to modules/CustomChatAddOns/Options/CustomChatHandler.cs
diff --git a/CustomChatAddOns/Service/InteropService.cs b/modules/CustomChatAddOns/Service/InteropService.cs
similarity index 100%
rename from CustomChatAddOns/Service/InteropService.cs
rename to modules/CustomChatAddOns/Service/InteropService.cs