diff --git a/modules/ContentStore/Service/BirdService.cs b/modules/ContentStore/Service/BirdService.cs
deleted file mode 100644
index 7b25a01..0000000
--- a/modules/ContentStore/Service/BirdService.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace West.TelegramBot.ContentStore.Service;
-
-public class BirdService : SomeRandomApiAbstractService
-{
-    public BirdService(): base("bird", "Птица", 40, 165)
-    {}
-}
diff --git a/modules/ContentStore/Service/FoxService.cs b/modules/ContentStore/Service/FoxService.cs
deleted file mode 100644
index 4ca1176..0000000
--- a/modules/ContentStore/Service/FoxService.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace West.TelegramBot.ContentStore.Service;
-
-public class FoxService : SomeRandomApiAbstractService
-{
-    public FoxService(): base("fox", "Лисица", 40, 170)
-    {}
-}
diff --git a/modules/ContentStore/Service/KangarooService.cs b/modules/ContentStore/Service/KangarooService.cs
deleted file mode 100644
index e4a1caa..0000000
--- a/modules/ContentStore/Service/KangarooService.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace West.TelegramBot.ContentStore.Service;
-
-public class KangarooService : SomeRandomApiAbstractService
-{
-    public KangarooService(): base("kangaroo", "Кенгуру", 40, 175)
-    {}
-}
diff --git a/modules/ContentStore/Service/AbstractKittiesService.cs b/modules/ContentStore/Service/Kitties/AbstractKittiesService.cs
similarity index 96%
rename from modules/ContentStore/Service/AbstractKittiesService.cs
rename to modules/ContentStore/Service/Kitties/AbstractKittiesService.cs
index 133f252..dfbb454 100644
--- a/modules/ContentStore/Service/AbstractKittiesService.cs
+++ b/modules/ContentStore/Service/Kitties/AbstractKittiesService.cs
@@ -6,7 +6,7 @@ using Telegram.Bot.Types;
 using West.TelegramBot.ContentStore.Model;
 using West.TelegramBot.ContentStore.Option;
 
-namespace West.TelegramBot.ContentStore.Service;
+namespace West.TelegramBot.ContentStore.Service.Kitties;
 
 public abstract class AbstractKittiesService : IRandomMediaService
 {
@@ -15,7 +15,7 @@ public abstract class AbstractKittiesService : IRandomMediaService
 
     public abstract StoreItem StoreItem { get; }
     private readonly HttpClient _httpClient;
-    
+
     protected AbstractKittiesService(IConfiguration configuration, AllowNsfw allowNsfw)
     {
         var section = configuration.GetSection("KittiesService");
diff --git a/modules/ContentStore/Service/GayKittiesService.cs b/modules/ContentStore/Service/Kitties/GayKittiesService.cs
similarity index 82%
rename from modules/ContentStore/Service/GayKittiesService.cs
rename to modules/ContentStore/Service/Kitties/GayKittiesService.cs
index e01a701..460f5b2 100644
--- a/modules/ContentStore/Service/GayKittiesService.cs
+++ b/modules/ContentStore/Service/Kitties/GayKittiesService.cs
@@ -3,7 +3,7 @@ using Microsoft.Extensions.Configuration;
 using West.TelegramBot.ContentStore.Model;
 using West.TelegramBot.ContentStore.Option;
 
-namespace West.TelegramBot.ContentStore.Service;
+namespace West.TelegramBot.ContentStore.Service.Kitties;
 
 public class GayKittiesService : AbstractKittiesService
 {
@@ -12,4 +12,5 @@ public class GayKittiesService : AbstractKittiesService
     }
 
     protected override string VideoType => "gay";
-    public override StoreItem StoreItem { get; } = new("kitties_gay", "Прон (не геи)", 40, 110);}
\ No newline at end of file
+    public override StoreItem StoreItem { get; } = new("kitties_gay", "Прон (не геи)", 40, 110);
+}
\ No newline at end of file
diff --git a/modules/ContentStore/Service/StraightKittiesService.cs b/modules/ContentStore/Service/Kitties/StraightKittiesService.cs
similarity index 77%
rename from modules/ContentStore/Service/StraightKittiesService.cs
rename to modules/ContentStore/Service/Kitties/StraightKittiesService.cs
index e346906..df88eff 100644
--- a/modules/ContentStore/Service/StraightKittiesService.cs
+++ b/modules/ContentStore/Service/Kitties/StraightKittiesService.cs
@@ -1,9 +1,8 @@
-using Kruzya.TelegramBot.Core.Data;
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
 using West.TelegramBot.ContentStore.Model;
 using West.TelegramBot.ContentStore.Option;
 
-namespace West.TelegramBot.ContentStore.Service;
+namespace West.TelegramBot.ContentStore.Service.Kitties;
 
 public class StraightKittiesService : AbstractKittiesService
 {
diff --git a/modules/ContentStore/Service/PandaService.cs b/modules/ContentStore/Service/PandaService.cs
deleted file mode 100644
index 0198978..0000000
--- a/modules/ContentStore/Service/PandaService.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace West.TelegramBot.ContentStore.Service;
-
-public class PandaService : SomeRandomApiAbstractService
-{
-    public PandaService(): base("panda", "Панда", 40, 160)
-    {}
-}
diff --git a/modules/ContentStore/Service/RaccoonService.cs b/modules/ContentStore/Service/RaccoonService.cs
deleted file mode 100644
index c1c9280..0000000
--- a/modules/ContentStore/Service/RaccoonService.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace West.TelegramBot.ContentStore.Service;
-
-public class RaccoonService : SomeRandomApiAbstractService
-{
-    public RaccoonService(): base("raccoon", "Енот", 40, 160)
-    {}
-}
diff --git a/modules/ContentStore/Service/RedPandaService.cs b/modules/ContentStore/Service/RedPandaService.cs
deleted file mode 100644
index fdcbd66..0000000
--- a/modules/ContentStore/Service/RedPandaService.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace West.TelegramBot.ContentStore.Service;
-
-public class RedPandaService : SomeRandomApiAbstractService
-{
-    public RedPandaService(): base("red_panda", "Красная панда", 40, 150)
-    {}
-}
diff --git a/modules/ContentStore/Service/SomeRandomApi/BirdService.cs b/modules/ContentStore/Service/SomeRandomApi/BirdService.cs
new file mode 100644
index 0000000..eeb7d89
--- /dev/null
+++ b/modules/ContentStore/Service/SomeRandomApi/BirdService.cs
@@ -0,0 +1,7 @@
+namespace West.TelegramBot.ContentStore.Service.SomeRandomApi;
+
+public class BirdService : SomeRandomApiAbstractService
+{
+    public BirdService() : base("bird", "Птица", 40, 165)
+    { }
+}
diff --git a/modules/ContentStore/Service/SomeRandomApi/FoxService.cs b/modules/ContentStore/Service/SomeRandomApi/FoxService.cs
new file mode 100644
index 0000000..49b055e
--- /dev/null
+++ b/modules/ContentStore/Service/SomeRandomApi/FoxService.cs
@@ -0,0 +1,7 @@
+namespace West.TelegramBot.ContentStore.Service.SomeRandomApi;
+
+public class FoxService : SomeRandomApiAbstractService
+{
+    public FoxService() : base("fox", "Лисица", 40, 170)
+    { }
+}
diff --git a/modules/ContentStore/Service/SomeRandomApi/KangarooService.cs b/modules/ContentStore/Service/SomeRandomApi/KangarooService.cs
new file mode 100644
index 0000000..ccbf5c0
--- /dev/null
+++ b/modules/ContentStore/Service/SomeRandomApi/KangarooService.cs
@@ -0,0 +1,7 @@
+namespace West.TelegramBot.ContentStore.Service.SomeRandomApi;
+
+public class KangarooService : SomeRandomApiAbstractService
+{
+    public KangarooService() : base("kangaroo", "Кенгуру", 40, 175)
+    { }
+}
diff --git a/modules/ContentStore/Service/KoalaService.cs b/modules/ContentStore/Service/SomeRandomApi/KoalaService.cs
similarity index 64%
rename from modules/ContentStore/Service/KoalaService.cs
rename to modules/ContentStore/Service/SomeRandomApi/KoalaService.cs
index 3b5b49e..c6c1908 100644
--- a/modules/ContentStore/Service/KoalaService.cs
+++ b/modules/ContentStore/Service/SomeRandomApi/KoalaService.cs
@@ -1,7 +1,7 @@
-namespace West.TelegramBot.ContentStore.Service;
+namespace West.TelegramBot.ContentStore.Service.SomeRandomApi;
 
 public class KoalaService : SomeRandomApiAbstractService
 {
     public KoalaService() : base("koala", "Коала", 40, 180)
-    {}
+    { }
 }
diff --git a/modules/ContentStore/Service/SomeRandomApi/PandaService.cs b/modules/ContentStore/Service/SomeRandomApi/PandaService.cs
new file mode 100644
index 0000000..22d5db0
--- /dev/null
+++ b/modules/ContentStore/Service/SomeRandomApi/PandaService.cs
@@ -0,0 +1,7 @@
+namespace West.TelegramBot.ContentStore.Service.SomeRandomApi;
+
+public class PandaService : SomeRandomApiAbstractService
+{
+    public PandaService() : base("panda", "Панда", 40, 160)
+    { }
+}
diff --git a/modules/ContentStore/Service/SomeRandomApi/RaccoonService.cs b/modules/ContentStore/Service/SomeRandomApi/RaccoonService.cs
new file mode 100644
index 0000000..41b5ab4
--- /dev/null
+++ b/modules/ContentStore/Service/SomeRandomApi/RaccoonService.cs
@@ -0,0 +1,7 @@
+namespace West.TelegramBot.ContentStore.Service.SomeRandomApi;
+
+public class RaccoonService : SomeRandomApiAbstractService
+{
+    public RaccoonService() : base("raccoon", "Енот", 40, 160)
+    { }
+}
diff --git a/modules/ContentStore/Service/SomeRandomApi/RedPandaService.cs b/modules/ContentStore/Service/SomeRandomApi/RedPandaService.cs
new file mode 100644
index 0000000..539fb81
--- /dev/null
+++ b/modules/ContentStore/Service/SomeRandomApi/RedPandaService.cs
@@ -0,0 +1,7 @@
+namespace West.TelegramBot.ContentStore.Service.SomeRandomApi;
+
+public class RedPandaService : SomeRandomApiAbstractService
+{
+    public RedPandaService() : base("red_panda", "Красная панда", 40, 150)
+    { }
+}
diff --git a/modules/ContentStore/Service/SomeRandomApiAbstractService.cs b/modules/ContentStore/Service/SomeRandomApi/SomeRandomApiAbstractService.cs
similarity index 93%
rename from modules/ContentStore/Service/SomeRandomApiAbstractService.cs
rename to modules/ContentStore/Service/SomeRandomApi/SomeRandomApiAbstractService.cs
index 9c82aa1..419e179 100644
--- a/modules/ContentStore/Service/SomeRandomApiAbstractService.cs
+++ b/modules/ContentStore/Service/SomeRandomApi/SomeRandomApiAbstractService.cs
@@ -2,7 +2,7 @@ using Newtonsoft.Json;
 using Telegram.Bot.Types;
 using West.TelegramBot.ContentStore.Model;
 
-namespace West.TelegramBot.ContentStore.Service;
+namespace West.TelegramBot.ContentStore.Service.SomeRandomApi;
 
 public abstract class SomeRandomApiAbstractService : IRandomMediaService
 {