diff --git a/tools/qfcc/test/aggregate.r b/tools/qfcc/test/old/aggregate.r
similarity index 100%
rename from tools/qfcc/test/aggregate.r
rename to tools/qfcc/test/old/aggregate.r
diff --git a/tools/qfcc/test/base.r b/tools/qfcc/test/old/base.r
similarity index 100%
rename from tools/qfcc/test/base.r
rename to tools/qfcc/test/old/base.r
diff --git a/tools/qfcc/test/bool.r b/tools/qfcc/test/old/bool.r
similarity index 100%
rename from tools/qfcc/test/bool.r
rename to tools/qfcc/test/old/bool.r
diff --git a/tools/qfcc/test/break.r b/tools/qfcc/test/old/break.r
similarity index 100%
rename from tools/qfcc/test/break.r
rename to tools/qfcc/test/old/break.r
diff --git a/tools/qfcc/test/cast.r b/tools/qfcc/test/old/cast.r
similarity index 100%
rename from tools/qfcc/test/cast.r
rename to tools/qfcc/test/old/cast.r
diff --git a/tools/qfcc/test/cast2.r b/tools/qfcc/test/old/cast2.r
similarity index 100%
rename from tools/qfcc/test/cast2.r
rename to tools/qfcc/test/old/cast2.r
diff --git a/tools/qfcc/test/chat.r b/tools/qfcc/test/old/chat.r
similarity index 98%
rename from tools/qfcc/test/chat.r
rename to tools/qfcc/test/old/chat.r
index 37a7319bd..52207b4a5 100644
--- a/tools/qfcc/test/chat.r
+++ b/tools/qfcc/test/old/chat.r
@@ -17,7 +17,7 @@ NO EVENT WILL RYAN "FRIKAC" SMITH BE LIABLE FOR ANY
 GENERAL, CONSEQUENTIAL, INDIRECT, INCIDENTAL,
 EXEMPLARY, OR SPECIAL DAMAGES, EVEN IF RYAN "FRIKAC"
 SMITH HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES, IRRESPECTIVE OF THE CAUSE OF SUCH DAMAGES. 
+DAMAGES, IRRESPECTIVE OF THE CAUSE OF SUCH DAMAGES.
 
 You accept this software on the condition that you
 indemnify and hold harmless Ryan "FrikaC" Smith from
@@ -25,7 +25,7 @@ any and all liability or damages to third parties,
 including attorney fees, court costs, and other
 related costs and expenses, arising out of your use
 of this software irrespective of the cause of said
-liability. 
+liability.
 
 The export from the United States or the subsequent
 reexport of this software is subject to compliance
@@ -34,10 +34,10 @@ control restrictions. You agree that in the event you
 seek to export this software, you assume full
 responsibility for obtaining all necessary export
 licenses and approvals and for assuring compliance
-with applicable reexport restrictions. 
+with applicable reexport restrictions.
 
 Any reproduction of this software must contain
-this notice in its entirety. 
+this notice in its entirety.
 */
 
 #include "libfrikbot.h"
@@ -292,7 +292,7 @@ b_originator == targ
 					break;
 				default:
 					[self say:": lo\n"];
-					[self start_topic:0];	
+					[self start_topic:0];
 					break;
 				}
 			}
diff --git a/tools/qfcc/test/class-end.r b/tools/qfcc/test/old/class-end.r
similarity index 100%
rename from tools/qfcc/test/class-end.r
rename to tools/qfcc/test/old/class-end.r
diff --git a/tools/qfcc/test/class-method.r b/tools/qfcc/test/old/class-method.r
similarity index 100%
rename from tools/qfcc/test/class-method.r
rename to tools/qfcc/test/old/class-method.r
diff --git a/tools/qfcc/test/const.r b/tools/qfcc/test/old/const.r
similarity index 100%
rename from tools/qfcc/test/const.r
rename to tools/qfcc/test/old/const.r
diff --git a/tools/qfcc/test/convert.r b/tools/qfcc/test/old/convert.r
similarity index 100%
rename from tools/qfcc/test/convert.r
rename to tools/qfcc/test/old/convert.r
diff --git a/tools/qfcc/test/dead-block.r b/tools/qfcc/test/old/dead-block.r
similarity index 100%
rename from tools/qfcc/test/dead-block.r
rename to tools/qfcc/test/old/dead-block.r
diff --git a/tools/qfcc/test/debug.r b/tools/qfcc/test/old/debug.r
similarity index 100%
rename from tools/qfcc/test/debug.r
rename to tools/qfcc/test/old/debug.r
diff --git a/tools/qfcc/test/decl.r b/tools/qfcc/test/old/decl.r
similarity index 100%
rename from tools/qfcc/test/decl.r
rename to tools/qfcc/test/old/decl.r
diff --git a/tools/qfcc/test/defs.h b/tools/qfcc/test/old/defs.h
similarity index 99%
rename from tools/qfcc/test/defs.h
rename to tools/qfcc/test/old/defs.h
index 3ac69d44d..32f289291 100644
--- a/tools/qfcc/test/defs.h
+++ b/tools/qfcc/test/old/defs.h
@@ -720,5 +720,3 @@
 @extern float (entity e, float healamount, float ignore) T_Heal; // health function
 
 @extern float(entity targ, entity inflictor) CanDamage;
-
-
diff --git a/tools/qfcc/test/entity-field.r b/tools/qfcc/test/old/entity-field.r
similarity index 100%
rename from tools/qfcc/test/entity-field.r
rename to tools/qfcc/test/old/entity-field.r
diff --git a/tools/qfcc/test/entity-field2.r b/tools/qfcc/test/old/entity-field2.r
similarity index 100%
rename from tools/qfcc/test/entity-field2.r
rename to tools/qfcc/test/old/entity-field2.r
diff --git a/tools/qfcc/test/entity-struct.r b/tools/qfcc/test/old/entity-struct.r
similarity index 100%
rename from tools/qfcc/test/entity-struct.r
rename to tools/qfcc/test/old/entity-struct.r
diff --git a/tools/qfcc/test/enum.r b/tools/qfcc/test/old/enum.r
similarity index 100%
rename from tools/qfcc/test/enum.r
rename to tools/qfcc/test/old/enum.r
diff --git a/tools/qfcc/test/field-alias.r b/tools/qfcc/test/old/field-alias.r
similarity index 99%
rename from tools/qfcc/test/field-alias.r
rename to tools/qfcc/test/old/field-alias.r
index a333f2ba2..234ac7104 100644
--- a/tools/qfcc/test/field-alias.r
+++ b/tools/qfcc/test/old/field-alias.r
@@ -8,4 +8,3 @@ void foo (entity e)
 	e.thinkMethod = @selector(foo:);
 }
 void __obj_exec_class (obj_module_t *msg) = #0;
-
diff --git a/tools/qfcc/test/field.r b/tools/qfcc/test/old/field.r
similarity index 100%
rename from tools/qfcc/test/field.r
rename to tools/qfcc/test/old/field.r
diff --git a/tools/qfcc/test/file-line.r b/tools/qfcc/test/old/file-line.r
similarity index 100%
rename from tools/qfcc/test/file-line.r
rename to tools/qfcc/test/old/file-line.r
diff --git a/tools/qfcc/test/float-int.r b/tools/qfcc/test/old/float-int.r
similarity index 100%
rename from tools/qfcc/test/float-int.r
rename to tools/qfcc/test/old/float-int.r
diff --git a/tools/qfcc/test/fold.r b/tools/qfcc/test/old/fold.r
similarity index 100%
rename from tools/qfcc/test/fold.r
rename to tools/qfcc/test/old/fold.r
diff --git a/tools/qfcc/test/foo.r b/tools/qfcc/test/old/foo.r
similarity index 100%
rename from tools/qfcc/test/foo.r
rename to tools/qfcc/test/old/foo.r
diff --git a/tools/qfcc/test/for.r b/tools/qfcc/test/old/for.r
similarity index 100%
rename from tools/qfcc/test/for.r
rename to tools/qfcc/test/old/for.r
diff --git a/tools/qfcc/test/forward.r b/tools/qfcc/test/old/forward.r
similarity index 100%
rename from tools/qfcc/test/forward.r
rename to tools/qfcc/test/old/forward.r
diff --git a/tools/qfcc/test/func.r b/tools/qfcc/test/old/func.r
similarity index 100%
rename from tools/qfcc/test/func.r
rename to tools/qfcc/test/old/func.r
diff --git a/tools/qfcc/test/gcd.pas b/tools/qfcc/test/old/gcd.pas
similarity index 100%
rename from tools/qfcc/test/gcd.pas
rename to tools/qfcc/test/old/gcd.pas
diff --git a/tools/qfcc/test/gcd.r b/tools/qfcc/test/old/gcd.r
similarity index 100%
rename from tools/qfcc/test/gcd.r
rename to tools/qfcc/test/old/gcd.r
diff --git a/tools/qfcc/test/imp.r b/tools/qfcc/test/old/imp.r
similarity index 100%
rename from tools/qfcc/test/imp.r
rename to tools/qfcc/test/old/imp.r
diff --git a/tools/qfcc/test/int-float.r b/tools/qfcc/test/old/int-float.r
similarity index 100%
rename from tools/qfcc/test/int-float.r
rename to tools/qfcc/test/old/int-float.r
diff --git a/tools/qfcc/test/ivar.r b/tools/qfcc/test/old/ivar.r
similarity index 100%
rename from tools/qfcc/test/ivar.r
rename to tools/qfcc/test/old/ivar.r
diff --git a/tools/qfcc/test/libfrikbot.h b/tools/qfcc/test/old/libfrikbot.h
similarity index 100%
rename from tools/qfcc/test/libfrikbot.h
rename to tools/qfcc/test/old/libfrikbot.h
diff --git a/tools/qfcc/test/linkdef1.r b/tools/qfcc/test/old/linkdef1.r
similarity index 100%
rename from tools/qfcc/test/linkdef1.r
rename to tools/qfcc/test/old/linkdef1.r
diff --git a/tools/qfcc/test/linkdef2.r b/tools/qfcc/test/old/linkdef2.r
similarity index 100%
rename from tools/qfcc/test/linkdef2.r
rename to tools/qfcc/test/old/linkdef2.r
diff --git a/tools/qfcc/test/linkdef3.r b/tools/qfcc/test/old/linkdef3.r
similarity index 100%
rename from tools/qfcc/test/linkdef3.r
rename to tools/qfcc/test/old/linkdef3.r
diff --git a/tools/qfcc/test/local-func.r b/tools/qfcc/test/old/local-func.r
similarity index 100%
rename from tools/qfcc/test/local-func.r
rename to tools/qfcc/test/old/local-func.r
diff --git a/tools/qfcc/test/local-pointer.r b/tools/qfcc/test/old/local-pointer.r
similarity index 100%
rename from tools/qfcc/test/local-pointer.r
rename to tools/qfcc/test/old/local-pointer.r
diff --git a/tools/qfcc/test/local.r b/tools/qfcc/test/old/local.r
similarity index 100%
rename from tools/qfcc/test/local.r
rename to tools/qfcc/test/old/local.r
diff --git a/tools/qfcc/test/membarray.r b/tools/qfcc/test/old/membarray.r
similarity index 99%
rename from tools/qfcc/test/membarray.r
rename to tools/qfcc/test/old/membarray.r
index a1f73691a..d3a219bec 100644
--- a/tools/qfcc/test/membarray.r
+++ b/tools/qfcc/test/old/membarray.r
@@ -56,4 +56,3 @@ typedef struct bot_data_t bot_data_t;
 	b_sound &= ~flag;
 }
 @end
-
diff --git a/tools/qfcc/test/message.r b/tools/qfcc/test/old/message.r
similarity index 100%
rename from tools/qfcc/test/message.r
rename to tools/qfcc/test/old/message.r
diff --git a/tools/qfcc/test/modulo.r b/tools/qfcc/test/old/modulo.r
similarity index 100%
rename from tools/qfcc/test/modulo.r
rename to tools/qfcc/test/old/modulo.r
diff --git a/tools/qfcc/test/move.r b/tools/qfcc/test/old/move.r
similarity index 100%
rename from tools/qfcc/test/move.r
rename to tools/qfcc/test/old/move.r
diff --git a/tools/qfcc/test/nil.r b/tools/qfcc/test/old/nil.r
similarity index 100%
rename from tools/qfcc/test/nil.r
rename to tools/qfcc/test/old/nil.r
diff --git a/tools/qfcc/test/obj.r b/tools/qfcc/test/old/obj.r
similarity index 100%
rename from tools/qfcc/test/obj.r
rename to tools/qfcc/test/old/obj.r
diff --git a/tools/qfcc/test/offset.r b/tools/qfcc/test/old/offset.r
similarity index 100%
rename from tools/qfcc/test/offset.r
rename to tools/qfcc/test/old/offset.r
diff --git a/tools/qfcc/test/overload.r b/tools/qfcc/test/old/overload.r
similarity index 99%
rename from tools/qfcc/test/overload.r
rename to tools/qfcc/test/old/overload.r
index f6cf04aa0..60bd5cf46 100644
--- a/tools/qfcc/test/overload.r
+++ b/tools/qfcc/test/old/overload.r
@@ -28,4 +28,3 @@ void func (string y)
 	func (0.0, "");
 //	func (0, 0, 0, 0, 0.0);
 }
-
diff --git a/tools/qfcc/test/params.qc b/tools/qfcc/test/old/params.qc
similarity index 100%
rename from tools/qfcc/test/params.qc
rename to tools/qfcc/test/old/params.qc
diff --git a/tools/qfcc/test/pointer-param.r b/tools/qfcc/test/old/pointer-param.r
similarity index 100%
rename from tools/qfcc/test/pointer-param.r
rename to tools/qfcc/test/old/pointer-param.r
diff --git a/tools/qfcc/test/prec.qc b/tools/qfcc/test/old/prec.qc
similarity index 100%
rename from tools/qfcc/test/prec.qc
rename to tools/qfcc/test/old/prec.qc
diff --git a/tools/qfcc/test/precedence.r b/tools/qfcc/test/old/precedence.r
similarity index 100%
rename from tools/qfcc/test/precedence.r
rename to tools/qfcc/test/old/precedence.r
diff --git a/tools/qfcc/test/progs.src b/tools/qfcc/test/old/progs.src
similarity index 100%
rename from tools/qfcc/test/progs.src
rename to tools/qfcc/test/old/progs.src
diff --git a/tools/qfcc/test/ptr-array.r b/tools/qfcc/test/old/ptr-array.r
similarity index 100%
rename from tools/qfcc/test/ptr-array.r
rename to tools/qfcc/test/old/ptr-array.r
diff --git a/tools/qfcc/test/ptrderef.r b/tools/qfcc/test/old/ptrderef.r
similarity index 100%
rename from tools/qfcc/test/ptrderef.r
rename to tools/qfcc/test/old/ptrderef.r
diff --git a/tools/qfcc/test/quattest.r b/tools/qfcc/test/old/quattest.r
similarity index 100%
rename from tools/qfcc/test/quattest.r
rename to tools/qfcc/test/old/quattest.r
diff --git a/tools/qfcc/test/redefined.r b/tools/qfcc/test/old/redefined.r
similarity index 100%
rename from tools/qfcc/test/redefined.r
rename to tools/qfcc/test/old/redefined.r
diff --git a/tools/qfcc/test/reference.r b/tools/qfcc/test/old/reference.r
similarity index 100%
rename from tools/qfcc/test/reference.r
rename to tools/qfcc/test/old/reference.r
diff --git a/tools/qfcc/test/selector.r b/tools/qfcc/test/old/selector.r
similarity index 100%
rename from tools/qfcc/test/selector.r
rename to tools/qfcc/test/old/selector.r
diff --git a/tools/qfcc/test/self-this.r b/tools/qfcc/test/old/self-this.r
similarity index 100%
rename from tools/qfcc/test/self-this.r
rename to tools/qfcc/test/old/self-this.r
diff --git a/tools/qfcc/test/semi.r b/tools/qfcc/test/old/semi.r
similarity index 100%
rename from tools/qfcc/test/semi.r
rename to tools/qfcc/test/old/semi.r
diff --git a/tools/qfcc/test/shortcircuit.r b/tools/qfcc/test/old/shortcircuit.r
similarity index 100%
rename from tools/qfcc/test/shortcircuit.r
rename to tools/qfcc/test/old/shortcircuit.r
diff --git a/tools/qfcc/test/state.r b/tools/qfcc/test/old/state.r
similarity index 100%
rename from tools/qfcc/test/state.r
rename to tools/qfcc/test/old/state.r
diff --git a/tools/qfcc/test/storage.r b/tools/qfcc/test/old/storage.r
similarity index 100%
rename from tools/qfcc/test/storage.r
rename to tools/qfcc/test/old/storage.r
diff --git a/tools/qfcc/test/struct-return.r b/tools/qfcc/test/old/struct-return.r
similarity index 99%
rename from tools/qfcc/test/struct-return.r
rename to tools/qfcc/test/old/struct-return.r
index 28f797d8a..d580a9ae4 100644
--- a/tools/qfcc/test/struct-return.r
+++ b/tools/qfcc/test/old/struct-return.r
@@ -45,4 +45,3 @@ void (Foo f) bar =
 //	local val_t v = foo ();
 	local val_t u = [f v];
 }
-
diff --git a/tools/qfcc/test/struct.r b/tools/qfcc/test/old/struct.r
similarity index 99%
rename from tools/qfcc/test/struct.r
rename to tools/qfcc/test/old/struct.r
index 228fe52cc..48f1c131e 100644
--- a/tools/qfcc/test/struct.r
+++ b/tools/qfcc/test/old/struct.r
@@ -52,6 +52,6 @@ typedef enum {
 void test_plist (void)
 {
 	plitem_t pl;
-	
+
 	pl = PL_GetPropertyList ("{}");
 }
diff --git a/tools/qfcc/test/super.r b/tools/qfcc/test/old/super.r
similarity index 100%
rename from tools/qfcc/test/super.r
rename to tools/qfcc/test/old/super.r
diff --git a/tools/qfcc/test/switch.r b/tools/qfcc/test/old/switch.r
similarity index 99%
rename from tools/qfcc/test/switch.r
rename to tools/qfcc/test/old/switch.r
index ea49063ef..e1582304e 100644
--- a/tools/qfcc/test/switch.r
+++ b/tools/qfcc/test/old/switch.r
@@ -50,4 +50,3 @@ duffs_device (int *to, int *from, int count)
 			} while(--n > 0);
 	}
 }
-
diff --git a/tools/qfcc/test/syntax.r b/tools/qfcc/test/old/syntax.r
similarity index 100%
rename from tools/qfcc/test/syntax.r
rename to tools/qfcc/test/old/syntax.r
diff --git a/tools/qfcc/test/test-linkdef b/tools/qfcc/test/old/test-linkdef
similarity index 100%
rename from tools/qfcc/test/test-linkdef
rename to tools/qfcc/test/old/test-linkdef
diff --git a/tools/qfcc/test/test.qc b/tools/qfcc/test/old/test.qc
similarity index 100%
rename from tools/qfcc/test/test.qc
rename to tools/qfcc/test/old/test.qc
diff --git a/tools/qfcc/test/test.r b/tools/qfcc/test/old/test.r
similarity index 100%
rename from tools/qfcc/test/test.r
rename to tools/qfcc/test/old/test.r
diff --git a/tools/qfcc/test/test2.qc b/tools/qfcc/test/old/test2.qc
similarity index 100%
rename from tools/qfcc/test/test2.qc
rename to tools/qfcc/test/old/test2.qc
diff --git a/tools/qfcc/test/thread-jumps.r b/tools/qfcc/test/old/thread-jumps.r
similarity index 100%
rename from tools/qfcc/test/thread-jumps.r
rename to tools/qfcc/test/old/thread-jumps.r
diff --git a/tools/qfcc/test/value.r b/tools/qfcc/test/old/value.r
similarity index 100%
rename from tools/qfcc/test/value.r
rename to tools/qfcc/test/old/value.r
diff --git a/tools/qfcc/test/vector.r b/tools/qfcc/test/old/vector.r
similarity index 100%
rename from tools/qfcc/test/vector.r
rename to tools/qfcc/test/old/vector.r
diff --git a/tools/qfcc/test/vector2.r b/tools/qfcc/test/old/vector2.r
similarity index 100%
rename from tools/qfcc/test/vector2.r
rename to tools/qfcc/test/old/vector2.r
diff --git a/tools/qfcc/test/vector_float.r b/tools/qfcc/test/old/vector_float.r
similarity index 100%
rename from tools/qfcc/test/vector_float.r
rename to tools/qfcc/test/old/vector_float.r
diff --git a/tools/qfcc/test/void-pointer.r b/tools/qfcc/test/old/void-pointer.r
similarity index 100%
rename from tools/qfcc/test/void-pointer.r
rename to tools/qfcc/test/old/void-pointer.r
diff --git a/tools/qfcc/test/void-return.qc b/tools/qfcc/test/old/void-return.qc
similarity index 100%
rename from tools/qfcc/test/void-return.qc
rename to tools/qfcc/test/old/void-return.qc