diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index b615f11ba..5bb8f0761 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -1,18 +1,20 @@
-AUTOMAKE_OPTIONS= foreign
+AUTOMAKE_OPTIONS= foreign subdir-objects
 
 QWAQ_LIBS=@QWAQ_LIBS@
 QWAQ_DEPS=@QWAQ_DEPS@
 QWAQ_INCS=@QWAQ_INCS@
 
-AM_CPPFLAGS=	-I$(top_srcdir)/include $(QWAQ_INCS) $(PTHREAD_CFLAGS)
+AM_CPPFLAGS= -I$(srcdir) -I$(top_srcdir)/include $(QWAQ_INCS) $(PTHREAD_CFLAGS)
 
 noinst_PROGRAMS=@QWAQ_TARGETS@ qwaq-app.dat$(EXEEXT) gcd.dat$(EXEEXT)
 
 QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
 QFCC=$(top_builddir)/tools/qfcc/source/qfcc
 
+QCSYSTEM=--no-default-paths -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
+QWAQ_INC=-I$(srcdir) -I$(srcdir)/builtins -I$(srcdir)/debugger -I$(srcdir)/editor -I$(srcdir)/ui
 QCFLAGS=-qq -O -g -Werror
-QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
+QCPPFLAGS=$(QCSYSTEM) -I$(srcdir)
 QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib
 QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
 QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
@@ -24,34 +26,37 @@ SUFFIXES=.o .r
 	@$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo
 
 qwaq_app_dat_src= \
-	qwaq-app.r \
-	qwaq-button.r \
-	qwaq-debugger.r \
-	qwaq-draw.r \
-	qwaq-editbuffer.r \
-	qwaq-editor.r \
-	qwaq-garray.r \
-	qwaq-group.r \
-	qwaq-listener.r \
-	qwaq-proxyview.r \
-	qwaq-rect.r \
-	qwaq-screen.r \
-	qwaq-textcontext.r \
-	qwaq-titlebar.r \
-	qwaq-view.r \
-	qwaq-window.r
+	qwaq-app.r	\
+	debugger/debugger.r	\
+	editor/editbuffer.r	\
+	editor/editor.r	\
+	ui/button.r	\
+	ui/draw.r	\
+	ui/garray.r	\
+	ui/group.r	\
+	ui/listener.r	\
+	ui/proxyview.r	\
+	ui/rect.r	\
+	ui/textcontext.r	\
+	ui/titlebar.r	\
+	ui/view.r	\
+	ui/window.r	\
+	$e
 
 #FIXME this coupling is horrible
 qwaq_curses_libs= \
 	$(top_builddir)/libs/video/targets/libvid_common.la \
 	$(top_builddir)/libs/console/libQFconsole.la \
 	$(top_builddir)/libs/gib/libQFgib.la
+
 qwaq_curses_SOURCES= \
-	main.c \
-	qwaq-curses.c \
-	qwaq-debug.c \
-	qwaq-editbuffer-bi.c \
-	qwaq-input.c
+	builtins/main.c \
+	builtins/curses.c \
+	builtins/debug.c \
+	builtins/editbuffer.c \
+	builtins/input.c \
+	$e
+
 qwaq_curses_LDADD= $(qwaq_curses_libs) $(QWAQ_LIBS) \
 				$(PANEL_LIBS) $(CURSES_LIBS) $(PTHREAD_LDFLAGS) $(DL_LIBS)
 qwaq_curses_LDFLAGS=
@@ -74,7 +79,7 @@ qwaq_x11_libs= \
 	$(top_builddir)/libs/video/targets/libQFx11.la \
 	$(client_libs) \
 	$(top_builddir)/libs/gib/libQFgib.la
-qwaq_x11_SOURCES=qwaq.c qwaq-bi.c
+qwaq_x11_SOURCES=builtins/qwaq.c builtins/qwaq-bi.c
 qwaq_x11_LDADD= $(qwaq_x11_libs) $(QWAQ_LIBS) \
 				$(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
 				$(X_EXTRA_LIBS) $(X_SHM_LIB) $(DL_LIBS)
diff --git a/ruamoko/qwaq/builtins.c b/ruamoko/qwaq/builtins/builtins.c
similarity index 100%
rename from ruamoko/qwaq/builtins.c
rename to ruamoko/qwaq/builtins/builtins.c
diff --git a/ruamoko/qwaq/qwaq-curses.c b/ruamoko/qwaq/builtins/curses.c
similarity index 99%
rename from ruamoko/qwaq/qwaq-curses.c
rename to ruamoko/qwaq/builtins/curses.c
index 26a17b37b..f4db018a0 100644
--- a/ruamoko/qwaq/qwaq-curses.c
+++ b/ruamoko/qwaq/builtins/curses.c
@@ -1,5 +1,5 @@
 /*
-	qwaq-curses.c
+	curses.c
 
 	Ruamoko ncurses wrapper using threading
 
@@ -47,9 +47,9 @@
 #include "QF/sys.h"
 
 #include "qwaq.h"
-#include "qwaq-curses.h"
-#include "qwaq-rect.h"
-#include "qwaq-textcontext.h"
+#include "ui/curses.h"
+#include "ui/rect.h"
+#include "ui/textcontext.h"
 
 #define always_inline inline __attribute__((__always_inline__))
 #define CMD_SIZE(x) sizeof(x)/sizeof(x[0])
diff --git a/ruamoko/qwaq/qwaq-debug.c b/ruamoko/qwaq/builtins/debug.c
similarity index 99%
rename from ruamoko/qwaq/qwaq-debug.c
rename to ruamoko/qwaq/builtins/debug.c
index 4938d8211..c1835f99d 100644
--- a/ruamoko/qwaq/qwaq-debug.c
+++ b/ruamoko/qwaq/builtins/debug.c
@@ -1,5 +1,5 @@
 /*
-	qwaq-debug.c
+	debug.c
 
 	Debugging support
 
@@ -47,9 +47,9 @@
 #include "QF/sys.h"
 
 #include "qwaq.h"
-#include "event.h"
-#include "qwaq-curses.h"
-#include "qwaq-debug.h"
+#include "ui/event.h"
+#include "ui/curses.h"
+#include "debugger/debug.h"
 
 typedef struct qwaq_target_s {
 	progs_t    *pr;
diff --git a/ruamoko/qwaq/qwaq-editbuffer-bi.c b/ruamoko/qwaq/builtins/editbuffer.c
similarity index 99%
rename from ruamoko/qwaq/qwaq-editbuffer-bi.c
rename to ruamoko/qwaq/builtins/editbuffer.c
index 9f457bf10..f834f258c 100644
--- a/ruamoko/qwaq/qwaq-editbuffer-bi.c
+++ b/ruamoko/qwaq/builtins/editbuffer.c
@@ -11,7 +11,7 @@
 #include "QF/txtbuffer.h"
 
 #include "qwaq.h"
-#include "qwaq-editbuffer.h"
+#include "editor/editbuffer.h"
 
 #define always_inline inline __attribute__((__always_inline__))
 
diff --git a/ruamoko/qwaq/qwaq-input.c b/ruamoko/qwaq/builtins/input.c
similarity index 99%
rename from ruamoko/qwaq/qwaq-input.c
rename to ruamoko/qwaq/builtins/input.c
index 543971d44..29d5a6088 100644
--- a/ruamoko/qwaq/qwaq-input.c
+++ b/ruamoko/qwaq/builtins/input.c
@@ -1,5 +1,5 @@
 /*
-	qwaq-input.c
+	input.c
 
 	Input handling
 
@@ -47,8 +47,8 @@
 #include "QF/sys.h"
 
 #include "qwaq.h"
-#include "event.h"
-#include "qwaq-curses.h"
+#include "ui/event.h"
+#include "ui/curses.h"
 
 #define always_inline inline __attribute__((__always_inline__))
 
diff --git a/ruamoko/qwaq/main.c b/ruamoko/qwaq/builtins/main.c
similarity index 99%
rename from ruamoko/qwaq/main.c
rename to ruamoko/qwaq/builtins/main.c
index bbd66bac1..c78a9f9e5 100644
--- a/ruamoko/qwaq/main.c
+++ b/ruamoko/qwaq/builtins/main.c
@@ -53,7 +53,7 @@
 #include "QF/zone.h"
 
 #include "qwaq.h"
-#include "qwaq-debug.h"
+#include "debugger/debug.h"
 
 #define MAX_EDICTS 1024
 
diff --git a/ruamoko/qwaq/qwaq-bi.c b/ruamoko/qwaq/builtins/qwaq-bi.c
similarity index 100%
rename from ruamoko/qwaq/qwaq-bi.c
rename to ruamoko/qwaq/builtins/qwaq-bi.c
diff --git a/ruamoko/qwaq/qwaq.c b/ruamoko/qwaq/builtins/qwaq.c
similarity index 100%
rename from ruamoko/qwaq/qwaq.c
rename to ruamoko/qwaq/builtins/qwaq.c
diff --git a/ruamoko/qwaq/qwaq-debug.h b/ruamoko/qwaq/debugger/debug.h
similarity index 94%
rename from ruamoko/qwaq/qwaq-debug.h
rename to ruamoko/qwaq/debugger/debug.h
index b233f2b07..74ebf1c39 100644
--- a/ruamoko/qwaq/qwaq-debug.h
+++ b/ruamoko/qwaq/debugger/debug.h
@@ -1,7 +1,7 @@
-#ifndef __qwaq_debug_h
-#define __qwaq_debug_h
+#ifndef __qwaq_debugger_debug_h
+#define __qwaq_debugger_debug_h
 
-#include "event.h"
+#include "ui/event.h"
 
 typedef enum {
 	qe_debug_event = 0x0100,
@@ -82,4 +82,4 @@ void QWAQ_DebugTarget_Init (progs_t *pr);
 
 #endif
 
-#endif//__qwaq_debug_h
+#endif//__qwaq_debugger_debug_h
diff --git a/ruamoko/qwaq/qwaq-debugger.h b/ruamoko/qwaq/debugger/debugger.h
similarity index 79%
rename from ruamoko/qwaq/qwaq-debugger.h
rename to ruamoko/qwaq/debugger/debugger.h
index 513ae211b..2fc402291 100644
--- a/ruamoko/qwaq/qwaq-debugger.h
+++ b/ruamoko/qwaq/debugger/debugger.h
@@ -1,9 +1,9 @@
-#ifndef __qwaq_debugger_h
-#define __qwaq_debugger_h
+#ifndef __qwaq_debugger_debugger_h
+#define __qwaq_debugger_debugger_h
 
 #include <Object.h>
 
-#include "qwaq-debug.h"
+#include "debugger/debug.h"
 
 @class ProxyView;
 @class Editor;
@@ -33,4 +33,4 @@
 -handleDebugEvent;
 @end
 
-#endif//__qwaq_debugger_h
+#endif//__qwaq_debugger_debugger_h
diff --git a/ruamoko/qwaq/qwaq-debugger.r b/ruamoko/qwaq/debugger/debugger.r
similarity index 97%
rename from ruamoko/qwaq/qwaq-debugger.r
rename to ruamoko/qwaq/debugger/debugger.r
index a15b6c7de..dde372e36 100644
--- a/ruamoko/qwaq/qwaq-debugger.r
+++ b/ruamoko/qwaq/debugger/debugger.r
@@ -3,13 +3,13 @@
 #include <string.h>
 #include <types.h>
 
+#include "ui/curses.h"
+#include "ui/listener.h"
+#include "ui/proxyview.h"
+#include "ui/window.h"
+#include "debugger/debugger.h"
+#include "editor/editor.h"
 #include "qwaq-app.h"
-#include "qwaq-curses.h"
-#include "qwaq-debugger.h"
-#include "qwaq-editor.h"
-#include "qwaq-listener.h"
-#include "qwaq-proxyview.h"
-#include "qwaq-window.h"
 
 @implementation Debugger
 -(qdb_target_t)debug_target
@@ -66,6 +66,7 @@
 	[locals_window setTitle: "Locals"];
 	locals_view = [[View alloc] initWithRect: {{1, 1}, {38, 8}}
 									 options: ofCanFocus];
+	[locals_view setGrowMode:gfGrowHi];
 	[locals_window insertSelected: locals_view];
 	[application addView: locals_window];
 
diff --git a/ruamoko/qwaq/qwaq-editbuffer.h b/ruamoko/qwaq/editor/editbuffer.h
similarity index 94%
rename from ruamoko/qwaq/qwaq-editbuffer.h
rename to ruamoko/qwaq/editor/editbuffer.h
index 67976d244..72ee9db65 100644
--- a/ruamoko/qwaq/qwaq-editbuffer.h
+++ b/ruamoko/qwaq/editor/editbuffer.h
@@ -1,5 +1,5 @@
-#ifndef __qwaq_editbuffer_h
-#define __qwaq_editbuffer_h
+#ifndef __qwaq_editor_editbuffer_h
+#define __qwaq_editor_editbuffer_h
 
 #ifdef __QFCC__
 #include <Object.h>
@@ -79,4 +79,4 @@ typedef struct qwaq_editbuffer_s {
 
 #endif//!__QFCC__
 
-#endif//__qwaq_editbuffer_h
+#endif//__qwaq_editor_editbuffer_h
diff --git a/ruamoko/qwaq/qwaq-editbuffer.r b/ruamoko/qwaq/editor/editbuffer.r
similarity index 98%
rename from ruamoko/qwaq/qwaq-editbuffer.r
rename to ruamoko/qwaq/editor/editbuffer.r
index d0900a108..2d58e0361 100644
--- a/ruamoko/qwaq/qwaq-editbuffer.r
+++ b/ruamoko/qwaq/editor/editbuffer.r
@@ -1,4 +1,4 @@
-#include "qwaq-editbuffer.h"
+#include "editor/editbuffer.h"
 
 @implementation EditBuffer
 - init = #0;
diff --git a/ruamoko/qwaq/qwaq-editor.h b/ruamoko/qwaq/editor/editor.h
similarity index 83%
rename from ruamoko/qwaq/qwaq-editor.h
rename to ruamoko/qwaq/editor/editor.h
index 01ef35f30..099ae78a3 100644
--- a/ruamoko/qwaq/qwaq-editor.h
+++ b/ruamoko/qwaq/editor/editor.h
@@ -1,8 +1,8 @@
-#ifndef __qwaq_editor_h
-#define __qwaq_editor_h
+#ifndef __qwaq_editor_editor_h
+#define __qwaq_editor_editor_h
 
-#include "qwaq-editbuffer.h"
-#include "qwaq-view.h"
+#include "editor/editbuffer.h"
+#include "ui/view.h"
 
 @class Editor;
 @class EditBuffer;
@@ -35,4 +35,4 @@
 -(string)getWordAt:(Point) pos;	// view relative coordinates
 @end
 
-#endif//__qwaq_editor_h
+#endif//__qwaq_editor_editor_h
diff --git a/ruamoko/qwaq/qwaq-editor.r b/ruamoko/qwaq/editor/editor.r
similarity index 98%
rename from ruamoko/qwaq/qwaq-editor.r
rename to ruamoko/qwaq/editor/editor.r
index f45de395f..f6f78d575 100644
--- a/ruamoko/qwaq/qwaq-editor.r
+++ b/ruamoko/qwaq/editor/editor.r
@@ -1,7 +1,7 @@
 #include <QF/keys.h>
 #include "qwaq-app.h"
-#include "qwaq-editor.h"
-#include "qwaq-listener.h"
+#include "editor/editor.h"
+#include "ui/listener.h"
 
 @implementation Editor
 
diff --git a/ruamoko/qwaq/progs.src.in b/ruamoko/qwaq/progs.src.in
deleted file mode 100644
index c6d4f7070..000000000
--- a/ruamoko/qwaq/progs.src.in
+++ /dev/null
@@ -1,16 +0,0 @@
-qwaq.dat
-
-@srcdir@/defs.qc
-
-@top_srcdir@/ruamoko/lib/plist.r
-@top_srcdir@/ruamoko/lib/qfile.r
-@top_srcdir@/ruamoko/lib/script.r
-@top_srcdir@/ruamoko/lib/string.r
-@top_srcdir@/ruamoko/lib/Object.r
-@top_srcdir@/ruamoko/lib/Protocol.r
-@top_srcdir@/ruamoko/lib/Array.r
-@top_srcdir@/ruamoko/lib/Array+Private.r
-@top_srcdir@/ruamoko/lib/AutoreleasePool.r
-@srcdir@/test.r
-@srcdir@/types.r
-@srcdir@/main.qc
diff --git a/ruamoko/qwaq/qwaq-app.h b/ruamoko/qwaq/qwaq-app.h
index c88d79cec..bf6255740 100644
--- a/ruamoko/qwaq/qwaq-app.h
+++ b/ruamoko/qwaq/qwaq-app.h
@@ -3,8 +3,8 @@
 
 #include <Object.h>
 
-#include "event.h"
-#include "qwaq-rect.h"
+#include "ui/event.h"
+#include "ui/rect.h"
 
 @class Array;
 @class Group;
diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index 19c9740c1..19daf643a 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -3,12 +3,12 @@ int fence;
 #include <AutoreleasePool.h>
 #include <key.h>
 
-#include "color.h"
+#include "ui/color.h"
+#include "ui/curses.h"
+#include "ui/group.h"
+#include "ui/view.h"
+#include "debugger/debugger.h"
 #include "qwaq-app.h"
-#include "qwaq-curses.h"
-#include "qwaq-debugger.h"
-#include "qwaq-group.h"
-#include "qwaq-view.h"
 
 int color_palette[64];
 
diff --git a/ruamoko/qwaq/qwaq-button.h b/ruamoko/qwaq/ui/button.h
similarity index 84%
rename from ruamoko/qwaq/qwaq-button.h
rename to ruamoko/qwaq/ui/button.h
index c855505a9..d407fbbff 100644
--- a/ruamoko/qwaq/qwaq-button.h
+++ b/ruamoko/qwaq/ui/button.h
@@ -1,8 +1,8 @@
-#ifndef __qwaq_button_h
-#define __qwaq_button_h
+#ifndef __qwaq_ui_button_h
+#define __qwaq_ui_button_h
 
-#include "qwaq-draw.h"
-#include "qwaq-view.h"
+#include "ui/draw.h"
+#include "ui/view.h"
 
 @class ListenerGroup;
 
@@ -34,4 +34,4 @@
 - (Point) delta;
 @end
 
-#endif//__qwaq_button_h
+#endif//__qwaq_ui_button_h
diff --git a/ruamoko/qwaq/qwaq-button.r b/ruamoko/qwaq/ui/button.r
similarity index 98%
rename from ruamoko/qwaq/qwaq-button.r
rename to ruamoko/qwaq/ui/button.r
index a02a738c0..38d0690c4 100644
--- a/ruamoko/qwaq/qwaq-button.r
+++ b/ruamoko/qwaq/ui/button.r
@@ -1,5 +1,5 @@
-#include "qwaq-button.h"
-#include "qwaq-listener.h"
+#include "ui/button.h"
+#include "ui/listener.h"
 
 @implementation Button
 -initWithPos: (Point) pos releasedIcon: (DrawBuffer *) released
diff --git a/ruamoko/qwaq/color.h b/ruamoko/qwaq/ui/color.h
similarity index 81%
rename from ruamoko/qwaq/color.h
rename to ruamoko/qwaq/ui/color.h
index 95067b5de..3b5ce2b2a 100644
--- a/ruamoko/qwaq/color.h
+++ b/ruamoko/qwaq/ui/color.h
@@ -1,5 +1,5 @@
-#ifndef __qwaq_color_h
-#define __qwaq_color_h
+#ifndef __qwaq_ui_color_h
+#define __qwaq_ui_color_h
 
 #ifndef COLOR_PAIR
 // double protection in case this header is included in a C file
@@ -18,4 +18,4 @@
 
 #endif
 
-#endif//__qwaq_color_h
+#endif//__qwaq_ui_color_h
diff --git a/ruamoko/qwaq/qwaq-curses.h b/ruamoko/qwaq/ui/curses.h
similarity index 97%
rename from ruamoko/qwaq/qwaq-curses.h
rename to ruamoko/qwaq/ui/curses.h
index 37c9c0712..65143159f 100644
--- a/ruamoko/qwaq/qwaq-curses.h
+++ b/ruamoko/qwaq/ui/curses.h
@@ -1,7 +1,7 @@
-#ifndef __qwaq_curses_h
-#define __qwaq_curses_h
+#ifndef __qwaq_ui_curses_h
+#define __qwaq_ui_curses_h
 
-#include "event.h"
+#include "ui/event.h"
 
 typedef struct box_sides_s {
 	int         ls;
@@ -18,7 +18,7 @@ typedef struct box_corners_s {
 } box_corners_t;
 
 #ifdef __QFCC__
-#include "qwaq-rect.h"
+#include "ui/rect.h"
 
 // names, order and comments lifted from ncurses.h
 typedef enum {
@@ -205,4 +205,4 @@ int qwaq_add_event (qwaq_resources_t *res, qwaq_event_t *event);
 void qwaq_init_cond (rwcond_t *cond);
 #endif
 
-#endif//__qwaq_curses_h
+#endif//__qwaq_ui_curses_h
diff --git a/ruamoko/qwaq/qwaq-draw.h b/ruamoko/qwaq/ui/draw.h
similarity index 91%
rename from ruamoko/qwaq/qwaq-draw.h
rename to ruamoko/qwaq/ui/draw.h
index e7eff51ab..72be7fbf0 100644
--- a/ruamoko/qwaq/qwaq-draw.h
+++ b/ruamoko/qwaq/ui/draw.h
@@ -1,9 +1,9 @@
-#ifndef __qwaq_draw_h
-#define __qwaq_draw_h
+#ifndef __qwaq_ui_draw_h
+#define __qwaq_ui_draw_h
 
 #include <Object.h>
 
-#include "qwaq-rect.h"
+#include "ui/rect.h"
 
 @class DrawBuffer;
 
@@ -43,4 +43,4 @@
 - initWithSize: (Extent) size;
 @end
 
-#endif
+#endif//__qwaq_ui_draw_h
diff --git a/ruamoko/qwaq/qwaq-draw.r b/ruamoko/qwaq/ui/draw.r
similarity index 98%
rename from ruamoko/qwaq/qwaq-draw.r
rename to ruamoko/qwaq/ui/draw.r
index 7d1fbcd58..b9864af6d 100644
--- a/ruamoko/qwaq/qwaq-draw.r
+++ b/ruamoko/qwaq/ui/draw.r
@@ -1,7 +1,7 @@
 #include <string.h>
 
-#include "qwaq-curses.h"
-#include "qwaq-draw.h"
+#include "ui/curses.h"
+#include "ui/draw.h"
 
 @implementation DrawBuffer
 
diff --git a/ruamoko/qwaq/event.h b/ruamoko/qwaq/ui/event.h
similarity index 95%
rename from ruamoko/qwaq/event.h
rename to ruamoko/qwaq/ui/event.h
index d11fd195e..d8fe09c6c 100644
--- a/ruamoko/qwaq/event.h
+++ b/ruamoko/qwaq/ui/event.h
@@ -1,5 +1,5 @@
-#ifndef __qwaq_event_h
-#define __qwaq_event_h
+#ifndef __qwaq_ui_event_h
+#define __qwaq_ui_event_h
 
 typedef enum {
 	qe_mousedown = 0x0001,
@@ -77,4 +77,4 @@ typedef struct qwaq_event_s {
 	};
 } qwaq_event_t;
 
-#endif//__qwaq_event_h
+#endif//__qwaq_ui_event_h
diff --git a/ruamoko/qwaq/qwaq-garray.h b/ruamoko/qwaq/ui/garray.h
similarity index 91%
rename from ruamoko/qwaq/qwaq-garray.h
rename to ruamoko/qwaq/ui/garray.h
index 1a2e53576..3ba1a0ef2 100644
--- a/ruamoko/qwaq/qwaq-garray.h
+++ b/ruamoko/qwaq/ui/garray.h
@@ -1,5 +1,5 @@
-#ifndef __qwaq_garray_h
-#define __qwaq_garray_h
+#ifndef __qwaq_ui_garray_h
+#define __qwaq_ui_garray_h
 
 #include <Array.h>
 
@@ -26,4 +26,4 @@ typedef BOOL condition_func2 (id object, void *anObject, void *data);
 									   with: (void *)data;
 @end
 
-#endif//__qwaq_garray_h
+#endif//__qwaq_ui_garray_h
diff --git a/ruamoko/qwaq/qwaq-garray.r b/ruamoko/qwaq/ui/garray.r
similarity index 97%
rename from ruamoko/qwaq/qwaq-garray.r
rename to ruamoko/qwaq/ui/garray.r
index b3298ffa4..ee6bd0191 100644
--- a/ruamoko/qwaq/qwaq-garray.r
+++ b/ruamoko/qwaq/ui/garray.r
@@ -1,6 +1,6 @@
 #include <Array.h>
-#include "event.h"
-#include "qwaq-garray.h"
+#include "ui/event.h"
+#include "ui/garray.h"
 
 @implementation Array (Group)
 - (void) makeObjectsPerformSelector: (SEL)selector
diff --git a/ruamoko/qwaq/qwaq-group.h b/ruamoko/qwaq/ui/group.h
similarity index 85%
rename from ruamoko/qwaq/qwaq-group.h
rename to ruamoko/qwaq/ui/group.h
index 70e2663a0..b243166b2 100644
--- a/ruamoko/qwaq/qwaq-group.h
+++ b/ruamoko/qwaq/ui/group.h
@@ -1,10 +1,10 @@
-#ifndef __qwaq_group_h
-#define __qwaq_group_h
+#ifndef __qwaq_ui_group_h
+#define __qwaq_ui_group_h
 
 #include <Array.h>
 
-#include "event.h"
-#include "qwaq-draw.h"
+#include "ui/event.h"
+#include "ui/draw.h"
 
 @class View;
 
@@ -40,4 +40,4 @@
 -(void) releaseMouse;
 @end
 
-#endif//__qwaq_group_h
+#endif//__qwaq_ui_group_h
diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/ui/group.r
similarity index 97%
rename from ruamoko/qwaq/qwaq-group.r
rename to ruamoko/qwaq/ui/group.r
index d94d0585f..aa4fb117e 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/ui/group.r
@@ -1,9 +1,9 @@
 #include <Array.h>
-#include "event.h"
-#include "qwaq-draw.h"
-#include "qwaq-garray.h"
-#include "qwaq-group.h"
-#include "qwaq-view.h"
+#include "ui/event.h"
+#include "ui/draw.h"
+#include "ui/garray.h"
+#include "ui/group.h"
+#include "ui/view.h"
 
 @implementation Group
 
diff --git a/ruamoko/qwaq/qwaq-listener.h b/ruamoko/qwaq/ui/listener.h
similarity index 87%
rename from ruamoko/qwaq/qwaq-listener.h
rename to ruamoko/qwaq/ui/listener.h
index 0dd388c2e..e07356ad5 100644
--- a/ruamoko/qwaq/qwaq-listener.h
+++ b/ruamoko/qwaq/ui/listener.h
@@ -1,5 +1,5 @@
-#ifndef __qwaq_listener_h
-#define __qwaq_listener_h
+#ifndef __qwaq_ui_listener_h
+#define __qwaq_ui_listener_h
 
 #include <Object.h>
 
@@ -28,4 +28,4 @@
 -(void) respond: (void *) caller_data withObject:(void *)anObject;
 @end
 
-#endif//__qwaq_listener_h
+#endif//__qwaq_ui_listener_h
diff --git a/ruamoko/qwaq/qwaq-listener.r b/ruamoko/qwaq/ui/listener.r
similarity index 98%
rename from ruamoko/qwaq/qwaq-listener.r
rename to ruamoko/qwaq/ui/listener.r
index 95c27f04c..bdb36ac51 100644
--- a/ruamoko/qwaq/qwaq-listener.r
+++ b/ruamoko/qwaq/ui/listener.r
@@ -1,6 +1,6 @@
 #include <Array.h>
 
-#include "qwaq-listener.h"
+#include "ui/listener.h"
 
 @class Array;
 
diff --git a/ruamoko/qwaq/qwaq-proxyview.h b/ruamoko/qwaq/ui/proxyview.h
similarity index 64%
rename from ruamoko/qwaq/qwaq-proxyview.h
rename to ruamoko/qwaq/ui/proxyview.h
index 449ac5fd6..9a2c23c2e 100644
--- a/ruamoko/qwaq/qwaq-proxyview.h
+++ b/ruamoko/qwaq/ui/proxyview.h
@@ -1,7 +1,7 @@
-#ifndef __qwaq_proxyview_h
-#define __qwaq_proxyview_h
+#ifndef __qwaq_ui_proxyview_h
+#define __qwaq_ui_proxyview_h
 
-#include "qwaq-view.h"
+#include "ui/view.h"
 
 @class Group;
 
@@ -17,4 +17,4 @@
 @interface ProxyView (View) <View, TextContext>
 @end
 
-#endif//__qwaq_proxyview_h
+#endif//__qwaq_ui_proxyview_h
diff --git a/ruamoko/qwaq/qwaq-proxyview.r b/ruamoko/qwaq/ui/proxyview.r
similarity index 92%
rename from ruamoko/qwaq/qwaq-proxyview.r
rename to ruamoko/qwaq/ui/proxyview.r
index b5946eba5..a94c738dc 100644
--- a/ruamoko/qwaq/qwaq-proxyview.r
+++ b/ruamoko/qwaq/ui/proxyview.r
@@ -1,5 +1,5 @@
-#include "qwaq-group.h"
-#include "qwaq-proxyview.h"
+#include "ui/group.h"
+#include "ui/proxyview.h"
 
 @implementation ProxyView
 - (void) forward: (SEL) sel : (@va_list) args
diff --git a/ruamoko/qwaq/qwaq-rect.h b/ruamoko/qwaq/ui/rect.h
similarity index 87%
rename from ruamoko/qwaq/qwaq-rect.h
rename to ruamoko/qwaq/ui/rect.h
index a26f74565..007dcb9e6 100644
--- a/ruamoko/qwaq/qwaq-rect.h
+++ b/ruamoko/qwaq/ui/rect.h
@@ -1,5 +1,5 @@
-#ifndef __qwaq_rect_h
-#define __qwaq_rect_h
+#ifndef __qwaq_ui_rect_h
+#define __qwaq_ui_rect_h
 
 typedef struct Point_s {
 	int         x;
@@ -25,4 +25,4 @@ int rectContainsPoint (Rect rect, Point point);
 Rect clipRect (Rect clipRect, Rect rect);
 #endif
 
-#endif//__qwaq_rect_h
+#endif//__qwaq_ui_rect_h
diff --git a/ruamoko/qwaq/qwaq-rect.r b/ruamoko/qwaq/ui/rect.r
similarity index 98%
rename from ruamoko/qwaq/qwaq-rect.r
rename to ruamoko/qwaq/ui/rect.r
index c2677decc..f2a51cf8d 100644
--- a/ruamoko/qwaq/qwaq-rect.r
+++ b/ruamoko/qwaq/ui/rect.r
@@ -1,4 +1,4 @@
-#include "qwaq-rect.h"
+#include "ui/rect.h"
 
 Rect
 clipRect (Rect clipRect, Rect rect)
diff --git a/ruamoko/qwaq/qwaq-textcontext.h b/ruamoko/qwaq/ui/textcontext.h
similarity index 89%
rename from ruamoko/qwaq/qwaq-textcontext.h
rename to ruamoko/qwaq/ui/textcontext.h
index 2b979c415..898a62c60 100644
--- a/ruamoko/qwaq/qwaq-textcontext.h
+++ b/ruamoko/qwaq/ui/textcontext.h
@@ -1,11 +1,11 @@
-#ifndef __qwaq_textcontect_h
-#define __qwaq_textcontect_h
+#ifndef __qwaq_ui_textcontect_h
+#define __qwaq_ui_textcontect_h
 
 #ifdef __QFCC__
 #include <Object.h>
-#include "qwaq-curses.h"
-#include "qwaq-draw.h"
-#include "qwaq-rect.h"
+#include "ui/curses.h"
+#include "ui/draw.h"
+#include "ui/rect.h"
 
 @class DrawBuffer;
 
@@ -79,4 +79,4 @@ typedef struct qwaq_textcontext_s {
 
 #endif
 
-#endif//__qwaq_textcontect_h
+#endif//__qwaq_ui_textcontect_h
diff --git a/ruamoko/qwaq/qwaq-textcontext.r b/ruamoko/qwaq/ui/textcontext.r
similarity index 98%
rename from ruamoko/qwaq/qwaq-textcontext.r
rename to ruamoko/qwaq/ui/textcontext.r
index 421cdf8eb..6dffaa3e4 100644
--- a/ruamoko/qwaq/qwaq-textcontext.r
+++ b/ruamoko/qwaq/ui/textcontext.r
@@ -1,5 +1,5 @@
-#include "qwaq-draw.h"
-#include "qwaq-textcontext.h"
+#include "ui/draw.h"
+#include "ui/textcontext.h"
 
 @implementation TextContext
 + (int) is_initialized = #0;
diff --git a/ruamoko/qwaq/qwaq-titlebar.h b/ruamoko/qwaq/ui/titlebar.h
similarity index 62%
rename from ruamoko/qwaq/qwaq-titlebar.h
rename to ruamoko/qwaq/ui/titlebar.h
index addfdde4e..b623c52dc 100644
--- a/ruamoko/qwaq/qwaq-titlebar.h
+++ b/ruamoko/qwaq/ui/titlebar.h
@@ -1,7 +1,7 @@
-#ifndef __qwaq_titlebar_h
-#define __qwaq_titlebar_h
+#ifndef __qwaq_ui_titlebar_h
+#define __qwaq_ui_titlebar_h
 
-#include "qwaq-view.h"
+#include "ui/view.h"
 
 @interface TitleBar : View
 {
@@ -13,4 +13,4 @@
 -setTitle:(string) newTitle;
 @end
 
-#endif//__qwaq_titlebar_h
+#endif//__qwaq_ui_titlebar_h
diff --git a/ruamoko/qwaq/qwaq-titlebar.r b/ruamoko/qwaq/ui/titlebar.r
similarity index 90%
rename from ruamoko/qwaq/qwaq-titlebar.r
rename to ruamoko/qwaq/ui/titlebar.r
index 3a5bcfcda..96432280d 100644
--- a/ruamoko/qwaq/qwaq-titlebar.r
+++ b/ruamoko/qwaq/ui/titlebar.r
@@ -1,7 +1,7 @@
 #include <string.h>
 
-#include "qwaq-group.h"
-#include "qwaq-titlebar.h"
+#include "ui/group.h"
+#include "ui/titlebar.h"
 
 @implementation TitleBar
 
diff --git a/ruamoko/qwaq/qwaq-view.h b/ruamoko/qwaq/ui/view.h
similarity index 93%
rename from ruamoko/qwaq/qwaq-view.h
rename to ruamoko/qwaq/ui/view.h
index 052bb2ada..eaa96063b 100644
--- a/ruamoko/qwaq/qwaq-view.h
+++ b/ruamoko/qwaq/ui/view.h
@@ -1,12 +1,12 @@
-#ifndef __qwaq_view_h
-#define __qwaq_view_h
+#ifndef __qwaq_ui_view_h
+#define __qwaq_ui_view_h
 
 #include <Array.h>
 #include <Object.h>
 
-#include "qwaq-draw.h"
-#include "qwaq-rect.h"
-#include "qwaq-textcontext.h"
+#include "ui/draw.h"
+#include "ui/rect.h"
+#include "ui/textcontext.h"
 
 @class Group;
 @class ListenerGroup;
@@ -120,4 +120,4 @@ enum {
 @interface View (TextContext) <TextContext>
 @end
 
-#endif//__qwaq_view_h
+#endif//__qwaq_ui_view_h
diff --git a/ruamoko/qwaq/qwaq-view.r b/ruamoko/qwaq/ui/view.r
similarity index 98%
rename from ruamoko/qwaq/qwaq-view.r
rename to ruamoko/qwaq/ui/view.r
index 8b4077938..e352c8ce3 100644
--- a/ruamoko/qwaq/qwaq-view.r
+++ b/ruamoko/qwaq/ui/view.r
@@ -1,7 +1,7 @@
-#include "qwaq-curses.h"
-#include "qwaq-listener.h"
-#include "qwaq-view.h"
-#include "qwaq-group.h"
+#include "ui/curses.h"
+#include "ui/listener.h"
+#include "ui/view.h"
+#include "ui/group.h"
 
 @implementation View
 
diff --git a/ruamoko/qwaq/qwaq-window.h b/ruamoko/qwaq/ui/window.h
similarity index 81%
rename from ruamoko/qwaq/qwaq-window.h
rename to ruamoko/qwaq/ui/window.h
index a559ed862..bfb25c65a 100644
--- a/ruamoko/qwaq/qwaq-window.h
+++ b/ruamoko/qwaq/ui/window.h
@@ -1,5 +1,5 @@
-#ifndef __qwaq_window_h
-#define __qwaq_window_h
+#ifndef __qwaq_ui_window_h
+#define __qwaq_ui_window_h
 
 #include "Object.h"
 
@@ -7,9 +7,9 @@
 @class Button;
 @class TitleBar;
 
-#include "qwaq-draw.h"
-#include "qwaq-rect.h"
-#include "qwaq-view.h"
+#include "ui/draw.h"
+#include "ui/rect.h"
+#include "ui/view.h"
 
 @interface Window: View
 {
@@ -36,4 +36,4 @@
 -insertSelected: (View *) view;
 @end
 
-#endif//__qwaq_window_h
+#endif//__qwaq_ui_window_h
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/ui/window.r
similarity index 97%
rename from ruamoko/qwaq/qwaq-window.r
rename to ruamoko/qwaq/ui/window.r
index 3741d9acc..e3809bf77 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/ui/window.r
@@ -1,14 +1,14 @@
 #include <Array.h>
 #include <string.h>
 
-#include "event.h"
-#include "qwaq-button.h"
-#include "qwaq-curses.h"
-#include "qwaq-group.h"
-#include "qwaq-listener.h"
-#include "qwaq-titlebar.h"
-#include "qwaq-window.h"
-#include "qwaq-view.h"
+#include "ui/event.h"
+#include "ui/button.h"
+#include "ui/curses.h"
+#include "ui/group.h"
+#include "ui/listener.h"
+#include "ui/titlebar.h"
+#include "ui/window.h"
+#include "ui/view.h"
 
 @implementation Window