diff --git a/devilspie/Makefile b/devilspie/Makefile
index c9cae33..18636be 100644
--- a/devilspie/Makefile
+++ b/devilspie/Makefile
@@ -8,9 +8,9 @@ run:
 	echo apt install lua-posix
 	./devilspie2 -l
 	./devilspie2 -w
-	sleep 3
-	./devilspie2 -d -e -f scripts
+	./devilspie2 -d -e -f lua
 
 build:
+	reset
 	gcc *.c -o devilspie2 ${PKGINC} \
 	-lwnck-3 -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -llua5.1 -lX11 -lXinerama
diff --git a/devilspie/devilspie2.lua b/devilspie/devilspie2.lua
deleted file mode 100644
index dc11905..0000000
--- a/devilspie/devilspie2.lua
+++ /dev/null
@@ -1,46 +0,0 @@
--- Support Awesome 3.5 WM
-
-local posix	= require("posix");
-local os		= require("os");
-
-local awesome = "/usr/bin/awesome-client"
-if not posix.stat(awesome, "type") == "file" then
-	awesome = nil;
-end
-
--- Check for tiling mode
-function is_tiling()
-	if awesome then
-		return true;
-	end
-	return false;
-end
-
--- Make window floating
--- Parameters: state - true to make window floating, else make window tiled
-function set_tile_floating( state )
-	if not awesome then
-		return nil;
-	end
-
-	if state then state = "true" else state = "false" end
-
-	local xid = get_window_xid();
-
-	local command = "echo ";
-	command = command .. "'";
-	command = command .. " local naughty    = require(\"naughty\");";
-	command = command .. " local awcl       = require(\"awful.client\");";
-	command = command .. " local client     = require(\"client\");";
-	command = command .. " for k, c in pairs( client.get() ) do";
-	command = command .. "     if c.window == " .. xid .. " then";
-	command = command .. "         awcl.floating.set(c, " .. state .. ");";
-	command = command .. "    end";
-	command = command .. " end";
-	command = command .. "'";
-	command = command .. " | ";
-	command = command .. awesome;
-
-	debug_print("Awesome floating: " .. command);
-	return os.execute( command );
-end
diff --git a/devilspie/lauxlib.h b/devilspie/lauxlib.h
deleted file mode 100644
index e69de29..0000000
diff --git a/devilspie/scripts/awesome.lua b/devilspie/lua/awesome.lua
similarity index 100%
rename from devilspie/scripts/awesome.lua
rename to devilspie/lua/awesome.lua
diff --git a/devilspie/scripts/file-header.lua b/devilspie/lua/file-header.lua
similarity index 95%
rename from devilspie/scripts/file-header.lua
rename to devilspie/lua/file-header.lua
index d38fa34..f09459c 100644
--- a/devilspie/scripts/file-header.lua
+++ b/devilspie/lua/file-header.lua
@@ -23,7 +23,7 @@ if grp_name == nil then grp_name = '[nil]' end
 -- Debug output ("devilspie2 -d")
 decorated = get_window_is_decorated() and "yes" or "no"
 debug_print("\nName: '" .. win_name .. "'\nApp: '" .. app_name .. "'\nClass: " .. win_class .. "\nRole: <" .. win_role .. ">")
-debug_print ("Process: '" .. get_process_name() .. "'\nDecorated: " .. decorated)
+debug_print ("Process: '" .. get_process_name() .. "'\nDecorated (jwc note. this is in the lua script): " .. decorated)
 debug_print ("Instance: '" .. ins_name .. "' & '" .. grp_name .. "'")
 
 -- Add your stuff here!