diff --git a/GNUmakefile b/GNUmakefile
index ece5811..6df49fd 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -15,8 +15,9 @@ E_CFLAGS = $(CFLAGS)
 E_LDFLAGS = $(LDFLAGS) -Lsrc
 E_LIBS = $(LIBS) -lMw
 
-L_OBJS = src/ds.o src/core.o src/default.o src/draw.o src/lowlevel.o src/font.o src/boldfont.o src/image.o
-L_OBJS += src/window.o src/button.o src/frame.o src/menu.o
+L_OBJS = src/core.o src/default.o src/draw.o src/lowlevel.o src/font.o src/boldfont.o
+L_OBJS += src/external/ds.o src/external/image.o
+L_OBJS += src/widget/window.o src/widget/button.o src/widget/frame.o src/widget/menu.o
 
 ifeq ($(TARGET),NetBSD)
 CFLAGS += -I/usr/X11R7/include -I/usr/pkg/include
@@ -34,7 +35,7 @@ endif
 
 ifeq ($(UNIX),1)
 L_CFLAGS += -DUSE_X11
-L_OBJS += src/x11.o
+L_OBJS += src/backend/x11.o
 L_LIBS += -lX11 -lXrender -lXext
 
 GL = -lGL
@@ -48,7 +49,7 @@ OPENGL = 1
 else ifeq ($(WINDOWS),1)
 L_CFLAGS += -DUSE_GDI
 L_LDFLAGS += -Wl,--out-implib,src/libMw.lib -static-libgcc
-L_OBJS += src/gdi.o
+L_OBJS += src/backend/gdi.o
 L_LIBS += -lgdi32
 
 GL = -lopengl32
@@ -62,12 +63,12 @@ endif
 EXAMPLES = examples/example$(EXEC) examples/rotate$(EXEC) examples/image$(EXEC)
 
 ifeq ($(OPENGL),1)
-L_OBJS += src/opengl.o
+L_OBJS += src/widget/opengl.o
 EXAMPLES += examples/opengl$(EXEC)
 endif
 
 ifeq ($(VULKAN),1)
-L_OBJS += src/vulkan.o
+L_OBJS += src/widget/vulkan.o
 EXAMPLES += examples/vulkan$(EXEC)
 endif
 
diff --git a/src/gdi.c b/src/backend/gdi.c
similarity index 100%
rename from src/gdi.c
rename to src/backend/gdi.c
diff --git a/src/x11.c b/src/backend/x11.c
similarity index 100%
rename from src/x11.c
rename to src/backend/x11.c
diff --git a/src/core.c b/src/core.c
index e3ca99e..ab3b131 100644
--- a/src/core.c
+++ b/src/core.c
@@ -1,7 +1,7 @@
 /* $Id$ */
 #include <Mw/Milsko.h>
 
-#include "stb_ds.h"
+#include "external/stb_ds.h"
 
 static void lldrawhandler(MwLL handle, void* data) {
 	MwWidget h = (MwWidget)handle->user;
diff --git a/src/ds.c b/src/external/ds.c
similarity index 100%
rename from src/ds.c
rename to src/external/ds.c
diff --git a/src/image.c b/src/external/image.c
similarity index 100%
rename from src/image.c
rename to src/external/image.c
diff --git a/src/stb_ds.h b/src/external/stb_ds.h
similarity index 100%
rename from src/stb_ds.h
rename to src/external/stb_ds.h
diff --git a/src/stb_image.h b/src/external/stb_image.h
similarity index 100%
rename from src/stb_image.h
rename to src/external/stb_image.h
diff --git a/src/button.c b/src/widget/button.c
similarity index 100%
rename from src/button.c
rename to src/widget/button.c
diff --git a/src/frame.c b/src/widget/frame.c
similarity index 100%
rename from src/frame.c
rename to src/widget/frame.c
diff --git a/src/menu.c b/src/widget/menu.c
similarity index 98%
rename from src/menu.c
rename to src/widget/menu.c
index a7a6609..b56c69a 100644
--- a/src/menu.c
+++ b/src/widget/menu.c
@@ -1,7 +1,7 @@
 /* $Id$ */
 #include <Mw/Milsko.h>
 
-#include "stb_ds.h"
+#include "../external/stb_ds.h"
 
 typedef struct menu menu_t;
 
diff --git a/src/opengl.c b/src/widget/opengl.c
similarity index 100%
rename from src/opengl.c
rename to src/widget/opengl.c
diff --git a/src/vulkan.c b/src/widget/vulkan.c
similarity index 100%
rename from src/vulkan.c
rename to src/widget/vulkan.c
diff --git a/src/window.c b/src/widget/window.c
similarity index 100%
rename from src/window.c
rename to src/widget/window.c