diff --git a/README.md b/README.md
index cc8f408..6fc37a5 100644
--- a/README.md
+++ b/README.md
@@ -78,17 +78,17 @@ You can also do these things by hand and not use installer app for your platform
 Installing on Mac
 -------------------------------------------
 
-This tool requires Python, which is installed by default on Macs. Install by running `install-mac.command` located in the disribution directory. This script creates a new menu option in Arduino and copies itself to the tools directory. Then it will create a local library with the source files.
+This tool requires Python, which is installed by default on Macs. Install by running `install-mac.command` located in the `extras` directory. This script creates a new menu option in Arduino and copies itself to the tools directory. Then it will create a local library with the source files.
 
 Installing on Windows
 -------------------------------------------
 
-This tool is installed by running `teensy_debug.exe` as Administrator. Do this by right-clicking on the file and selecting `Run as administraor`. This program creates a new menu option in Arduino and copies itself to the tools directory. Then it will create a local library with the source files.
+This tool is installed by running `teensy_debug.exe` in `extras` as Administrator. Do this by right-clicking on the file and selecting `Run as administraor`. This program creates a new menu option in Arduino and copies itself to the tools directory. Then it will create a local library with the source files.
 
 Installing on Linux
 -------------------------------------------
 
-Run `install-linux.sh` to install. It assumes your Arduino is installed in `~/arduino`. If this is not so, pass the direction with the `-i=path` option. It will create a local library with the source files.
+Run `install-linux.sh` in `extras` to install. It assumes your Arduino is installed in `~/arduino`. If this is not so, pass the direction with the `-i=path` option. It will create a local library with the source files.
 
 Installing from ZIP file
 -------------------------------------------
diff --git a/extras/Makefile b/extras/Makefile
index 51c0c95..3113ff6 100644
--- a/extras/Makefile
+++ b/extras/Makefile
@@ -1,9 +1,9 @@
-DIST=license.txt TeensyDebug.h TeensyDebug.cpp gdbstub.cpp examples library.properties keywords.txt README.md teensy_debug.exe teensy_debug.py install-linux.sh install-mac.command install-windows.bat
+DIST=license.txt library.properties keywords.txt README.md src examples extras
 
-all: TeensyDebug.zip
+all: ../TeensyDebug.zip
 
-TeensyDebug.zip: $(DIST)
-	zip -r TeensyDebug.zip $(DIST)
+../TeensyDebug.zip: $(DIST)
+	cd ..; zip -r TeensyDebug.zip $(DIST)
 
-teensy_debug.exe:
-	build.bat
\ No newline at end of file
+extras/teensy_debug.exe:
+	cd extras; build.bat
\ No newline at end of file
diff --git a/extras/install-linux.sh b/extras/install-linux.sh
old mode 100644
new mode 100755
diff --git a/extras/install-mac.command b/extras/install-mac.command
old mode 100644
new mode 100755
diff --git a/extras/teensy_debug b/extras/teensy_debug
old mode 100644
new mode 100755
index f11cdb5..8ca9c3c
--- a/extras/teensy_debug
+++ b/extras/teensy_debug
@@ -186,16 +186,17 @@ def installGDB():
   if not os.path.exists(DEST):
     os.makedirs(DEST)
 
-  for i in ("README.md", "library.properties", "keywords.txt", "license.txt", "TeensyDebug.h", "TeensyDebug.cpp", "gdbstub.cpp"):
+  for i in ("../README.md", "../library.properties", "../keywords.txt", "../license.txt"):
     print("Copy %s to %s" % (i, DEST))
     shutil.copy(i, DEST)
 
-  print("Copy examples to %s" % (DEST))
-  try:
-    shutil.rmtree(DEST + '/examples')
-  except:
-    pass
-  shutil.copytree('examples', DEST + '/examples')
+  for dir in ("src", "examples"):
+    print("Copy %s to %s" % (dir, DEST))
+    try:
+      shutil.rmtree(DEST + '/'  + dir)
+    except:
+      pass
+    shutil.copytree('../' +  dir, DEST + '/'  + dir)
 
   print("\nInstallation complete\n")