diff --git a/src/Makefile.am b/src/Makefile.am
index 536778e..8fd835d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-SUBDIRS = widgets dialogs
+SUBDIRS = test
 INCLUDES = \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@@ -10,16 +10,26 @@ bin_PROGRAMS = gnoemoe
 BUILT_SOURCES =	  gm-marshal.c gm-marshal.h
 
 gnoemoe_SOURCES = $(BUILT_SOURCES) \
-		gm-app.c gm-app.h gm-app-view.c gm-app-view.h \
+		gm-app.c gm-app.h  \
 		gm-options.c gm-options.h gm-color-table.c gm-color-table.h \
 		gm-net.c gm-net.h gm-triggers.c gm-triggers.h \
-		gm-world.c gm-world.h gm-world-view.c gm-world-view.h \
-		gm-world-tab.c gm-world-tab.h \
-		gm-world-text-view.c gm-world-text-view.h \
+		gm-world.c gm-world.h  \
 		gm-string.c gm-string.h gm-support.c gm-support.h \
 		gm-editor.c gm-editor.h \
-		gm-world-input-view.c gm-world-input-view.h \
-		gm-pixbuf.c gm-pixbuf.h debug.c debug.h
+		gm-pixbuf.c gm-pixbuf.h debug.c debug.h \
+		widgets/gm-app-view.c widgets/gm-app-view.h \
+		widgets/gm-world-view.c widgets/gm-world-view.h \
+		widgets/gm-world-text-view.c widgets/gm-world-text-view.h \
+		widgets/gm-world-input-view.c widgets/gm-world-input-view.h \
+		widgets/gm-world-tab.c widgets/gm-world-tab.h \
+		widgets/gm-text-scroller.c widgets/gm-text-scroller.h \
+		dialogs/gm-world-info-dialog.c dialogs/gm-world-info-dialog.h \
+		dialogs/gm-world-logs-dialog.c dialogs/gm-world-logs-dialog.h \
+		dialogs/gm-world-properties-dialog.c \
+		dialogs/gm-world-properties-dialog.h \
+		dialogs/gm-worlds-list-dialog.c \
+		dialogs/gm-worlds-list-dialog.h \
+		dialogs/gm-scripts-dialog.c dialogs/gm-scripts-dialog.h
 
 if HAVE_SCRIPT
 gnoemoe_SOURCES += gm-scripts.c gm-scripts.h
@@ -31,8 +41,7 @@ gm-marshal.c: gm-marshal.list $(GLIB_GENMARSHAL)
 	echo "#include \"gm-marshal.h\"" > $@ && \
 	$(GLIB_GENMARSHAL) $< --body --prefix=gm_marshal >> $@
 
-gnoemoe_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) @RUBYLINK@ \
-	dialogs/libdialogs.la
+gnoemoe_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) @RUBYLINK@
 
 CLEANFILES = $(BUILT_SOURCES)