diff --git a/client/luascripts/data_example_cmdline.lua b/client/luascripts/examples/example_cmdline.lua
similarity index 100%
rename from client/luascripts/data_example_cmdline.lua
rename to client/luascripts/examples/example_cmdline.lua
diff --git a/client/luascripts/data_example_parameters.lua b/client/luascripts/examples/example_parameters.lua
similarity index 87%
rename from client/luascripts/data_example_parameters.lua
rename to client/luascripts/examples/example_parameters.lua
index 01555ca6a..0925f7d2c 100644
--- a/client/luascripts/data_example_parameters.lua
+++ b/client/luascripts/examples/example_parameters.lua
@@ -4,7 +4,7 @@ local getopt = require('getopt')
 local ansicolors = require('ansicolors')
 
 copyright = ''
-usage = 'script run data_example_parameters.lua -a 1 -blala -c -de'
+usage = 'script run example_parameters.lua -a 1 -blala -c -de'
 author = 'Martin Holst Swende'
 version = 'v1.0.2'
 desc = [[
@@ -12,10 +12,10 @@ This is an example script to demonstrate handle parameters in scripts.
 For more info, check the comments in the code
 ]]
 example = [[
-    1. script run data_example_parameters -a mytestparam_input -c
+    1. script run example_parameters -a mytestparam_input -c
 ]]
 usage = [[
-script run data_example_parameters [-h] [-a <txt>] [-b <txt>] [-c] [-d] [-e]
+script run example_parameters [-h] [-a <txt>] [-b <txt>] [-c] [-d] [-e]
 ]]
 arguments = [[
     -h              This help
@@ -52,7 +52,7 @@ local function main(args)
     5 parameters; two with values and three flags. The following
     should be valid:
 
-    script run data_example_parameters.lua -a 1 -blala -c -de
+    script run example_parameters.lua -a 1 -blala -c -de
 
     Notice two things:
     1. 'blala' works just like 'b lala', both set 'b' to 'lala'
diff --git a/client/luascripts/lf_t55xx_defaultask.lua b/client/luascripts/tests/lf_t55xx_defaultask.lua
similarity index 100%
rename from client/luascripts/lf_t55xx_defaultask.lua
rename to client/luascripts/tests/lf_t55xx_defaultask.lua
diff --git a/client/luascripts/lf_t55xx_defaultbi.lua b/client/luascripts/tests/lf_t55xx_defaultbi.lua
similarity index 100%
rename from client/luascripts/lf_t55xx_defaultbi.lua
rename to client/luascripts/tests/lf_t55xx_defaultbi.lua
diff --git a/client/luascripts/lf_t55xx_defaultfsk.lua b/client/luascripts/tests/lf_t55xx_defaultfsk.lua
similarity index 100%
rename from client/luascripts/lf_t55xx_defaultfsk.lua
rename to client/luascripts/tests/lf_t55xx_defaultfsk.lua
diff --git a/client/luascripts/lf_t55xx_defaultpsk.lua b/client/luascripts/tests/lf_t55xx_defaultpsk.lua
similarity index 100%
rename from client/luascripts/lf_t55xx_defaultpsk.lua
rename to client/luascripts/tests/lf_t55xx_defaultpsk.lua
diff --git a/client/luascripts/lf_t55xx_writetest.lua b/client/luascripts/tests/lf_t55xx_writetest.lua
similarity index 100%
rename from client/luascripts/lf_t55xx_writetest.lua
rename to client/luascripts/tests/lf_t55xx_writetest.lua