diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_fount_lamp.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_fount_lamp.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_fount_lamp.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_fount_lamp.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp1.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp1.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp1.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp1.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp10.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp10.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp10.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp10.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp110b.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp110b.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp110b.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp110b.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp12.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp12.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp12.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp12.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp1_italy.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp1_italy.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp1_italy.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp1_italy.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp1a.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp1a.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp1a.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp1a.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp1b.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp1b.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp1b.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp1b.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp1c.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp1c.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp1c.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp1c.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp2a.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp2a.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp2a.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp2a.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp2b.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp2b.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp2b.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp2b.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp3.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp3.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp3.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp3.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp4.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp4.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp4.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp4.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp5.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp5.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp5.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp5.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp6.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp6.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp6.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp6.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp6a.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp6a.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp6a.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp6a.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp6c.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp6c.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp6c.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp6c.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp7.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp7.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp7.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp7.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp7_b.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp7_b.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp7_b.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp7_b.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp7_c.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp7_c.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp7_c.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp7_c.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp8a.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp8a.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp8a.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp8a.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp9.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp9.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_nylamp9.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_nylamp9.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_wall_light_01.wdr b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_wall_light_01.wdr
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_wall_light_01.wdr
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_wall_light_01.wdr
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_wall_light_02.wdr b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_wall_light_02.wdr
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_wall_light_02.wdr
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_wall_light_02.wdr
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_wall_light_02_n.wdr b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_wall_light_02_n.wdr
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_wall_light_02_n.wdr
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_wall_light_02_n.wdr
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_wall_light_03.wdr b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_wall_light_03.wdr
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_wall_light_03.wdr
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_wall_light_03.wdr
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_wall_light_04.wdr b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_wall_light_04.wdr
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_wall_light_04.wdr
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_wall_light_04.wdr
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_wall_light_04_n.wdr b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_wall_light_04_n.wdr
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_wall_light_04_n.wdr
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_wall_light_04_n.wdr
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_wall_light_05.wdr b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_wall_light_05.wdr
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_wall_light_05.wdr
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_wall_light_05.wdr
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_wall_light_06.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_wall_light_06.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_wall_light_06.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_wall_light_06.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_wall_light_07.wdr b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_wall_light_07.wdr
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_wall_light_07.wdr
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_wall_light_07.wdr
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_wall_light_sm.wdr b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_wall_light_sm.wdr
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/bm_wall_light_sm.wdr
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/bm_wall_light_sm.wdr
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/cj_dm_light_1.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/cj_dm_light_1.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/cj_dm_light_1.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/cj_dm_light_1.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/cj_nylamp1.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/cj_nylamp1.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/cj_nylamp1.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/cj_nylamp1.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/cj_nylamp2.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/cj_nylamp2.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/cj_nylamp2.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/cj_nylamp2.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/cj_nylamp2b.wft b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/cj_nylamp2b.wft
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/cj_nylamp2b.wft
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/cj_nylamp2b.wft
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/ny_man_fd_lamp1.wdr b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/ny_man_fd_lamp1.wdr
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/ny_man_fd_lamp1.wdr
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/ny_man_fd_lamp1.wdr
diff --git a/data/update/GTAIV.EFLC.FusionFix/FusionLights/shitkitch.wdr b/data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/shitkitch.wdr
similarity index 100%
rename from data/update/GTAIV.EFLC.FusionFix/FusionLights/shitkitch.wdr
rename to data/update/GTAIV.EFLC.FusionFix/GTAIV.EFLC.FusionFix/shitkitch.wdr
diff --git a/data/update/GTAIV.EFLC.FusionFix/cdimagemake.ims b/data/update/GTAIV.EFLC.FusionFix/cdimagemake.ims
index 865d9b19..3fc45c30 100644
--- a/data/update/GTAIV.EFLC.FusionFix/cdimagemake.ims
+++ b/data/update/GTAIV.EFLC.FusionFix/cdimagemake.ims
@@ -17,8 +17,3 @@
 -importFromDirectory "TBOGT.FusionFix"
 -rebuild
 -close
-
--create "FusionLights.img" "3" "IMG_VERSION_3_ENCRYPTION_TYPE_NONE"
--importFromDirectory "FusionLights"
--rebuild
--close