36 files changed, 44 insertions, 45 deletions

diff --git a/.gitignore b/.gitignore
index 9c1bfa5..0fa1ef9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 /docs/XMRE.txt
 extantz
-/ClientHamr/GuiLua/skang
+LuaSL
+/src/GuiLua/skang
 /libraries/irrlicht-1.8.1/bin/Linux/01.HelloWorld
 /libraries/irrlicht-1.8.1/lib/Linux/libIrrlicht.a
 /libraries/irrlicht-1.8.1/source/Irrlicht/C3DSMeshFileLoader.d
@@ -318,16 +319,14 @@ extantz
 *.lsl.lua
 *.lsl2
 libraries/lemon/lemon
-LuaSL/LuaSL
-LuaSL/LuaSL_test
-LuaSL/LuaSL_parser
-LuaSL/constants.lsl
-LuaSL/LuaSL_lemon_yaccer.c
-LuaSL/LuaSL_lemon_yaccer.h
-LuaSL/LuaSL_lemon_yaccer.out
-LuaSL/lex.backup
-LuaSL/LuaSL_lexer.c
-LuaSL/LuaSL_lexer.h
-LuaSL/LuaSL_LSL_lexer.c
-LuaSL/LuaSL_LSL_lexer.h
+libraries/constants.lsl
+src/LuaSL/LuaSL_test
+src/LuaSL/LuaSL_lemon_yaccer.c
+src/LuaSL/LuaSL_lemon_yaccer.h
+src/LuaSL/LuaSL_lemon_yaccer.out
+src/LuaSL/lex.backup
+src/LuaSL/LuaSL_lexer.c
+src/LuaSL/LuaSL_lexer.h
+src/LuaSL/LuaSL_LSL_lexer.c
+src/LuaSL/LuaSL_LSL_lexer.h
 
diff --git a/LuaSL/build.lua b/LuaSL/build.lua
deleted file mode 100755
index b5ff670..0000000
--- a/LuaSL/build.lua
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env lua
-
-local dir = ...
-
-if 'nil' == type(dir) then
-  local build, err = loadfile('../build.lua')
-  if build then
-    setfenv(build, getfenv(2))
-    build(1)
-  else
-    print("ERROR - " .. err)
-  end
-  dir = workingDir
-end
-
-removeFiles(dir, {'LuaSL', '*.o', '*.output', '*.backup', '../media/LuaSL.edj', 'LuaSL_lexer.h', 'LuaSL_lexer.c', 'LuaSL_lemon_yaccer.h', 'LuaSL_lemon_yaccer.c', 'LuaSL_lemon_yaccer.out'})
-
--- Run lemon first, flex depends on it to define the symbol values.
-runCommand('lemon',   dir, '../libraries/lemon/lemon -s -T../libraries/lemon/lempar.c LuaSL_lemon_yaccer.y')
-runCommand('flex',    dir, 'flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l')
-runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' LuaSL.edc ../media/LuaSL.edj')
-compileFiles('LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_threads', 'LuaSL_utilities', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'})
-compileFiles('LuaSL_test', dir, {'LuaSL_test', 'LuaSL_utilities'})
diff --git a/build.lua b/build.lua
index dadbb32..083d726 100755
--- a/build.lua
+++ b/build.lua
@@ -91,7 +91,7 @@ if 'nil' == type(args) then
   -- Irrlicht is an external project that comes with make files anyway, and doesn't otherwise pass the test.
   runCommand('Irrlicht','libraries/irrlicht-1.8.1/source/Irrlicht', 'make')
   buildSub('libraries', 'libraries')
-  buildSub('LuaSL',     'LuaSL')
-  buildSub('GuiLua',    'ClientHamr/GuiLua')
-  buildSub('extantz',   'ClientHamr/extantz')
+  buildSub('LuaSL',     'src/LuaSL')
+  buildSub('GuiLua',    'src/GuiLua')
+  buildSub('extantz',   'src/extantz')
 end
diff --git a/LuaSL/LSL.lua b/libraries/LSL.lua
index 662c880..662c880 100644
--- a/LuaSL/LSL.lua
+++ b/libraries/LSL.lua
diff --git a/ClientHamr/GuiLua/GuiLua.c b/src/GuiLua/GuiLua.c
index c7a368c..c7a368c 100644
--- a/ClientHamr/GuiLua/GuiLua.c
+++ b/src/GuiLua/GuiLua.c
diff --git a/ClientHamr/GuiLua/GuiLua.h b/src/GuiLua/GuiLua.h
index 156fa1a..156fa1a 100644
--- a/ClientHamr/GuiLua/GuiLua.h
+++ b/src/GuiLua/GuiLua.h
diff --git a/ClientHamr/GuiLua/build.lua b/src/GuiLua/build.lua
index 7e1da15..7e1da15 100755
--- a/ClientHamr/GuiLua/build.lua
+++ b/src/GuiLua/build.lua
diff --git a/ClientHamr/GuiLua/skang.c b/src/GuiLua/skang.c
index facc239..facc239 100644
--- a/ClientHamr/GuiLua/skang.c
+++ b/src/GuiLua/skang.c
diff --git a/ClientHamr/GuiLua/skang.lua b/src/GuiLua/skang.lua
index 23549c3..23549c3 100644
--- a/ClientHamr/GuiLua/skang.lua
+++ b/src/GuiLua/skang.lua
diff --git a/ClientHamr/GuiLua/test.lua b/src/GuiLua/test.lua
index 705f7ad..705f7ad 100644
--- a/ClientHamr/GuiLua/test.lua
+++ b/src/GuiLua/test.lua
diff --git a/ClientHamr/GuiLua/test.properties b/src/GuiLua/test.properties
index 71a371d..71a371d 100644
--- a/ClientHamr/GuiLua/test.properties
+++ b/src/GuiLua/test.properties
diff --git a/ClientHamr/GuiLua/test.sh b/src/GuiLua/test.sh
index 1effdb3..1effdb3 100755
--- a/ClientHamr/GuiLua/test.sh
+++ b/src/GuiLua/test.sh
diff --git a/ClientHamr/GuiLua/test.skang b/src/GuiLua/test.skang
index 10382b5..10382b5 100644
--- a/ClientHamr/GuiLua/test.skang
+++ b/src/GuiLua/test.skang
diff --git a/ClientHamr/GuiLua/test_c.c b/src/GuiLua/test_c.c
index 5328bda..5328bda 100644
--- a/ClientHamr/GuiLua/test_c.c
+++ b/src/GuiLua/test_c.c
diff --git a/LuaSL/LuaSL.edc b/src/LuaSL/LuaSL.edc
index 844fc8e..844fc8e 100644
--- a/LuaSL/LuaSL.edc
+++ b/src/LuaSL/LuaSL.edc
diff --git a/LuaSL/LuaSL.h b/src/LuaSL/LuaSL.h
index d1f448e..d1f448e 100644
--- a/LuaSL/LuaSL.h
+++ b/src/LuaSL/LuaSL.h
diff --git a/LuaSL/LuaSL_LSL_tree.h b/src/LuaSL/LuaSL_LSL_tree.h
index 5415228..5415228 100644
--- a/LuaSL/LuaSL_LSL_tree.h
+++ b/src/LuaSL/LuaSL_LSL_tree.h
diff --git a/LuaSL/LuaSL_compile.c b/src/LuaSL/LuaSL_compile.c
index 4a0a42f..771888e 100644
--- a/LuaSL/LuaSL_compile.c
+++ b/src/LuaSL/LuaSL_compile.c
@@ -2119,9 +2119,9 @@ boolean compilerSetup(gameGlobals *ourGlobals)
         }
 
         // Compile the constants.
-        snprintf(buf, sizeof(buf), "lua -e 'require(\"LSL\").gimmeLSL()' > %s/LuaSL/constants.lsl", PACKAGE_DATA_DIR);
+        snprintf(buf, sizeof(buf), "lua -e 'require(\"LSL\").gimmeLSL()' > %s/libraries/constants.lsl", PACKAGE_DATA_DIR);
         system(buf);
-        snprintf(buf, sizeof(buf), "%s/LuaSL/constants.lsl", PACKAGE_DATA_DIR);
+        snprintf(buf, sizeof(buf), "%s/libraries/constants.lsl", PACKAGE_DATA_DIR);
         compileLSL(ourGlobals, NULL, "FAKE_SID", buf, TRUE);
 
         return TRUE;
diff --git a/LuaSL/LuaSL_lemon_yaccer.y b/src/LuaSL/LuaSL_lemon_yaccer.y
index 182789f..182789f 100644
--- a/LuaSL/LuaSL_lemon_yaccer.y
+++ b/src/LuaSL/LuaSL_lemon_yaccer.y
diff --git a/LuaSL/LuaSL_lexer.l b/src/LuaSL/LuaSL_lexer.l
index 85b2821..85b2821 100644
--- a/LuaSL/LuaSL_lexer.l
+++ b/src/LuaSL/LuaSL_lexer.l
diff --git a/LuaSL/LuaSL_main.c b/src/LuaSL/LuaSL_main.c
index 0a40712..0a40712 100644
--- a/LuaSL/LuaSL_main.c
+++ b/src/LuaSL/LuaSL_main.c
diff --git a/LuaSL/LuaSL_test.c b/src/LuaSL/LuaSL_test.c
index 58d6225..58d6225 100644
--- a/LuaSL/LuaSL_test.c
+++ b/src/LuaSL/LuaSL_test.c
diff --git a/LuaSL/LuaSL_threads.c b/src/LuaSL/LuaSL_threads.c
index 234a7c5..234a7c5 100644
--- a/LuaSL/LuaSL_threads.c
+++ b/src/LuaSL/LuaSL_threads.c
diff --git a/LuaSL/LuaSL_threads.h b/src/LuaSL/LuaSL_threads.h
index 9a11b5c..9a11b5c 100644
--- a/LuaSL/LuaSL_threads.h
+++ b/src/LuaSL/LuaSL_threads.h
diff --git a/LuaSL/LuaSL_utilities.c b/src/LuaSL/LuaSL_utilities.c
index 40263df..40263df 100644
--- a/LuaSL/LuaSL_utilities.c
+++ b/src/LuaSL/LuaSL_utilities.c
diff --git a/src/LuaSL/build.lua b/src/LuaSL/build.lua
new file mode 100755
index 0000000..f86715c
--- /dev/null
+++ b/src/LuaSL/build.lua
@@ -0,0 +1,23 @@
+#!/usr/bin/env lua
+
+local dir = ...
+
+if 'nil' == type(dir) then
+  local build, err = loadfile('../../build.lua')
+  if build then
+    setfenv(build, getfenv(2))
+    build(2)
+  else
+    print("ERROR - " .. err)
+  end
+  dir = workingDir
+end
+
+removeFiles(dir, {'../../LuaSL', '*.o', '*.output', '*.backup', '../../media/LuaSL.edj', 'LuaSL_lexer.h', 'LuaSL_lexer.c', 'LuaSL_lemon_yaccer.h', 'LuaSL_lemon_yaccer.c', 'LuaSL_lemon_yaccer.out'})
+
+-- Run lemon first, flex depends on it to define the symbol values.
+runCommand('lemon',   dir, '../../libraries/lemon/lemon -s -T../../libraries/lemon/lempar.c LuaSL_lemon_yaccer.y')
+runCommand('flex',    dir, 'flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l')
+runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' LuaSL.edc ../../media/LuaSL.edj')
+compileFiles('../../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_threads', 'LuaSL_utilities', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'})
+compileFiles('LuaSL_test', dir, {'LuaSL_test', 'LuaSL_utilities'})
diff --git a/LuaSL/test.sh b/src/LuaSL/test.sh
index 91ee412..1c26ade 100755
--- a/LuaSL/test.sh
+++ b/src/LuaSL/test.sh
@@ -4,21 +4,21 @@ wd=$(pwd)
 
 # Kill any left overs.
 killall -KILL LuaSL
-export LUA_PATH="$wd/?.lua"
+export LUA_PATH="$wd/../../libraries/?.lua"
 
 case $@ in
 
     ddd)
-        ddd ./LuaSL
+        ddd ../../LuaSL
         ;;
 
     gdb)
-        gdb ./LuaSL
+        gdb ../../LuaSL
         ;;
 
     *)
         echo "_______________ STARTING LuaSL _______________"
-        ./LuaSL &
+        ../../LuaSL &
         sleep 1
         echo "_______________ STARTING LuaSL_test _______________"
         ./LuaSL_test
diff --git a/ClientHamr/extantz/CDemo.cpp b/src/extantz/CDemo.cpp
index 0ca40f1..0ca40f1 100644
--- a/ClientHamr/extantz/CDemo.cpp
+++ b/src/extantz/CDemo.cpp
diff --git a/ClientHamr/extantz/CDemo.h b/src/extantz/CDemo.h
index 035c01f..035c01f 100644
--- a/ClientHamr/extantz/CDemo.h
+++ b/src/extantz/CDemo.h
diff --git a/ClientHamr/extantz/build.lua b/src/extantz/build.lua
index 0bb2a0b..0bb2a0b 100755
--- a/ClientHamr/extantz/build.lua
+++ b/src/extantz/build.lua
diff --git a/ClientHamr/extantz/crappisspuke.cpp b/src/extantz/crappisspuke.cpp
index 2af9dde..2af9dde 100644
--- a/ClientHamr/extantz/crappisspuke.cpp
+++ b/src/extantz/crappisspuke.cpp
diff --git a/ClientHamr/extantz/extantz.c b/src/extantz/extantz.c
index 09b5196..09b5196 100644
--- a/ClientHamr/extantz/extantz.c
+++ b/src/extantz/extantz.c
diff --git a/ClientHamr/extantz/extantz.edc b/src/extantz/extantz.edc
index b4ed0b3..b4ed0b3 100644
--- a/ClientHamr/extantz/extantz.edc
+++ b/src/extantz/extantz.edc
diff --git a/ClientHamr/extantz/extantz.h b/src/extantz/extantz.h
index afb94af..afb94af 100644
--- a/ClientHamr/extantz/extantz.h
+++ b/src/extantz/extantz.h
diff --git a/ClientHamr/extantz/extantzCamera.cpp b/src/extantz/extantzCamera.cpp
index 6a7d36a..6a7d36a 100644
--- a/ClientHamr/extantz/extantzCamera.cpp
+++ b/src/extantz/extantzCamera.cpp
diff --git a/ClientHamr/extantz/extantzCamera.h b/src/extantz/extantzCamera.h
index 9d74236..9d74236 100644
--- a/ClientHamr/extantz/extantzCamera.h
+++ b/src/extantz/extantzCamera.h