diff --git a/Makefile.am b/Makefile.am
index 12ebc18d..91d272d6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,6 +23,12 @@ else
 widgets=
 endif
 
+if HAVE_GUILE
+guile=guile
+else
+guile=
+endif
+
 SUBDIRS=m4 man src $(widgets) $(guile) contrib toys
 
 ACLOCAL_AMFLAGS=-I m4
diff --git a/configure.ac b/configure.ac
index f7823340..f1f85ace 100644
--- a/configure.ac
+++ b/configure.ac
@@ -211,18 +211,6 @@ AM_CONDITIONAL(HAVE_GIO, [test "x$have_gio" = "xyes"])
 AM_CONDITIONAL(BUILD_WIDGETS, [test "x$have_webkit" = "xyes" -a "x$have_gio" = "xyes"])
 
 
-
-###############################################################################
-# use readline (for 'mu server') if it's available
-AC_CHECK_LIB([readline], [main],
-              [AC_SUBST([READLINE_LIBS], ["-lreadline"])
-               AC_DEFINE([HAVE_LIBREADLINE], [1],
-                         [Whether we have readline])])
-###############################################################################
-
-
-
-
 ###############################################################################
 # check for guile & guile-snarf
 AC_PATH_PROG(GUILE_CONFIG, [guile-config], [], [$PATH])
@@ -282,14 +270,14 @@ AS_IF([test "x$PMCCABE" = "xno"],[
 AC_CONFIG_FILES([
 Makefile
 src/Makefile
-src/guile/Makefile
-src/guile/mu/Makefile
 src/tests/Makefile
 widgets/Makefile
+emacs/Makefile
+guile/Makefile
+guile/mu/Makefile
 toys/Makefile
 toys/mug/Makefile
 toys/mug2/Makefile
-toys/mm/Makefile
 man/Makefile
 m4/Makefile
 contrib/Makefile
diff --git a/toys/mm/Makefile.am b/emacs/Makefile.am
similarity index 100%
rename from toys/mm/Makefile.am
rename to emacs/Makefile.am
diff --git a/toys/mm/TODO b/emacs/TODO
similarity index 100%
rename from toys/mm/TODO
rename to emacs/TODO
diff --git a/toys/mm/mm-hdrs.el b/emacs/mm-hdrs.el
similarity index 100%
rename from toys/mm/mm-hdrs.el
rename to emacs/mm-hdrs.el
diff --git a/toys/mm/mm-main.el b/emacs/mm-main.el
similarity index 100%
rename from toys/mm/mm-main.el
rename to emacs/mm-main.el
diff --git a/toys/mm/mm-proc.el b/emacs/mm-proc.el
similarity index 100%
rename from toys/mm/mm-proc.el
rename to emacs/mm-proc.el
diff --git a/toys/mm/mm-send.el b/emacs/mm-send.el
similarity index 100%
rename from toys/mm/mm-send.el
rename to emacs/mm-send.el
diff --git a/toys/mm/mm-tech.org b/emacs/mm-tech.org
similarity index 100%
rename from toys/mm/mm-tech.org
rename to emacs/mm-tech.org
diff --git a/toys/mm/mm-view.el b/emacs/mm-view.el
similarity index 100%
rename from toys/mm/mm-view.el
rename to emacs/mm-view.el
diff --git a/toys/mm/mm.el b/emacs/mm.el
similarity index 100%
rename from toys/mm/mm.el
rename to emacs/mm.el
diff --git a/toys/mm/mm.org b/emacs/mm.org
similarity index 100%
rename from toys/mm/mm.org
rename to emacs/mm.org
diff --git a/src/guile/Makefile.am b/guile/Makefile.am
similarity index 100%
rename from src/guile/Makefile.am
rename to guile/Makefile.am
diff --git a/src/guile/mu-guile-log.c b/guile/mu-guile-log.c
similarity index 100%
rename from src/guile/mu-guile-log.c
rename to guile/mu-guile-log.c
diff --git a/src/guile/mu-guile-log.h b/guile/mu-guile-log.h
similarity index 100%
rename from src/guile/mu-guile-log.h
rename to guile/mu-guile-log.h
diff --git a/src/guile/mu-guile-msg.c b/guile/mu-guile-msg.c
similarity index 100%
rename from src/guile/mu-guile-msg.c
rename to guile/mu-guile-msg.c
diff --git a/src/guile/mu-guile-msg.h b/guile/mu-guile-msg.h
similarity index 100%
rename from src/guile/mu-guile-msg.h
rename to guile/mu-guile-msg.h
diff --git a/src/guile/mu-guile-store.c b/guile/mu-guile-store.c
similarity index 100%
rename from src/guile/mu-guile-store.c
rename to guile/mu-guile-store.c
diff --git a/src/guile/mu-guile-store.h b/guile/mu-guile-store.h
similarity index 100%
rename from src/guile/mu-guile-store.h
rename to guile/mu-guile-store.h
diff --git a/src/guile/mu-guile-util.c b/guile/mu-guile-util.c
similarity index 100%
rename from src/guile/mu-guile-util.c
rename to guile/mu-guile-util.c
diff --git a/src/guile/mu-guile-util.h b/guile/mu-guile-util.h
similarity index 100%
rename from src/guile/mu-guile-util.h
rename to guile/mu-guile-util.h
diff --git a/src/guile/mu-guile.c b/guile/mu-guile.c
similarity index 100%
rename from src/guile/mu-guile.c
rename to guile/mu-guile.c
diff --git a/src/guile/mu-guile.h b/guile/mu-guile.h
similarity index 100%
rename from src/guile/mu-guile.h
rename to guile/mu-guile.h
diff --git a/src/guile/mu.scm b/guile/mu.scm
similarity index 100%
rename from src/guile/mu.scm
rename to guile/mu.scm
diff --git a/src/guile/mu/Makefile.am b/guile/mu/Makefile.am
similarity index 100%
rename from src/guile/mu/Makefile.am
rename to guile/mu/Makefile.am
diff --git a/src/guile/mu/README b/guile/mu/README
similarity index 100%
rename from src/guile/mu/README
rename to guile/mu/README
diff --git a/src/guile/mu/log.scm b/guile/mu/log.scm
similarity index 100%
rename from src/guile/mu/log.scm
rename to guile/mu/log.scm
diff --git a/src/guile/mu/msg.scm b/guile/mu/msg.scm
similarity index 100%
rename from src/guile/mu/msg.scm
rename to guile/mu/msg.scm
diff --git a/src/guile/mu/stats.scm b/guile/mu/stats.scm
similarity index 100%
rename from src/guile/mu/stats.scm
rename to guile/mu/stats.scm
diff --git a/src/guile/mu/store.scm b/guile/mu/store.scm
similarity index 100%
rename from src/guile/mu/store.scm
rename to guile/mu/store.scm
diff --git a/src/Makefile.am b/src/Makefile.am
index fa3e5cb5..5288fdc2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,10 +20,6 @@ include $(top_srcdir)/gtest.mk
 # before decending into tests/
 SUBDIRS= .
 
-if HAVE_GUILE
-SUBDIRS += guile
-endif
-
 if BUILD_TESTS
 SUBDIRS += tests
 endif
@@ -113,9 +109,7 @@ libmu_la_SOURCES=			\
 	mu-util.h
 
 
-
 libmu_la_LIBADD=			\
 	$(XAPIAN_LIBS)			\
 	$(GMIME_LIBS)			\
-	$(GLIB_LIBS)			\
-	$(READLINE_LIBS)
+	$(GLIB_LIBS)