diff --git a/Makefile b/Makefile
index c208eb3..0e3471c 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ else
 	BINARY = mspdebug
 endif
 
-INCLUDES = -I. -Isimio -Iformats -Idrivers -Iutil
+INCLUDES = -I. -Isimio -Iformats -Idrivers -Iutil -Iui
 GCC_CFLAGS = -O1 -Wall -Wno-char-subscripts -ggdb $(INCLUDES)
 
 MSPDEBUG_LDFLAGS = $(LDFLAGS) $(PORTS_LDFLAGS)
@@ -61,7 +61,6 @@ MSPDEBUG_CFLAGS = $(CFLAGS) $(READLINE_CFLAGS) $(PORTS_CFLAGS) $(GCC_CFLAGS)
 all: $(BINARY)
 
 clean:
-	rm -f *.o
 	rm -f */*.o
 	rm -f $(BINARY)
 
@@ -75,14 +74,6 @@ install: $(BINARY) mspdebug.man
 .SUFFIXES: .c .o
 
 OBJ=\
-    main.o \
-    gdb.o \
-    rtools.o \
-    sym.o \
-    devcmd.o \
-    reader.o \
-    cmddb.o \
-    stdcmd.o \
     util/btree.o \
     util/expr.o \
     util/list.o \
@@ -122,7 +113,15 @@ OBJ=\
     simio/simio_wdt.o \
     simio/simio_hwmult.o \
     simio/simio_gpio.o \
-    aliasdb.o \
+    ui/gdb.o \
+    ui/rtools.o \
+    ui/sym.o \
+    ui/devcmd.o \
+    ui/reader.o \
+    ui/cmddb.o \
+    ui/stdcmd.o \
+    ui/aliasdb.o \
+    ui/main.o
 
 $(BINARY): $(OBJ)
 	$(CC) $(MSPDEBUG_LDFLAGS) -o $@ $^ $(MSPDEBUG_LIBS)
diff --git a/aliasdb.c b/ui/aliasdb.c
similarity index 100%
rename from aliasdb.c
rename to ui/aliasdb.c
diff --git a/aliasdb.h b/ui/aliasdb.h
similarity index 100%
rename from aliasdb.h
rename to ui/aliasdb.h
diff --git a/cmddb.c b/ui/cmddb.c
similarity index 100%
rename from cmddb.c
rename to ui/cmddb.c
diff --git a/cmddb.h b/ui/cmddb.h
similarity index 100%
rename from cmddb.h
rename to ui/cmddb.h
diff --git a/devcmd.c b/ui/devcmd.c
similarity index 100%
rename from devcmd.c
rename to ui/devcmd.c
diff --git a/devcmd.h b/ui/devcmd.h
similarity index 100%
rename from devcmd.h
rename to ui/devcmd.h
diff --git a/gdb.c b/ui/gdb.c
similarity index 100%
rename from gdb.c
rename to ui/gdb.c
diff --git a/gdb.h b/ui/gdb.h
similarity index 100%
rename from gdb.h
rename to ui/gdb.h
diff --git a/main.c b/ui/main.c
similarity index 100%
rename from main.c
rename to ui/main.c
diff --git a/reader.c b/ui/reader.c
similarity index 100%
rename from reader.c
rename to ui/reader.c
diff --git a/reader.h b/ui/reader.h
similarity index 100%
rename from reader.h
rename to ui/reader.h
diff --git a/rtools.c b/ui/rtools.c
similarity index 100%
rename from rtools.c
rename to ui/rtools.c
diff --git a/rtools.h b/ui/rtools.h
similarity index 100%
rename from rtools.h
rename to ui/rtools.h
diff --git a/stdcmd.c b/ui/stdcmd.c
similarity index 100%
rename from stdcmd.c
rename to ui/stdcmd.c
diff --git a/stdcmd.h b/ui/stdcmd.h
similarity index 100%
rename from stdcmd.h
rename to ui/stdcmd.h
diff --git a/sym.c b/ui/sym.c
similarity index 100%
rename from sym.c
rename to ui/sym.c
diff --git a/sym.h b/ui/sym.h
similarity index 100%
rename from sym.h
rename to ui/sym.h