diff --git a/Makefile b/Makefile
index 9cca951..c208eb3 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ else
 	BINARY = mspdebug
 endif
 
-INCLUDES = -I. -Isimio -Iformats -Idrivers
+INCLUDES = -I. -Isimio -Iformats -Idrivers -Iutil
 GCC_CFLAGS = -O1 -Wall -Wno-char-subscripts -ggdb $(INCLUDES)
 
 MSPDEBUG_LDFLAGS = $(LDFLAGS) $(PORTS_LDFLAGS)
@@ -76,25 +76,28 @@ install: $(BINARY) mspdebug.man
 
 OBJ=\
     main.o \
-    dis.o \
-    stab.o \
-    util.o \
     gdb.o \
-    btree.o \
     rtools.o \
     sym.o \
     devcmd.o \
     reader.o \
-    vector.o \
-    output_util.o \
-    expr.o \
-    usbutil.o \
-    opdb.o \
-    output.o \
     cmddb.o \
     stdcmd.o \
-    prog.o \
-    list.o \
+    util/btree.o \
+    util/expr.o \
+    util/list.o \
+    util/sockets.o \
+    util/sport.o \
+    util/usbutil.o \
+    util/util.o \
+    util/vector.o \
+    util/output.o \
+    util/output_util.o \
+    util/opdb.o \
+    util/prog.o \
+    util/stab.o \
+    util/dis.o \
+    util/gdb_proto.o \
     drivers/device.o \
     drivers/bsl.o \
     drivers/fet.o \
@@ -120,9 +123,6 @@ OBJ=\
     simio/simio_hwmult.o \
     simio/simio_gpio.o \
     aliasdb.o \
-    gdb_proto.o \
-    sport.o \
-    sockets.o \
 
 $(BINARY): $(OBJ)
 	$(CC) $(MSPDEBUG_LDFLAGS) -o $@ $^ $(MSPDEBUG_LIBS)
diff --git a/btree.c b/util/btree.c
similarity index 100%
rename from btree.c
rename to util/btree.c
diff --git a/btree.h b/util/btree.h
similarity index 100%
rename from btree.h
rename to util/btree.h
diff --git a/dis.c b/util/dis.c
similarity index 100%
rename from dis.c
rename to util/dis.c
diff --git a/dis.h b/util/dis.h
similarity index 100%
rename from dis.h
rename to util/dis.h
diff --git a/expr.c b/util/expr.c
similarity index 100%
rename from expr.c
rename to util/expr.c
diff --git a/expr.h b/util/expr.h
similarity index 100%
rename from expr.h
rename to util/expr.h
diff --git a/gdb_proto.c b/util/gdb_proto.c
similarity index 100%
rename from gdb_proto.c
rename to util/gdb_proto.c
diff --git a/gdb_proto.h b/util/gdb_proto.h
similarity index 100%
rename from gdb_proto.h
rename to util/gdb_proto.h
diff --git a/list.c b/util/list.c
similarity index 100%
rename from list.c
rename to util/list.c
diff --git a/list.h b/util/list.h
similarity index 100%
rename from list.h
rename to util/list.h
diff --git a/opdb.c b/util/opdb.c
similarity index 100%
rename from opdb.c
rename to util/opdb.c
diff --git a/opdb.h b/util/opdb.h
similarity index 100%
rename from opdb.h
rename to util/opdb.h
diff --git a/output.c b/util/output.c
similarity index 100%
rename from output.c
rename to util/output.c
diff --git a/output.h b/util/output.h
similarity index 100%
rename from output.h
rename to util/output.h
diff --git a/output_util.c b/util/output_util.c
similarity index 100%
rename from output_util.c
rename to util/output_util.c
diff --git a/output_util.h b/util/output_util.h
similarity index 100%
rename from output_util.h
rename to util/output_util.h
diff --git a/prog.c b/util/prog.c
similarity index 100%
rename from prog.c
rename to util/prog.c
diff --git a/prog.h b/util/prog.h
similarity index 100%
rename from prog.h
rename to util/prog.h
diff --git a/sockets.c b/util/sockets.c
similarity index 100%
rename from sockets.c
rename to util/sockets.c
diff --git a/sockets.h b/util/sockets.h
similarity index 100%
rename from sockets.h
rename to util/sockets.h
diff --git a/sport.c b/util/sport.c
similarity index 100%
rename from sport.c
rename to util/sport.c
diff --git a/sport.h b/util/sport.h
similarity index 100%
rename from sport.h
rename to util/sport.h
diff --git a/stab.c b/util/stab.c
similarity index 100%
rename from stab.c
rename to util/stab.c
diff --git a/stab.h b/util/stab.h
similarity index 100%
rename from stab.h
rename to util/stab.h
diff --git a/usbutil.c b/util/usbutil.c
similarity index 100%
rename from usbutil.c
rename to util/usbutil.c
diff --git a/usbutil.h b/util/usbutil.h
similarity index 100%
rename from usbutil.h
rename to util/usbutil.h
diff --git a/util.c b/util/util.c
similarity index 100%
rename from util.c
rename to util/util.c
diff --git a/util.h b/util/util.h
similarity index 100%
rename from util.h
rename to util/util.h
diff --git a/vector.c b/util/vector.c
similarity index 100%
rename from vector.c
rename to util/vector.c
diff --git a/vector.h b/util/vector.h
similarity index 100%
rename from vector.h
rename to util/vector.h