diff --git a/radio/sdcard/taranis/WIZARD/ailerons-0.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/ailerons-0.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/ailerons-0.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/ailerons-0.bmp
diff --git a/radio/sdcard/taranis/WIZARD/ailerons-1.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/ailerons-1.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/ailerons-1.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/ailerons-1.bmp
diff --git a/radio/sdcard/taranis/WIZARD/ailerons-2.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/ailerons-2.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/ailerons-2.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/ailerons-2.bmp
diff --git a/radio/sdcard/taranis/WIZARD/brakes-1.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/brakes-1.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/brakes-1.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/brakes-1.bmp
diff --git a/radio/sdcard/taranis/WIZARD/brakes-2.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/brakes-2.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/brakes-2.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/brakes-2.bmp
diff --git a/radio/sdcard/taranis/WIZARD/confirm-plane.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/confirm-plane.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/confirm-plane.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/confirm-plane.bmp
diff --git a/radio/sdcard/taranis/WIZARD/confirm-tick.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/confirm-tick.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/confirm-tick.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/confirm-tick.bmp
diff --git a/radio/sdcard/taranis/WIZARD/delta.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/delta.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/delta.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/delta.bmp
diff --git a/radio/sdcard/taranis/WIZARD/delta.lua b/radio/sdcard/taranis/SCRIPTS/WIZARD/delta.lua
similarity index 96%
rename from radio/sdcard/taranis/WIZARD/delta.lua
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/delta.lua
index 8f25b472f..a9f8a48c9 100644
--- a/radio/sdcard/taranis/WIZARD/delta.lua
+++ b/radio/sdcard/taranis/SCRIPTS/WIZARD/delta.lua
@@ -358,7 +358,6 @@ local function run(event)
   if event == nil then
     error("Cannot be run as a model script!")
   end
-  lcd.lock()
   if servoPage ~= nil then
     servoMenu(event) 
   elseif page == ENGINE_PAGE then
diff --git a/radio/sdcard/taranis/WIZARD/drudder-0.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/drudder-0.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/drudder-0.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/drudder-0.bmp
diff --git a/radio/sdcard/taranis/WIZARD/drudder-1.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/drudder-1.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/drudder-1.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/drudder-1.bmp
diff --git a/radio/sdcard/taranis/WIZARD/elevons.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/elevons.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/elevons.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/elevons.bmp
diff --git a/radio/sdcard/taranis/WIZARD/engine-0.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/engine-0.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/engine-0.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/engine-0.bmp
diff --git a/radio/sdcard/taranis/WIZARD/engine-1.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/engine-1.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/engine-1.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/engine-1.bmp
diff --git a/radio/sdcard/taranis/WIZARD/flaps-1.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/flaps-1.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/flaps-1.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/flaps-1.bmp
diff --git a/radio/sdcard/taranis/WIZARD/flaps-2.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/flaps-2.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/flaps-2.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/flaps-2.bmp
diff --git a/radio/sdcard/taranis/WIZARD/heli.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/heli.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/heli.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/heli.bmp
diff --git a/radio/sdcard/taranis/WIZARD/mark.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/mark.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/mark.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/mark.bmp
diff --git a/radio/sdcard/taranis/WIZARD/multi-pitch.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/multi-pitch.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/multi-pitch.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/multi-pitch.bmp
diff --git a/radio/sdcard/taranis/WIZARD/multi-roll.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/multi-roll.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/multi-roll.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/multi-roll.bmp
diff --git a/radio/sdcard/taranis/WIZARD/multi-thr.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/multi-thr.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/multi-thr.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/multi-thr.bmp
diff --git a/radio/sdcard/taranis/WIZARD/multi-yaw.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/multi-yaw.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/multi-yaw.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/multi-yaw.bmp
diff --git a/radio/sdcard/taranis/WIZARD/multi.lua b/radio/sdcard/taranis/SCRIPTS/WIZARD/multi.lua
similarity index 96%
rename from radio/sdcard/taranis/WIZARD/multi.lua
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/multi.lua
index c4a8848fe..d043139ef 100644
--- a/radio/sdcard/taranis/WIZARD/multi.lua
+++ b/radio/sdcard/taranis/SCRIPTS/WIZARD/multi.lua
@@ -288,7 +288,6 @@ local function run(event)
   if event == nil then
     error("Cannot be run as a model script!")
   end
-  lcd.lock()
   if page == THROTTLE_PAGE then
     throttleMenu(event)
   elseif page == ROLL_PAGE then
diff --git a/radio/sdcard/taranis/WIZARD/plane.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/plane.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/plane.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/plane.bmp
diff --git a/radio/sdcard/taranis/WIZARD/plane.lua b/radio/sdcard/taranis/SCRIPTS/WIZARD/plane.lua
similarity index 96%
rename from radio/sdcard/taranis/WIZARD/plane.lua
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/plane.lua
index 1743f070d..605436282 100644
--- a/radio/sdcard/taranis/WIZARD/plane.lua
+++ b/radio/sdcard/taranis/SCRIPTS/WIZARD/plane.lua
@@ -546,7 +546,6 @@ local function run(event)
   if event == nil then
     error("Cannot be run as a model script!")
   end
-  lcd.lock()
   if servoPage ~= nil then
     servoMenu(event) 
   elseif page == ENGINE_PAGE then
diff --git a/radio/sdcard/taranis/WIZARD/quadri.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/quadri.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/quadri.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/quadri.bmp
diff --git a/radio/sdcard/taranis/WIZARD/servo.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/servo.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/servo.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/servo.bmp
diff --git a/radio/sdcard/taranis/WIZARD/tail-e.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/tail-e.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/tail-e.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/tail-e.bmp
diff --git a/radio/sdcard/taranis/WIZARD/tail-eer.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/tail-eer.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/tail-eer.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/tail-eer.bmp
diff --git a/radio/sdcard/taranis/WIZARD/tail-er.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/tail-er.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/tail-er.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/tail-er.bmp
diff --git a/radio/sdcard/taranis/WIZARD/tail-v.bmp b/radio/sdcard/taranis/SCRIPTS/WIZARD/tail-v.bmp
similarity index 100%
rename from radio/sdcard/taranis/WIZARD/tail-v.bmp
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/tail-v.bmp
diff --git a/radio/sdcard/taranis/WIZARD/wizard.lua b/radio/sdcard/taranis/SCRIPTS/WIZARD/wizard.lua
similarity index 94%
rename from radio/sdcard/taranis/WIZARD/wizard.lua
rename to radio/sdcard/taranis/SCRIPTS/WIZARD/wizard.lua
index 22ac3db46..e39de5960 100644
--- a/radio/sdcard/taranis/WIZARD/wizard.lua
+++ b/radio/sdcard/taranis/SCRIPTS/WIZARD/wizard.lua
@@ -69,7 +69,6 @@ local function run(event)
     return 2
   end
   
-  lcd.lock()
   return modelTypeMenu(event) 
 end