diff --git a/resources/profiles/OrcaFilamentLibrary.json b/resources/profiles/OrcaFilamentLibrary.json
index 441d37d6fb..68212a1d5e 100644
--- a/resources/profiles/OrcaFilamentLibrary.json
+++ b/resources/profiles/OrcaFilamentLibrary.json
@@ -1,6 +1,6 @@
 {
 	"name": "OrcaFilamentLibrary",
-	"version": "02.04.00.07",
+	"version": "02.04.00.08",
 	"force_update": "0",
 	"description": "Orca Filament Library",
 	"filament_list": [
@@ -1134,19 +1134,27 @@
 		},
 		{
 			"name": "INSLOGIC PA6-66 @BBL P2S",
-			"sub_path": "filament/INSLOGIC/INSLOGIC PA6-66 @BBL P2S.json"
+			"sub_path": "filament/INSLOGIC/BBL/INSLOGIC PA6-66 @BBL P2S.json"
 		},
 		{
 			"name": "INSLOGIC PA6-66 @P1-X1",
-			"sub_path": "filament/INSLOGIC/INSLOGIC PA6-66 @P1-X1.json"
+			"sub_path": "filament/INSLOGIC/BBL/INSLOGIC PA6-66 @P1-X1.json"
+		},
+		{
+			"name": "INSLOGIC PA6-66 @Prusa CORE One",
+			"sub_path": "filament/INSLOGIC/Prusa/INSLOGIC PA6-66 @Prusa CORE One.json"
 		},
 		{
 			"name": "INSLOGIC PA6-CF @BBL P2S",
-			"sub_path": "filament/INSLOGIC/INSLOGIC PA6-CF @BBL P2S.json"
+			"sub_path": "filament/INSLOGIC/BBL/INSLOGIC PA6-CF @BBL P2S.json"
 		},
 		{
 			"name": "INSLOGIC PA6-CF @P1-X1",
-			"sub_path": "filament/INSLOGIC/INSLOGIC PA6-CF @P1-X1.json"
+			"sub_path": "filament/INSLOGIC/BBL/INSLOGIC PA6-CF @P1-X1.json"
+		},
+		{
+			"name": "INSLOGIC PA6-CF @Prusa CORE One",
+			"sub_path": "filament/INSLOGIC/Prusa/INSLOGIC PA6-CF @Prusa CORE One.json"
 		},
 		{
 			"name": "Bambu PC @System",
@@ -1346,11 +1354,15 @@
 		},
 		{
 			"name": "INSLOGIC PETG Pro @BBL P2S",
-			"sub_path": "filament/INSLOGIC/INSLOGIC PETG Pro @BBL P2S.json"
+			"sub_path": "filament/INSLOGIC/BBL/INSLOGIC PETG Pro @BBL P2S.json"
 		},
 		{
 			"name": "INSLOGIC PETG Pro @P1-X1",
-			"sub_path": "filament/INSLOGIC/INSLOGIC PETG Pro @P1-X1.json"
+			"sub_path": "filament/INSLOGIC/BBL/INSLOGIC PETG Pro @P1-X1.json"
+		},
+		{
+			"name": "INSLOGIC PETG Pro @Prusa CORE One",
+			"sub_path": "filament/INSLOGIC/Prusa/INSLOGIC PETG Pro @Prusa CORE One.json"
 		},
 		{
 			"name": "JAYO PETG @BBL A1 0.4 nozzle",
@@ -1742,11 +1754,15 @@
 		},
 		{
 			"name": "INSLOGIC PLA Pro @BBL P2S",
-			"sub_path": "filament/INSLOGIC/INSLOGIC PLA Pro @BBL P2S.json"
+			"sub_path": "filament/INSLOGIC/BBL/INSLOGIC PLA Pro @BBL P2S.json"
 		},
 		{
 			"name": "INSLOGIC PLA Pro @P1-X1",
-			"sub_path": "filament/INSLOGIC/INSLOGIC PLA Pro @P1-X1.json"
+			"sub_path": "filament/INSLOGIC/BBL/INSLOGIC PLA Pro @P1-X1.json"
+		},
+		{
+			"name": "INSLOGIC PLA Pro @Prusa CORE One",
+			"sub_path": "filament/INSLOGIC/Prusa/INSLOGIC PLA Pro @Prusa CORE One.json"
 		},
 		{
 			"name": "JAYO PLA @BBL A1 0.4 nozzle",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PA6-66 @BBL P2S.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PA6-66 @BBL P2S.json
similarity index 100%
rename from resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PA6-66 @BBL P2S.json
rename to resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PA6-66 @BBL P2S.json
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PA6-66 @P1-X1.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PA6-66 @P1-X1.json
similarity index 100%
rename from resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PA6-66 @P1-X1.json
rename to resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PA6-66 @P1-X1.json
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PA6-CF @BBL P2S.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PA6-CF @BBL P2S.json
similarity index 100%
rename from resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PA6-CF @BBL P2S.json
rename to resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PA6-CF @BBL P2S.json
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PA6-CF @P1-X1.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PA6-CF @P1-X1.json
similarity index 100%
rename from resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PA6-CF @P1-X1.json
rename to resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PA6-CF @P1-X1.json
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PETG Pro @BBL P2S.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PETG Pro @BBL P2S.json
similarity index 100%
rename from resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PETG Pro @BBL P2S.json
rename to resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PETG Pro @BBL P2S.json
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PETG Pro @P1-X1.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PETG Pro @P1-X1.json
similarity index 100%
rename from resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PETG Pro @P1-X1.json
rename to resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PETG Pro @P1-X1.json
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PLA Pro @BBL P2S.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PLA Pro @BBL P2S.json
similarity index 100%
rename from resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PLA Pro @BBL P2S.json
rename to resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PLA Pro @BBL P2S.json
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PLA Pro @P1-X1.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PLA Pro @P1-X1.json
similarity index 100%
rename from resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/INSLOGIC PLA Pro @P1-X1.json
rename to resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/BBL/INSLOGIC PLA Pro @P1-X1.json
diff --git a/resources/profiles/Prusa/filament/INSLOGIC PA6-66 @Prusa CORE One.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PA6-66 @Prusa CORE One.json
similarity index 98%
rename from resources/profiles/Prusa/filament/INSLOGIC PA6-66 @Prusa CORE One.json
rename to resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PA6-66 @Prusa CORE One.json
index 5a56650231..040e1f0ff0 100644
--- a/resources/profiles/Prusa/filament/INSLOGIC PA6-66 @Prusa CORE One.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PA6-66 @Prusa CORE One.json	
@@ -3,7 +3,7 @@
   "name": "INSLOGIC PA6-66 @Prusa CORE One",
   "inherits": "INSLOGIC PA6-66 @base",
   "from": "system",
-  "setting_id": "ziY8SJXV7SBwQ9oM",
+  "setting_id": "Kuv4zCw8jhxYOzhB",
   "instantiation": "true",
   "hot_plate_temp": [
     "40"
diff --git a/resources/profiles/Prusa/filament/INSLOGIC PA6-CF @Prusa CORE One.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PA6-CF @Prusa CORE One.json
similarity index 98%
rename from resources/profiles/Prusa/filament/INSLOGIC PA6-CF @Prusa CORE One.json
rename to resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PA6-CF @Prusa CORE One.json
index bcf3081282..790650ee23 100644
--- a/resources/profiles/Prusa/filament/INSLOGIC PA6-CF @Prusa CORE One.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PA6-CF @Prusa CORE One.json	
@@ -3,7 +3,7 @@
   "name": "INSLOGIC PA6-CF @Prusa CORE One",
   "inherits": "INSLOGIC PA6-CF @base",
   "from": "system",
-  "setting_id": "zgzzHiMC4UVWTvmr",
+  "setting_id": "ZCYSMR6VCj0IrYAF",
   "instantiation": "true",
   "hot_plate_temp": [
     "60"
diff --git a/resources/profiles/Prusa/filament/INSLOGIC PETG Pro @Prusa CORE One.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PETG Pro @Prusa CORE One.json
similarity index 98%
rename from resources/profiles/Prusa/filament/INSLOGIC PETG Pro @Prusa CORE One.json
rename to resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PETG Pro @Prusa CORE One.json
index 34c658fba4..6eb05df53d 100644
--- a/resources/profiles/Prusa/filament/INSLOGIC PETG Pro @Prusa CORE One.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PETG Pro @Prusa CORE One.json	
@@ -3,7 +3,7 @@
   "name": "INSLOGIC PETG Pro @Prusa CORE One",
   "inherits": "INSLOGIC PETG Pro @base",
   "from": "system",
-  "setting_id": "DxVWszI3sTZnNuYv",
+  "setting_id": "yHUGQJhN0HUa7A5V",
   "instantiation": "true",
   "hot_plate_temp": [
     "65"
diff --git a/resources/profiles/Prusa/filament/INSLOGIC PLA Pro @Prusa CORE One.json b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PLA Pro @Prusa CORE One.json
similarity index 98%
rename from resources/profiles/Prusa/filament/INSLOGIC PLA Pro @Prusa CORE One.json
rename to resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PLA Pro @Prusa CORE One.json
index a064c1f5cc..f670bd71b0 100644
--- a/resources/profiles/Prusa/filament/INSLOGIC PLA Pro @Prusa CORE One.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/INSLOGIC/Prusa/INSLOGIC PLA Pro @Prusa CORE One.json	
@@ -3,7 +3,7 @@
   "name": "INSLOGIC PLA Pro @Prusa CORE One",
   "inherits": "INSLOGIC PLA Pro @base",
   "from": "system",
-  "setting_id": "98Xu9SBXvZLjniQZ",
+  "setting_id": "Qkscha5uuuFXbvbB",
   "instantiation": "true",
   "hot_plate_temp": [
     "55"
diff --git a/resources/profiles/Prusa.json b/resources/profiles/Prusa.json
index 43d808141e..723874f67d 100644
--- a/resources/profiles/Prusa.json
+++ b/resources/profiles/Prusa.json
@@ -2555,22 +2555,6 @@
 		{
 			"name": "Generic PLA Silk @Prusa MK4S 0.8",
 			"sub_path": "filament/Generic PLA Silk @Prusa MK4S 0.8.json"
-		},
-		{
-			"name": "INSLOGIC PA6-66 @Prusa CORE One",
-			"sub_path": "filament/INSLOGIC PA6-66 @Prusa CORE One.json"
-		},
-		{
-			"name": "INSLOGIC PA6-CF @Prusa CORE One",
-			"sub_path": "filament/INSLOGIC PA6-CF @Prusa CORE One.json"
-		},
-		{
-			"name": "INSLOGIC PETG Pro @Prusa CORE One",
-			"sub_path": "filament/INSLOGIC PETG Pro @Prusa CORE One.json"
-		},
-		{
-			"name": "INSLOGIC PLA Pro @Prusa CORE One",
-			"sub_path": "filament/INSLOGIC PLA Pro @Prusa CORE One.json"
 		}
 	],
 	"machine_list": [