diff --git a/PHI-RS/.editorconfig b/OLD/PHI-RS/.editorconfig
similarity index 100%
rename from PHI-RS/.editorconfig
rename to OLD/PHI-RS/.editorconfig
diff --git a/PHI-RS/.luacheckrc b/OLD/PHI-RS/.luacheckrc
similarity index 100%
rename from PHI-RS/.luacheckrc
rename to OLD/PHI-RS/.luacheckrc
diff --git a/PHI-RS/changelog.txt b/OLD/PHI-RS/changelog.txt
similarity index 100%
rename from PHI-RS/changelog.txt
rename to OLD/PHI-RS/changelog.txt
diff --git a/PHI-RS/config.lua b/OLD/PHI-RS/config.lua
similarity index 100%
rename from PHI-RS/config.lua
rename to OLD/PHI-RS/config.lua
diff --git a/PHI-RS/data-updates.lua b/OLD/PHI-RS/data-updates.lua
similarity index 100%
rename from PHI-RS/data-updates.lua
rename to OLD/PHI-RS/data-updates.lua
diff --git a/PHI-RS/data.lua b/OLD/PHI-RS/data.lua
similarity index 100%
rename from PHI-RS/data.lua
rename to OLD/PHI-RS/data.lua
diff --git a/PHI-RS/info.json b/OLD/PHI-RS/info.json
similarity index 100%
rename from PHI-RS/info.json
rename to OLD/PHI-RS/info.json
diff --git a/PHI-RS/locale/en/locale.cfg b/OLD/PHI-RS/locale/en/locale.cfg
similarity index 100%
rename from PHI-RS/locale/en/locale.cfg
rename to OLD/PHI-RS/locale/en/locale.cfg
diff --git a/PHI-RS/locale/ja/locale.cfg b/OLD/PHI-RS/locale/ja/locale.cfg
similarity index 100%
rename from PHI-RS/locale/ja/locale.cfg
rename to OLD/PHI-RS/locale/ja/locale.cfg
diff --git a/PHI-RS/locale/zh-CN/locale.cfg b/OLD/PHI-RS/locale/zh-CN/locale.cfg
similarity index 100%
rename from PHI-RS/locale/zh-CN/locale.cfg
rename to OLD/PHI-RS/locale/zh-CN/locale.cfg
diff --git a/PHI-RS/locale/zh-TW/locale.cfg b/OLD/PHI-RS/locale/zh-TW/locale.cfg
similarity index 100%
rename from PHI-RS/locale/zh-TW/locale.cfg
rename to OLD/PHI-RS/locale/zh-TW/locale.cfg
diff --git a/PHI-RS/migrations/migrations.lua b/OLD/PHI-RS/migrations/migrations.lua
similarity index 100%
rename from PHI-RS/migrations/migrations.lua
rename to OLD/PHI-RS/migrations/migrations.lua
diff --git a/PHI-RS/settings.lua b/OLD/PHI-RS/settings.lua
similarity index 100%
rename from PHI-RS/settings.lua
rename to OLD/PHI-RS/settings.lua
diff --git a/PHI-RS/thumbnail.png b/OLD/PHI-RS/thumbnail.png
similarity index 100%
rename from PHI-RS/thumbnail.png
rename to OLD/PHI-RS/thumbnail.png
diff --git a/PHI-CL/config.lua b/PHI-CL/config.lua
index 9dbeb77..1c31226 100644
--- a/PHI-CL/config.lua
+++ b/PHI-CL/config.lua
@@ -380,13 +380,13 @@ local items = {
             max = 3
         },
         ['electric-filter-furnace'] = {
-            enabled = settings.startup['PHI-MB'].value,
+            enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-RS'].value,
             stage = 2,
             type = 'furnace',
             name = 'electric-filter-furnace',
-            ref_name = 'electric-furnace',
+            ref_name = 'electric-filter-furnace',
             tech = 'advanced-material-processing-2',
-            min = 1,
+            min = 2,
             max = 3
         },
         ['laser-turret'] = {
diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua
index 92dee93..a55058e 100644
--- a/PHI-CL/data.lua
+++ b/PHI-CL/data.lua
@@ -238,3 +238,38 @@ if module_limitation then
         end
     end
 end
+
+if settings.startup['PHI-RS'].value then
+    local item = table.deepcopy(data.raw['furnace']['electric-furnace'])
+    item.name = 'electric-filter-furnace'
+    item.minable.result = 'electric-filter-furnace'
+    item.type = 'assembling-machine'
+    data:extend({item})
+
+    item = table.deepcopy(data.raw.item['electric-furnace'])
+    item.name = 'electric-filter-furnace'
+    item.place_result = 'electric-filter-furnace'
+    item.order = item.order .. 'B'
+    data:extend({item})
+
+    data:extend({{
+        type = 'recipe',
+        name = 'electric-filter-furnace',
+        energy_required = 2,
+        enabled = false,
+        ingredients = {{'electric-furnace', 1}},
+        result = 'electric-filter-furnace',
+    }})
+
+    data:extend({{
+        type = 'recipe',
+        name = 'electric-furnace-return',
+        energy_required = 2,
+        enabled = false,
+        ingredients = {{'electric-filter-furnace', 1}},
+        result = 'electric-furnace',
+    }})
+
+    table.insert(data.raw.technology[items['item']['electric-filter-furnace'].tech].effects, {type='unlock-recipe', recipe='electric-furnace'})
+    table.insert(data.raw.technology[items['item']['electric-filter-furnace'].tech].effects, {type='unlock-recipe', recipe='electric-furnace-return'})
+end
diff --git a/PHI-CL/main.lua b/PHI-CL/main.lua
index 1594dbd..8b5a801 100644
--- a/PHI-CL/main.lua
+++ b/PHI-CL/main.lua
@@ -292,25 +292,6 @@ function main.ER(source, tier)
             result = result_name,
         }})
 
-    elseif source.name == 'electric-filter-furnace' and tier == 1 then
-        data:extend({{
-            type = 'recipe',
-            name = 'electric-filter-furnace',
-            energy_required = 2,
-            enabled = false,
-            ingredients = {{'electric-furnace', 1}},
-            result = 'electric-filter-furnace',
-        }})
-
-        data:extend({{
-            type = 'recipe',
-            name = 'electric-furnace-return',
-            energy_required = 2,
-            enabled = false,
-            ingredients = {{'electric-filter-furnace', 1}},
-            result = 'electric-furnace',
-        }})
-
     else
         data:extend({{
             type = 'recipe',