diff --git a/appveyor.yml b/appveyor.yml
index a1276ca1e..a0c261b2b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -151,9 +151,9 @@ build_script:
 
     Copy-Item C:\ProxSpace\pm3\bootrom\obj\*.elf C:\ProxSpace\Release\arm
 
-    New-Item -ItemType Directory -Force -Path C:\ProxSpace\Release\scripts
+    New-Item -ItemType Directory -Force -Path C:\ProxSpace\Release\luascripts
 
-    Copy-Item C:\ProxSpace\pm3\client\scripts\*.lua C:\ProxSpace\Release\scripts
+    Copy-Item C:\ProxSpace\pm3\client\luascripts\*.lua C:\ProxSpace\Release\luascripts
 
     New-Item -ItemType Directory -Force -Path C:\ProxSpace\Release\hardnested\tables
 
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index 8c7cfcc5c..58eb5db1a 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -86,7 +86,7 @@ static int CmdHFMFPInfo(const char *cmd) {
                 // check SL0
                 uint8_t data[250] = {0};
                 int datalen = 0;
-                // https://github.com/Proxmark/proxmark3/blob/master/client/scripts/mifarePlus.lua#L161
+                // https://github.com/Proxmark/proxmark3/blob/master/client/luascripts/mifarePlus.lua#L161
                 uint8_t cmd[3 + 16] = {0xa8, 0x90, 0x90, 0x00};
                 int res = ExchangeRAW14a(cmd, sizeof(cmd), false, false, data, sizeof(data), &datalen);
                 if (!res && datalen > 1 && data[0] == 0x09) {
diff --git a/client/cmdscript.c b/client/cmdscript.c
index 28dd8608f..16539b020 100644
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -77,7 +77,7 @@ static int CmdScriptList(const char *Cmd) {
 
     n = scandir(script_directory_path, &namelist, NULL, alphasort);
     if (n == -1) {
-        PrintAndLogEx(FAILED, "Couldn't open the scripts-directory");
+        PrintAndLogEx(FAILED, "Couldn't open the luascripts-directory");
         return 1;
     }
 
@@ -175,7 +175,7 @@ static command_t CommandTable[] = {
  */
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
-    PrintAndLogEx(NORMAL, "This is a feature to run Lua-scripts. You can place lua-scripts within the scripts/-folder. ");
+    PrintAndLogEx(NORMAL, "This is a feature to run Lua-scripts. You can place Lua-scripts within the luascripts/-folder. ");
     return 0;
 }
 
diff --git a/client/scripts/14araw.lua b/client/luascripts/14araw.lua
similarity index 100%
rename from client/scripts/14araw.lua
rename to client/luascripts/14araw.lua
diff --git a/client/scripts/Legic_clone.lua b/client/luascripts/Legic_clone.lua
similarity index 100%
rename from client/scripts/Legic_clone.lua
rename to client/luascripts/Legic_clone.lua
diff --git a/client/scripts/amiibo.lua b/client/luascripts/amiibo.lua
similarity index 100%
rename from client/scripts/amiibo.lua
rename to client/luascripts/amiibo.lua
diff --git a/client/scripts/brutesim.lua b/client/luascripts/brutesim.lua
similarity index 100%
rename from client/scripts/brutesim.lua
rename to client/luascripts/brutesim.lua
diff --git a/client/scripts/calc_di.lua b/client/luascripts/calc_di.lua
similarity index 100%
rename from client/scripts/calc_di.lua
rename to client/luascripts/calc_di.lua
diff --git a/client/scripts/calc_ev1_it.lua b/client/luascripts/calc_ev1_it.lua
similarity index 100%
rename from client/scripts/calc_ev1_it.lua
rename to client/luascripts/calc_ev1_it.lua
diff --git a/client/scripts/calc_mizip.lua b/client/luascripts/calc_mizip.lua
similarity index 100%
rename from client/scripts/calc_mizip.lua
rename to client/luascripts/calc_mizip.lua
diff --git a/client/scripts/calypso.lua b/client/luascripts/calypso.lua
similarity index 100%
rename from client/scripts/calypso.lua
rename to client/luascripts/calypso.lua
diff --git a/client/scripts/cmdline.lua b/client/luascripts/cmdline.lua
similarity index 100%
rename from client/scripts/cmdline.lua
rename to client/luascripts/cmdline.lua
diff --git a/client/scripts/didump.lua b/client/luascripts/didump.lua
similarity index 100%
rename from client/scripts/didump.lua
rename to client/luascripts/didump.lua
diff --git a/client/scripts/dumptoemul-mfu.lua b/client/luascripts/dumptoemul-mfu.lua
similarity index 100%
rename from client/scripts/dumptoemul-mfu.lua
rename to client/luascripts/dumptoemul-mfu.lua
diff --git a/client/scripts/dumptoemul.lua b/client/luascripts/dumptoemul.lua
similarity index 100%
rename from client/scripts/dumptoemul.lua
rename to client/luascripts/dumptoemul.lua
diff --git a/client/scripts/e.lua b/client/luascripts/e.lua
similarity index 100%
rename from client/scripts/e.lua
rename to client/luascripts/e.lua
diff --git a/client/scripts/emul2dump.lua b/client/luascripts/emul2dump.lua
similarity index 100%
rename from client/scripts/emul2dump.lua
rename to client/luascripts/emul2dump.lua
diff --git a/client/scripts/emul2html.lua b/client/luascripts/emul2html.lua
similarity index 100%
rename from client/scripts/emul2html.lua
rename to client/luascripts/emul2html.lua
diff --git a/client/scripts/formatMifare.lua b/client/luascripts/formatMifare.lua
similarity index 100%
rename from client/scripts/formatMifare.lua
rename to client/luascripts/formatMifare.lua
diff --git a/client/scripts/hf_read.lua b/client/luascripts/hf_read.lua
similarity index 100%
rename from client/scripts/hf_read.lua
rename to client/luascripts/hf_read.lua
diff --git a/client/scripts/htmldump.lua b/client/luascripts/htmldump.lua
similarity index 100%
rename from client/scripts/htmldump.lua
rename to client/luascripts/htmldump.lua
diff --git a/client/scripts/iso15_magic.lua b/client/luascripts/iso15_magic.lua
similarity index 100%
rename from client/scripts/iso15_magic.lua
rename to client/luascripts/iso15_magic.lua
diff --git a/client/scripts/legic.lua b/client/luascripts/legic.lua
similarity index 100%
rename from client/scripts/legic.lua
rename to client/luascripts/legic.lua
diff --git a/client/scripts/legic_buffer2card.lua b/client/luascripts/legic_buffer2card.lua
similarity index 100%
rename from client/scripts/legic_buffer2card.lua
rename to client/luascripts/legic_buffer2card.lua
diff --git a/client/scripts/lf_bulk.lua b/client/luascripts/lf_bulk.lua
similarity index 100%
rename from client/scripts/lf_bulk.lua
rename to client/luascripts/lf_bulk.lua
diff --git a/client/scripts/mfkeys.lua b/client/luascripts/mfkeys.lua
similarity index 100%
rename from client/scripts/mfkeys.lua
rename to client/luascripts/mfkeys.lua
diff --git a/client/scripts/mifare_access.lua b/client/luascripts/mifare_access.lua
similarity index 100%
rename from client/scripts/mifare_access.lua
rename to client/luascripts/mifare_access.lua
diff --git a/client/scripts/mifare_autopwn.lua b/client/luascripts/mifare_autopwn.lua
similarity index 100%
rename from client/scripts/mifare_autopwn.lua
rename to client/luascripts/mifare_autopwn.lua
diff --git a/client/scripts/mifareplus.lua b/client/luascripts/mifareplus.lua
similarity index 100%
rename from client/scripts/mifareplus.lua
rename to client/luascripts/mifareplus.lua
diff --git a/client/scripts/ndef_dump.lua b/client/luascripts/ndef_dump.lua
similarity index 100%
rename from client/scripts/ndef_dump.lua
rename to client/luascripts/ndef_dump.lua
diff --git a/client/scripts/ntag_3d.lua b/client/luascripts/ntag_3d.lua
similarity index 99%
rename from client/scripts/ntag_3d.lua
rename to client/luascripts/ntag_3d.lua
index ff2c68d0f..869590cf2 100644
--- a/client/scripts/ntag_3d.lua
+++ b/client/luascripts/ntag_3d.lua
@@ -223,7 +223,7 @@ local function configure_magic_ntag(uid)
     -- -p    == set pwd
     -- -a    == set pack
     args =('-t 12 -u %s -p %08X -a %04X'):format(uid, pwd, pack)
-    require('../scripts/mfu_magic')
+    require('mfu_magic')
 
     -- Set back args. Not that it's used, just for the karma...
     args = myargs
diff --git a/client/scripts/parameters.lua b/client/luascripts/parameters.lua
similarity index 100%
rename from client/scripts/parameters.lua
rename to client/luascripts/parameters.lua
diff --git a/client/scripts/read_pwd_mem.lua b/client/luascripts/read_pwd_mem.lua
similarity index 100%
rename from client/scripts/read_pwd_mem.lua
rename to client/luascripts/read_pwd_mem.lua
diff --git a/client/scripts/remagic.lua b/client/luascripts/remagic.lua
similarity index 100%
rename from client/scripts/remagic.lua
rename to client/luascripts/remagic.lua
diff --git a/client/scripts/test_t55x7.lua b/client/luascripts/test_t55x7.lua
similarity index 100%
rename from client/scripts/test_t55x7.lua
rename to client/luascripts/test_t55x7.lua
diff --git a/client/scripts/test_t55x7_ask.lua b/client/luascripts/test_t55x7_ask.lua
similarity index 100%
rename from client/scripts/test_t55x7_ask.lua
rename to client/luascripts/test_t55x7_ask.lua
diff --git a/client/scripts/test_t55x7_bi.lua b/client/luascripts/test_t55x7_bi.lua
similarity index 100%
rename from client/scripts/test_t55x7_bi.lua
rename to client/luascripts/test_t55x7_bi.lua
diff --git a/client/scripts/test_t55x7_fsk.lua b/client/luascripts/test_t55x7_fsk.lua
similarity index 100%
rename from client/scripts/test_t55x7_fsk.lua
rename to client/luascripts/test_t55x7_fsk.lua
diff --git a/client/scripts/test_t55x7_psk.lua b/client/luascripts/test_t55x7_psk.lua
similarity index 100%
rename from client/scripts/test_t55x7_psk.lua
rename to client/luascripts/test_t55x7_psk.lua
diff --git a/client/scripts/tnp3clone.lua b/client/luascripts/tnp3clone.lua
similarity index 100%
rename from client/scripts/tnp3clone.lua
rename to client/luascripts/tnp3clone.lua
diff --git a/client/scripts/tnp3dump.lua b/client/luascripts/tnp3dump.lua
similarity index 100%
rename from client/scripts/tnp3dump.lua
rename to client/luascripts/tnp3dump.lua
diff --git a/client/scripts/tnp3sim.lua b/client/luascripts/tnp3sim.lua
similarity index 100%
rename from client/scripts/tnp3sim.lua
rename to client/luascripts/tnp3sim.lua
diff --git a/client/scripts/tracetest.lua b/client/luascripts/tracetest.lua
similarity index 100%
rename from client/scripts/tracetest.lua
rename to client/luascripts/tracetest.lua
diff --git a/client/scripts/ufodump.lua b/client/luascripts/ufodump.lua
similarity index 100%
rename from client/scripts/ufodump.lua
rename to client/luascripts/ufodump.lua
diff --git a/client/scripts/ul_uid.lua b/client/luascripts/ul_uid.lua
similarity index 100%
rename from client/scripts/ul_uid.lua
rename to client/luascripts/ul_uid.lua
diff --git a/client/scripting.c b/client/scripting.c
index 429d96fac..f090efbd7 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -1133,7 +1133,7 @@ int set_pm3_libraries(lua_State *L) {
 
 
     //--add to the LUA_PATH (package.path in lua)
-    // so we can load scripts from the ./scripts/ - directory
+    // so we can load scripts from the ./luascripts/ - directory
     char scripts_path[strlen(get_my_executable_directory()) + strlen(LUA_SCRIPTS_DIRECTORY) + strlen(LUA_LIBRARIES_WILDCARD) + 1];
     strcpy(scripts_path, get_my_executable_directory());
     strcat(scripts_path, LUA_SCRIPTS_DIRECTORY);
diff --git a/client/scripting.h b/client/scripting.h
index 07b07aa67..1a7b5a7e3 100644
--- a/client/scripting.h
+++ b/client/scripting.h
@@ -15,7 +15,7 @@
 //#include <lauxlib.h>
 
 #define LUA_LIBRARIES_DIRECTORY "lualibs/"
-#define LUA_SCRIPTS_DIRECTORY   "scripts/"
+#define LUA_SCRIPTS_DIRECTORY   "luascripts/"
 #define LUA_LIBRARIES_WILDCARD  "?.lua"
 
 /**