diff --git a/.gitignore b/.gitignore
index cc3e1ed..24e779d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@
 updateFiles.bat
 .vscode/
 libGUI/libGUI/widget/Keypad.lua
-misc/
+/misc/
diff --git a/account_maker/accountMaker.lua b/account_maker/bin/accountMaker.lua
similarity index 100%
rename from account_maker/accountMaker.lua
rename to account_maker/bin/accountMaker.lua
diff --git a/autocrafter/autocrafter.lua b/autocrafter/bin/autocrafter.lua
similarity index 100%
rename from autocrafter/autocrafter.lua
rename to autocrafter/bin/autocrafter.lua
diff --git a/autocrafter/autocrafterEEPROM.lua b/autocrafter/misc/autocrafterEEPROM.lua
similarity index 100%
rename from autocrafter/autocrafterEEPROM.lua
rename to autocrafter/misc/autocrafterEEPROM.lua
diff --git a/bank_api/bank_api.lua b/bank_api/lib/bank_api.lua
similarity index 100%
rename from bank_api/bank_api.lua
rename to bank_api/lib/bank_api.lua
diff --git a/bank_api/bank_api b/bank_api/man/bank_api
similarity index 100%
rename from bank_api/bank_api
rename to bank_api/man/bank_api
diff --git a/bank_atm/atm.lua b/bank_atm/bin/atm.lua
similarity index 99%
rename from bank_atm/atm.lua
rename to bank_atm/bin/atm.lua
index c0e5115..6676750 100644
--- a/bank_atm/atm.lua
+++ b/bank_atm/bin/atm.lua
@@ -281,7 +281,7 @@ local function init()
 
   card_wait = gui.Screen()
   card_wait:addChild(gui.widget.Rectangle(1, 1, 26, 13, 0xffffff))
-  card_wait:addChild(gui.widget.Image(9, 4, "/usr/data/bank_atm/floppy8x8.pam"))
+  card_wait:addChild(gui.widget.Image(9, 4, "/usr/share/bank_atm/floppy8x8.pam"))
   main_screen:addChild(card_wait)
 
   keypad = gui.widget.Keypad(10, 2, 0xc3c3c3, true, 4)
diff --git a/bank_atm/data/bank_atm/img/floppy8x8.pam b/bank_atm/share/bank_atm/floppy8x8.pam
similarity index 100%
rename from bank_atm/data/bank_atm/img/floppy8x8.pam
rename to bank_atm/share/bank_atm/floppy8x8.pam
diff --git a/bank_client/bankClient.lua b/bank_client/bin/bankClient.lua
similarity index 99%
rename from bank_client/bankClient.lua
rename to bank_client/bin/bankClient.lua
index b2b2ceb..1b2cc33 100644
--- a/bank_client/bankClient.lua
+++ b/bank_client/bin/bankClient.lua
@@ -17,7 +17,7 @@ local B_NAME_POPUP_CLOSE    = "pc"
 local B_NAME_C              = "c"
 local B_NAME_FLOPPY         = "fp"
 local B_NAME_MAGCARD        = "mg"
-local IMG_PATH              = "/usr/data/bank_client/"
+local IMG_PATH              = "/usr/share/bank_client/"
 local mode                  = MODE_IDLE
 
 local touchListenerId   = nil
diff --git a/bank_client/data/bank_client/floppy16x16.pam b/bank_client/share/bank_client/floppy16x16.pam
similarity index 100%
rename from bank_client/data/bank_client/floppy16x16.pam
rename to bank_client/share/bank_client/floppy16x16.pam
diff --git a/bank_client/data/bank_client/floppy4x4.pam b/bank_client/share/bank_client/floppy4x4.pam
similarity index 100%
rename from bank_client/data/bank_client/floppy4x4.pam
rename to bank_client/share/bank_client/floppy4x4.pam
diff --git a/bank_client/data/bank_client/floppy8x8.pam b/bank_client/share/bank_client/floppy8x8.pam
similarity index 100%
rename from bank_client/data/bank_client/floppy8x8.pam
rename to bank_client/share/bank_client/floppy8x8.pam
diff --git a/bank_client/data/bank_client/goldArc.pam b/bank_client/share/bank_client/goldArc.pam
similarity index 100%
rename from bank_client/data/bank_client/goldArc.pam
rename to bank_client/share/bank_client/goldArc.pam
diff --git a/bank_client/data/bank_client/moneybag20x17.pam b/bank_client/share/bank_client/moneybag20x17.pam
similarity index 100%
rename from bank_client/data/bank_client/moneybag20x17.pam
rename to bank_client/share/bank_client/moneybag20x17.pam
diff --git a/bank_dev_tools/accountEdit.lua b/bank_dev_tools/bin/accountEdit.lua
similarity index 100%
rename from bank_dev_tools/accountEdit.lua
rename to bank_dev_tools/bin/accountEdit.lua
diff --git a/bank_server/generateClientAPIconfig.lua b/bank_server/bin/generateClientAPIconfig.lua
similarity index 100%
rename from bank_server/generateClientAPIconfig.lua
rename to bank_server/bin/generateClientAPIconfig.lua
diff --git a/bank_server/generateClientSecret.lua b/bank_server/bin/generateClientSecret.lua
similarity index 100%
rename from bank_server/generateClientSecret.lua
rename to bank_server/bin/generateClientSecret.lua
diff --git a/bank_server/bank_server.lua b/bank_server/rc.d/bank_server.lua
similarity index 100%
rename from bank_server/bank_server.lua
rename to bank_server/rc.d/bank_server.lua
diff --git a/doorCtrl/doorCtrl.lua b/doorCtrl/bin/doorCtrl.lua
similarity index 100%
rename from doorCtrl/doorCtrl.lua
rename to doorCtrl/bin/doorCtrl.lua
diff --git a/doorCtrl/doorCtrl.conf b/doorCtrl/etc/doorCtrl.conf
similarity index 100%
rename from doorCtrl/doorCtrl.conf
rename to doorCtrl/etc/doorCtrl.conf
diff --git a/itemIdCatcher/itemIdCatcher.lua b/itemIdCatcher/bin/itemIdCatcher.lua
similarity index 100%
rename from itemIdCatcher/itemIdCatcher.lua
rename to itemIdCatcher/bin/itemIdCatcher.lua
diff --git a/itemIdCatcher/itemIdCatcher b/itemIdCatcher/man/itemIdCatcher
similarity index 100%
rename from itemIdCatcher/itemIdCatcher
rename to itemIdCatcher/man/itemIdCatcher
diff --git a/libCB/libCB.lua b/libCB/lib/libCB.lua
similarity index 100%
rename from libCB/libCB.lua
rename to libCB/lib/libCB.lua
diff --git a/libCB/libCB b/libCB/man/libCB
similarity index 100%
rename from libCB/libCB
rename to libCB/man/libCB
diff --git a/libClass/libClass.lua b/libClass/lib/libClass.lua
similarity index 100%
rename from libClass/libClass.lua
rename to libClass/lib/libClass.lua
diff --git a/libClass/libClass/Object.lua b/libClass/lib/libClass/Object.lua
similarity index 100%
rename from libClass/libClass/Object.lua
rename to libClass/lib/libClass/Object.lua
diff --git a/libCoin/libCoin.lua b/libCoin/lib/libCoin.lua
similarity index 100%
rename from libCoin/libCoin.lua
rename to libCoin/lib/libCoin.lua
diff --git a/libGUI-extra/libGUI/widget/Keypad.lua b/libGUI-extra/lib/libGUI/widget/Keypad.lua
similarity index 100%
rename from libGUI-extra/libGUI/widget/Keypad.lua
rename to libGUI-extra/lib/libGUI/widget/Keypad.lua
diff --git a/libGUI/openIMG.lua b/libGUI/bin/openIMG.lua
similarity index 100%
rename from libGUI/openIMG.lua
rename to libGUI/bin/openIMG.lua
diff --git a/libGUI/libGUI.lua b/libGUI/lib/libGUI.lua
similarity index 100%
rename from libGUI/libGUI.lua
rename to libGUI/lib/libGUI.lua
diff --git a/libGUI/libGUI/ImageFile.lua b/libGUI/lib/libGUI/ImageFile.lua
similarity index 100%
rename from libGUI/libGUI/ImageFile.lua
rename to libGUI/lib/libGUI/ImageFile.lua
diff --git a/libGUI/libGUI/Screen.lua b/libGUI/lib/libGUI/Screen.lua
similarity index 94%
rename from libGUI/libGUI/Screen.lua
rename to libGUI/lib/libGUI/Screen.lua
index 07d4cb6..60ef32d 100644
--- a/libGUI/libGUI/Screen.lua
+++ b/libGUI/lib/libGUI/Screen.lua
@@ -44,7 +44,7 @@ Screen.draw = function(self, useBuffer)
     gpu.setActiveBuffer(drawBuffer)
   end
   for _, widget in ipairs(self.childs) do
-    if (widget:isVisible()) then widget:draw() end
+    if (widget:isVisible()) then widget:draw(false) end --draw(false) so other screens don't create new buffers
   end
   if (useBuffer) then
     gpu.bitblt(0)
diff --git a/libGUI/libGUI/widget/Image.lua b/libGUI/lib/libGUI/widget/Image.lua
similarity index 94%
rename from libGUI/libGUI/widget/Image.lua
rename to libGUI/lib/libGUI/widget/Image.lua
index f9a47e0..573b54a 100644
--- a/libGUI/libGUI/widget/Image.lua
+++ b/libGUI/lib/libGUI/widget/Image.lua
@@ -61,9 +61,8 @@ Image.setHeight     = function(self) error("Can change a image size", 2) end
 Image.setSize       = function(self) error("Can change a image size", 2) end
 Image.setDrawMethod = function(self, drawMethod) self.private.drawMethod = drawMethod end
 Image.getDrawMethod = function(self) return self.private.drawMethod end
-Image.draw          = function(self, drawMethod)
-  if (drawMethod == nil) then drawMethod = self:getDrawMethod() end
-  if (drawMethod == Image.DRAW_METHOD_NEW) then
+Image.draw          = function(self)
+  if (self:getDrawMethod() == Image.DRAW_METHOD_NEW) then
     self.private.draw.new(self)
   else
     self.private.draw.old(self)
diff --git a/libGUI/libGUI/widget/Input.lua b/libGUI/lib/libGUI/widget/Input.lua
similarity index 100%
rename from libGUI/libGUI/widget/Input.lua
rename to libGUI/lib/libGUI/widget/Input.lua
diff --git a/libGUI/libGUI/widget/Rectangle.lua b/libGUI/lib/libGUI/widget/Rectangle.lua
similarity index 100%
rename from libGUI/libGUI/widget/Rectangle.lua
rename to libGUI/lib/libGUI/widget/Rectangle.lua
diff --git a/libGUI/libGUI/widget/Text.lua b/libGUI/lib/libGUI/widget/Text.lua
similarity index 100%
rename from libGUI/libGUI/widget/Text.lua
rename to libGUI/lib/libGUI/widget/Text.lua
diff --git a/libGUI/libGUI/widget/Widget.lua b/libGUI/lib/libGUI/widget/Widget.lua
similarity index 100%
rename from libGUI/libGUI/widget/Widget.lua
rename to libGUI/lib/libGUI/widget/Widget.lua
diff --git a/libGUIDoc/libGUIExample.lua b/libGUIDoc/bin/libGUIExample.lua
similarity index 100%
rename from libGUIDoc/libGUIExample.lua
rename to libGUIDoc/bin/libGUIExample.lua
diff --git a/lnfs/mount.lnfs.lua b/lnfs/lnfsc/bin/mount.lnfs.lua
similarity index 100%
rename from lnfs/mount.lnfs.lua
rename to lnfs/lnfsc/bin/mount.lnfs.lua
diff --git a/lnfs/lnfs.lua b/lnfs/lnfsc/lib/lnfs.lua
similarity index 100%
rename from lnfs/lnfs.lua
rename to lnfs/lnfsc/lib/lnfs.lua
diff --git a/lnfs/lnfsd b/lnfs/lnfss/man/lnfsd
similarity index 100%
rename from lnfs/lnfsd
rename to lnfs/lnfss/man/lnfsd
diff --git a/lnfs/lnfsd.lua b/lnfs/lnfss/rc.d/lnfsd.lua
similarity index 100%
rename from lnfs/lnfsd.lua
rename to lnfs/lnfss/rc.d/lnfsd.lua
diff --git a/programs.cfg b/programs.cfg
index 903fdd2..72e2fe8 100644
--- a/programs.cfg
+++ b/programs.cfg
@@ -1,8 +1,8 @@
 {
   ["bank_api"] = {
     files = {
-      ["master/bank_api/bank_api.lua"] = "/lib",
-      ["master/bank_api/bank_api"] = "/man"
+      [":master/bank_api/lib/"] = "/lib",
+      [":master/bank_api/man/"] = "/man"
     },
     name = "Bank API",
     description = "API used to send request to the bank server",
@@ -12,8 +12,8 @@
   },
   ["libcb"] = {
     files = {
-      ["master/libCB/libCB.lua"] = "/lib",
-      ["master/libCB/libCB"] = "/man"
+      [":master/libCB/lib/"] = "/lib",
+      [":master/libCB/man/"] = "/man"
     },
     name = "libCB",
     description = "library used to read and write CB",
@@ -23,7 +23,7 @@
   },
   ["bank_dev_tools"] = {
     files = {
-      ["master/bank_dev_tools/accountEdit.lua"] = "/bin"
+      [":master/bank_dev_tools/bin/"] = "/bin"
     },
     name = "bank_dev_tools",
     description = "collection of tools used to help in the bank software development",
@@ -33,9 +33,8 @@
   },
   ["bank_server"] = {
     files = {
-      ["master/bank_server/bank_server.lua"] = "//etc/rc.d",
-      ["master/bank_server/generateClientSecret.lua"] = "/bin",
-      ["master/bank_server/generateClientAPIconfig.lua"] = "/bin"
+      [":master/bank_server/rc./"] = "//etc/rc.d",
+      [":master/bank_server/bin/"] = "/bin"
     },
     dependencies = {
       ["libcb"] = "/"
@@ -48,9 +47,8 @@
   },
   ["libgui"] = {
     files = {
-      ["master/libGUI/libGUI.lua"] = "/lib",
-      [":master/libGUI/libGUI"] = "/lib/libGUI",
-      ["master/libGUI/openIMG.lua"] = "/bin"
+      [":master/libGUI/lib/"] = "/lib",
+      [":master/libGUI/bin/"] = "/bin"
     },
     dependencies = {
       ["libclass"] = "/"
@@ -63,7 +61,7 @@
   },
   ["libgui_extra"] = {
     files = {
-      [":master/libGUI-extra/libGUI"] = "/lib/libGUI"
+      [":master/libGUI-extra/lib/"] = "/lib"
     },
     dependencies = {
       ["libgui"] = "/"
@@ -75,8 +73,8 @@
   },
   ["bank_client"] = {
     files = {
-      [":master/bank_client/data/bank_client"] = "/data/bank_client",
-      ["master/bank_client/bankClient.lua"] = "/bin"
+      [":master/bank_client/share/"] = "/share",
+      [":master/bank_client/bin/"] = "/bin"
     },
     dependencies = {
       ["libgui"] = "/",
@@ -92,8 +90,8 @@
   },
   ["item_id_catcher"] = {
     files = {
-      ["master/itemIdCatcher/itemIdCatcher.lua"] = "/bin",
-      ["master/itemIdCatcher/itemIdCatcher"] = "/man"
+      [":master/itemIdCatcher/bin/"] = "/bin",
+      [":master/itemIdCatcher/man/"] = "/man"
     },
     name = "itemIdCatcher",
     description = "Write id of item in the chest on the top to a file",
@@ -103,7 +101,7 @@
   },
   ["libclass"] = {
     files = {
-      [":master/libClass"] = "/lib"
+      [":/master/libClass/lib/"] = "/lib"
     },
     name = "libClass",
     description = "Class library for lua",
@@ -112,7 +110,7 @@
   },
   ["libcoin"] = {
     files = {
-      [":master/libCoin"] ="/lib"
+      [":/master/libCoin/lib/"] ="/lib"
     },
     name = "libCoin",
     description = "small library used to moved coins from ordinarycoins from one chest to a other",
@@ -121,8 +119,8 @@
   },
   ["bank_atm"] = {
     files = {
-      ["master/bank_atm/atm.lua"] = "/bin",
-      [":master/bank_atm/data/"] = "/data"
+      [":master/bank_atm/bin/"] = "/bin",
+      [":master/bank_atm/share/"] = "/share"
     },
     name = "bank atm",
     description = "atm that work with my bank server",
@@ -138,8 +136,8 @@
   },
   ["door_ctrl"] = {
     files = {
-      ["master/doorCtrl/doorCtrl.lua"] = "/bin",
-      ["?master/doorCtrl/doorCtrl.conf"] = "//etc"
+      [":master/doorCtrl/bin/"] = "/bin",
+      ["?master/doorCtrl/etc/doorCtrl.conf"] = "//etc"
     },
     name = "Door controller",
     description = "Controll your doors with multiple redstone io block",
@@ -152,8 +150,8 @@
   },
   ["autocrafter"] = {
     files = {
-      ["master/autocrafter/autocrafter.lua"] = "/bin",
-      ["master/autocrafter/autocrafterEEPROM.lua"] = "/misc"
+      [":master/autocrafter/bin/"] = "/bin",
+      [":master/autocrafter/misc/"] = "/misc"
     },
     name = "AutoCrafter",
     description = "User a robot linked via a linked card to craft item from a inventory",
@@ -162,8 +160,8 @@
   },
   ["stargate"] = {
     files = {
-      ["master/stargate_ctl/stargate.lua"] = "/bin",
-      [":master/stargate_ctl/data"] = "/data"
+      [":master/stargate_ctl/bin/"] = "/bin",
+      [":master/stargate_ctl/share/"] = "/share"
     },
     name = "Stargate Ctl",
     description = "GUI to controll stargates from SGCraft",
@@ -172,8 +170,8 @@
   },
   ["vending"] = {
     files = {
-      ["master/vending/vending.lua"] = "/bin",
-      [":master/vending/etc/vending"] = "//etc/vending"
+      [":master/vending/bin/"] = "/bin",
+      [":master/vending/etc/vendin/"] = "//etc/vending"
     },
     dependencies = {
       ["libCoin"] = "/",
@@ -186,7 +184,7 @@
   },
   ["bank_account_maker"] = {
     files = {
-      ["master/account_maker/accountMaker.lua"] = "/bin"
+      [":master/account_maker/bin/"] = "/bin"
     },
     dependencies = {
       ["bank_api"] = "/"
@@ -198,8 +196,8 @@
   },
   ["lnfsc"] = {
     files = {
-      ["master/lnfs/lnfs.lua"] = "/lib",
-      ["master/lnfs/mount.lnfs.lua"] = "/bin"
+      [":master/lnfs/lnfsc/lib/"] = "/lib",
+      [":master/lnfs/lnfsc/bin/"] = "/bin"
     },
     name = "Lua Network File System Client",
     description = "Let you mount a files ystem hosted by a other computer using lnfss and use it as if it was a local file system",
@@ -208,8 +206,8 @@
   },
   ["lnfss"] = {
     files = {
-      ["master/lnfs/lnfsd.lua"] = "//etc/rc.d",
-      ["master/lnfs/lnfsd"] = "/man"
+      [":master/lnfs/lnfss/rc./"] = "//etc/rc.d",
+      [":master/lnfs/lnfss/man/"] = "/man"
     },
     name = "Lua Network File System Server",
     description = "Share your local file system with other computers. Root folder is configurable in rc.cfg",
diff --git a/stargate_ctl/stargate.lua b/stargate_ctl/bin/stargate.lua
similarity index 99%
rename from stargate_ctl/stargate.lua
rename to stargate_ctl/bin/stargate.lua
index 663ac05..420b34c 100644
--- a/stargate_ctl/stargate.lua
+++ b/stargate_ctl/bin/stargate.lua
@@ -13,7 +13,7 @@ local WHITELIST_FILE = CONFIG_PATH .. "whitelist.csv"
 local BLACKLIST_FILE = CONFIG_PATH .. "blacklist.csv"
 local CONFIG_FILE    = CONFIG_PATH .. "stargate.cfg"
 local GATE_LIST      = CONFIG_PATH .. "gates.csv"
-local IMG_ROOT       = "/usr/data/stargate/"
+local IMG_ROOT       = "/usr/share/stargate/"
 local IRIS_STATE     = {IMG_ROOT .. "iris1.pam", IMG_ROOT .. "iris2.pam", IMG_ROOT .. "iris3.pam"}
 local GATE_STATE     = {[0] = IMG_ROOT .. "sg00.pam", IMG_ROOT .. "sg01.pam", IMG_ROOT .. "sg02.pam", IMG_ROOT .. "sg03.pam", IMG_ROOT .. "sg04.pam", IMG_ROOT .. "sg05.pam", IMG_ROOT .. "sg06.pam", IMG_ROOT .. "sg07.pam", IMG_ROOT .. "sg08.pam", IMG_ROOT .. "sg09.pam", IMG_ROOT .. "sg10.pam"}
 local VORTEX         = IMG_ROOT .. "vortex.pam"
diff --git a/stargate_ctl/data/stargate/iris1.pam b/stargate_ctl/share/stargate/iris1.pam
similarity index 100%
rename from stargate_ctl/data/stargate/iris1.pam
rename to stargate_ctl/share/stargate/iris1.pam
diff --git a/stargate_ctl/data/stargate/iris2.pam b/stargate_ctl/share/stargate/iris2.pam
similarity index 100%
rename from stargate_ctl/data/stargate/iris2.pam
rename to stargate_ctl/share/stargate/iris2.pam
diff --git a/stargate_ctl/data/stargate/iris3.pam b/stargate_ctl/share/stargate/iris3.pam
similarity index 100%
rename from stargate_ctl/data/stargate/iris3.pam
rename to stargate_ctl/share/stargate/iris3.pam
diff --git a/stargate_ctl/data/stargate/sg00.pam b/stargate_ctl/share/stargate/sg00.pam
similarity index 100%
rename from stargate_ctl/data/stargate/sg00.pam
rename to stargate_ctl/share/stargate/sg00.pam
diff --git a/stargate_ctl/data/stargate/sg01.pam b/stargate_ctl/share/stargate/sg01.pam
similarity index 100%
rename from stargate_ctl/data/stargate/sg01.pam
rename to stargate_ctl/share/stargate/sg01.pam
diff --git a/stargate_ctl/data/stargate/sg02.pam b/stargate_ctl/share/stargate/sg02.pam
similarity index 100%
rename from stargate_ctl/data/stargate/sg02.pam
rename to stargate_ctl/share/stargate/sg02.pam
diff --git a/stargate_ctl/data/stargate/sg03.pam b/stargate_ctl/share/stargate/sg03.pam
similarity index 100%
rename from stargate_ctl/data/stargate/sg03.pam
rename to stargate_ctl/share/stargate/sg03.pam
diff --git a/stargate_ctl/data/stargate/sg04.pam b/stargate_ctl/share/stargate/sg04.pam
similarity index 100%
rename from stargate_ctl/data/stargate/sg04.pam
rename to stargate_ctl/share/stargate/sg04.pam
diff --git a/stargate_ctl/data/stargate/sg05.pam b/stargate_ctl/share/stargate/sg05.pam
similarity index 100%
rename from stargate_ctl/data/stargate/sg05.pam
rename to stargate_ctl/share/stargate/sg05.pam
diff --git a/stargate_ctl/data/stargate/sg06.pam b/stargate_ctl/share/stargate/sg06.pam
similarity index 100%
rename from stargate_ctl/data/stargate/sg06.pam
rename to stargate_ctl/share/stargate/sg06.pam
diff --git a/stargate_ctl/data/stargate/sg07.pam b/stargate_ctl/share/stargate/sg07.pam
similarity index 100%
rename from stargate_ctl/data/stargate/sg07.pam
rename to stargate_ctl/share/stargate/sg07.pam
diff --git a/stargate_ctl/data/stargate/sg08.pam b/stargate_ctl/share/stargate/sg08.pam
similarity index 100%
rename from stargate_ctl/data/stargate/sg08.pam
rename to stargate_ctl/share/stargate/sg08.pam
diff --git a/stargate_ctl/data/stargate/sg09.pam b/stargate_ctl/share/stargate/sg09.pam
similarity index 100%
rename from stargate_ctl/data/stargate/sg09.pam
rename to stargate_ctl/share/stargate/sg09.pam
diff --git a/stargate_ctl/data/stargate/sg10.pam b/stargate_ctl/share/stargate/sg10.pam
similarity index 100%
rename from stargate_ctl/data/stargate/sg10.pam
rename to stargate_ctl/share/stargate/sg10.pam
diff --git a/stargate_ctl/data/stargate/vortex.pam b/stargate_ctl/share/stargate/vortex.pam
similarity index 100%
rename from stargate_ctl/data/stargate/vortex.pam
rename to stargate_ctl/share/stargate/vortex.pam
diff --git a/vending/vending.lua b/vending/bin/vending.lua
similarity index 100%
rename from vending/vending.lua
rename to vending/bin/vending.lua