diff --git a/programs/network/netsurf/nsinstall.asm b/programs/network/netsurf/nsinstall.asm
index 4f9c38b06a..baff8bd256 100644
--- a/programs/network/netsurf/nsinstall.asm
+++ b/programs/network/netsurf/nsinstall.asm
@@ -34,9 +34,10 @@ include '../../proc32.inc'
 include '../../dll.inc'
 include '../../debug-fdo.inc'
 include '../../develop/libraries/http/http.inc'
-include '../../notify.inc'
 include '../../string.inc'
 
+include '../../system/notify3/notify.inc'
+
 include 'notify.asm'
 
 virtual at 0
diff --git a/programs/develop/cmd/trunk/build_en.bat b/programs/other/outdated/cmd/trunk/build_en.bat
similarity index 100%
rename from programs/develop/cmd/trunk/build_en.bat
rename to programs/other/outdated/cmd/trunk/build_en.bat
diff --git a/programs/develop/cmd/trunk/build_ge.bat b/programs/other/outdated/cmd/trunk/build_ge.bat
similarity index 100%
rename from programs/develop/cmd/trunk/build_ge.bat
rename to programs/other/outdated/cmd/trunk/build_ge.bat
diff --git a/programs/develop/cmd/trunk/cmd.asm b/programs/other/outdated/cmd/trunk/cmd.asm
similarity index 99%
rename from programs/develop/cmd/trunk/cmd.asm
rename to programs/other/outdated/cmd/trunk/cmd.asm
index 3473b6ec0d..00029a3192 100644
--- a/programs/develop/cmd/trunk/cmd.asm
+++ b/programs/other/outdated/cmd/trunk/cmd.asm
@@ -18,7 +18,7 @@ use32
  dd 0x0
  dd 0x0
 
-include "..\..\..\macros.inc"
+include "..\..\..\..\macros.inc"
 include "lang.inc"
 START:
 
@@ -879,7 +879,7 @@ checmd:
 
  jmp ecmd
 
-err:
+errr:
  call clearsum
 
  call newline
@@ -2051,7 +2051,7 @@ chparam:
  cmp eax,0xfffffff0
  jb cmd_ok
 
- jmp err
+ jmp errr
 
 cls:
  call oldcmd
@@ -2443,7 +2443,7 @@ loop20:
  cmp eax,0xfffffff0
  jb cmd_ok_1
 
- jmp err
+ jmp errr
 
 cmd_ok_1:
  mov eax,dword [count]
diff --git a/programs/develop/cmd/trunk/cmdipc.inc b/programs/other/outdated/cmd/trunk/cmdipc.inc
similarity index 100%
rename from programs/develop/cmd/trunk/cmdipc.inc
rename to programs/other/outdated/cmd/trunk/cmdipc.inc
diff --git a/programs/develop/cmd/trunk/examples/AUTOEXEC.CMD b/programs/other/outdated/cmd/trunk/examples/AUTOEXEC.CMD
similarity index 100%
rename from programs/develop/cmd/trunk/examples/AUTOEXEC.CMD
rename to programs/other/outdated/cmd/trunk/examples/AUTOEXEC.CMD
diff --git a/programs/develop/cmd/trunk/examples/EXAMPLE.CMD b/programs/other/outdated/cmd/trunk/examples/EXAMPLE.CMD
similarity index 100%
rename from programs/develop/cmd/trunk/examples/EXAMPLE.CMD
rename to programs/other/outdated/cmd/trunk/examples/EXAMPLE.CMD
diff --git a/programs/develop/cmd/trunk/examples/HELLO.ASM b/programs/other/outdated/cmd/trunk/examples/HELLO.ASM
similarity index 100%
rename from programs/develop/cmd/trunk/examples/HELLO.ASM
rename to programs/other/outdated/cmd/trunk/examples/HELLO.ASM
diff --git a/programs/develop/cmd/trunk/examples/PARAM.ASM b/programs/other/outdated/cmd/trunk/examples/PARAM.ASM
similarity index 100%
rename from programs/develop/cmd/trunk/examples/PARAM.ASM
rename to programs/other/outdated/cmd/trunk/examples/PARAM.ASM
diff --git a/programs/develop/cmd/trunk/readme.txt b/programs/other/outdated/cmd/trunk/readme.txt
similarity index 100%
rename from programs/develop/cmd/trunk/readme.txt
rename to programs/other/outdated/cmd/trunk/readme.txt
diff --git a/programs/system/notify3/notify.asm b/programs/system/notify3/notify.asm
index 43da7a56a9..64b8a5b158 100644
--- a/programs/system/notify3/notify.asm
+++ b/programs/system/notify3/notify.asm
@@ -7,8 +7,9 @@
     include "../../proc32.inc"
     include "../../dll.inc"
 ;    include "../../debug.inc"
-    include "../../notify.inc"
     include "../../string.inc"
+    
+    include "notify.inc"
 
  LINEH	    equ 12
  MARGIN     equ 12
diff --git a/programs/notify.inc b/programs/system/notify3/notify.inc
similarity index 100%
rename from programs/notify.inc
rename to programs/system/notify3/notify.inc
diff --git a/programs/system/notify3/test_ctrl.asm b/programs/system/notify3/test_ctrl.asm
index 39e320bd20..0c4fcd8816 100644
--- a/programs/system/notify3/test_ctrl.asm
+++ b/programs/system/notify3/test_ctrl.asm
@@ -6,8 +6,9 @@
     include "../../macros.inc"
     include "../../proc32.inc"
 ;    include "../../debug.inc"
-    include "../../notify.inc"
     include "../../string.inc"
+	
+    include "notify.inc"
 
  @entry:
     mcall   68, 11