diff --git a/Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma-unbaked.ftl b/Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma-unbaked.ftl
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl b/Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl
new file mode 100644
index 00000000000..827f475e577
--- /dev/null
+++ b/Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl
@@ -0,0 +1,5 @@
+ent-FoodShavermaUnbaked = Заготовка шавермы
+    .desc = Пища богов, осталось только подогреть.
+
+ent-FoodShavermaBaked = Шаверма
+    .desc = Пища богов.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/shaverma-baked.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/shaverma-baked.ftl
deleted file mode 100644
index 00a9c0331a8..00000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/shaverma-baked.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-ent-Shaverma-unbaked = Заготовка шавермы
-    .desc = Пища богов, осталось только подогреть.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/shaverma-unbaked.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/shaverma-unbaked.ftl
deleted file mode 100644
index 0b2979b4363..00000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/shaverma-unbaked.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-ent-Shaverma-baked = Шаверма
-    .desc = Пища богов.
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml
deleted file mode 100644
index b440fdd1d75..00000000000
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-- type: entity
-  parent: FoodMealBase
-  id: Shaverma-baked
-  components:
-    - type: Item
-      storedRotation: -90
-    - type: Food
-      transferAmount: 3
-    - type: Sprite
-      sprite: Objects/Consumable/Food/shavuha.rsi
-      layers:
-        - state: baked
-    - type: SolutionContainerManager
-      solutions:
-          food:
-              canReact: false # Dont want cause reactions inside tacos after merging ingredients
-              maxVol: 10
-              reagents:
-                - ReagentId: Nutriment
-                  Quantity: 7.4
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/shaverma-unbaked.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/shaverma-unbaked.yml
deleted file mode 100644
index 0f418fa43a0..00000000000
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/shaverma-unbaked.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_single.yml
-
-- type: entity
-  parent: FoodMealBase
-  id: Shaverma-unbaked
-  components:
-    - type: Item
-      storedRotation: -90
-    - type: Food
-      transferAmount: 3
-    - type: Sprite
-      sprite: Objects/Consumable/Food/shavuha.rsi
-      layers:
-        - state: unbaked
-    - type: SolutionContainerManager
-      solutions:
-          food:
-              canReact: false # Dont want cause reactions inside tacos after merging ingredients
-              maxVol: 10
-              reagents:
-                - ReagentId: Nutriment
-                  Quantity: 4.5
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 66d8c93be61..37aca34fa43 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -6,25 +6,6 @@
   solids:
     FoodDoughSlice: 1 # one third of a standard bread dough recipe
 
-# Corvax-Next-Shaverma-Start
-- type: microwaveMealRecipe
-  id: RecipeShaverma-unbaked
-  name: The best food ever
-  result: Shaverma-unbaked
-  time: 1
-  solids:
-    FoodMeat: 2
-    FoodDough: 1
-    FoodTomato: 1
-
-- type: microwaveMealRecipe
-  id: RecipeShaverma-baked
-  name: The best food ever
-  result: Shaverma-baked
-  time: 15
-  solids:
-    Shaverma-unbaked: 1
-# Corvax-Next-Shaverma-End
 #Bagels
 - type: microwaveMealRecipe
   id: RecipeBagel
diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml
new file mode 100644
index 00000000000..aef44b81d83
--- /dev/null
+++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Consumable/Food/shaverma.yml
@@ -0,0 +1,41 @@
+- type: entity
+  parent: FoodMealBase
+  id: FoodShavermaBaked
+  components:
+    - type: Item
+      storedRotation: -90
+    - type: Food
+      transferAmount: 3
+    - type: Sprite
+      sprite: _CorvaxNext/Objects/Consumable/Food/shavuha.rsi
+      layers:
+        - state: baked
+    - type: SolutionContainerManager
+      solutions:
+          food:
+              canReact: false # Dont want cause reactions inside tacos after merging ingredients
+              maxVol: 10
+              reagents:
+                - ReagentId: Nutriment
+                  Quantity: 7.4
+
+- type: entity
+  parent: FoodMealBase
+  id: FoodShavermaUnbaked
+  components:
+    - type: Item
+      storedRotation: -90
+    - type: Food
+      transferAmount: 3
+    - type: Sprite
+      sprite: Objects/Consumable/Food/shavuha.rsi
+      layers:
+        - state: unbaked
+    - type: SolutionContainerManager
+      solutions:
+          food:
+              canReact: false # Dont want cause reactions inside tacos after merging ingredients
+              maxVol: 10
+              reagents:
+                - ReagentId: Nutriment
+                  Quantity: 4.5
diff --git a/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml
new file mode 100644
index 00000000000..8688c60de52
--- /dev/null
+++ b/Resources/Prototypes/_CorvaxNext/Recipes/Cooking/meal_recipes.yml
@@ -0,0 +1,19 @@
+# Corvax-Next-Shaverma-Start
+- type: microwaveMealRecipe
+  id: RecipeShaverma-unbaked
+  name: The best food ever
+  result: Shaverma-unbaked
+  time: 1
+  solids:
+    FoodMeat: 2
+    FoodDough: 1
+    FoodTomato: 1
+
+- type: microwaveMealRecipe
+  id: RecipeShaverma-baked
+  name: The best food ever
+  result: Shaverma-baked
+  time: 15
+  solids:
+    Shaverma-unbaked: 1
+# Corvax-Next-Shaverma-End
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Consumable/Food/shavuha.rsi/baked.png b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/baked.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Food/shavuha.rsi/baked.png
rename to Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/baked.png
diff --git a/Resources/Textures/Objects/Consumable/Food/shavuha.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Food/shavuha.rsi/meta.json
rename to Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json
diff --git a/Resources/Textures/Objects/Consumable/Food/shavuha.rsi/unbaked.png b/Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/unbaked.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Food/shavuha.rsi/unbaked.png
rename to Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/unbaked.png