diff --git a/Makefile.am b/Makefile.am
index e1d16fc9..22106c28 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,6 +60,9 @@ include moo/mooapp/Makefile.incl
 include moo/mooapp/glade/Makefile.incl
 # moopython
 include moo/moopython/Makefile.incl
+include moo/moopython/codegen/Makefile.incl
+include moo/moopython/module/Makefile.incl
+include moo/moopython/plugins/Makefile.incl
 
 # moo_libincludedir = $(libdir)/moo-1.0/include
 # moo_libinclude_HEADERS = $(moo_libinclude_headers)
diff --git a/configure.ac b/configure.ac
index b0efc1f4..3300d5d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -218,7 +218,7 @@ Makefile
 moo/moo-config.h
 moo/mooterm/termhelper_res.rc
 moo/mooutils/pcre/pcre.h
-moo/moopython/moo-mod.py
+moo/moopython/module/moo-mod.py
 moo/moo.pc
 tests/pyapp.py
 m4/Makefile
diff --git a/moo/moopython/Makefile.incl b/moo/moopython/Makefile.incl
index b7b024a6..941aa8be 100644
--- a/moo/moopython/Makefile.incl
+++ b/moo/moopython/Makefile.incl
@@ -5,182 +5,6 @@
 moopython = $(moo_prefix)/moopython
 moopython_srcdir = $(srcdir)/$(moopython)
 
-moopython_plugins =                           \
-    $(moopython)/plugins/console.py           \
-    $(moopython)/plugins/pyconsole.py         \
-    $(moopython)/plugins/pystuff.py
-
-moopython_codegen =                           \
-    $(moopython)/codegen/__init__.py          \
-    $(moopython)/codegen/argtypes.py          \
-    $(moopython)/codegen/codegen.py           \
-    $(moopython)/codegen/definitions.py       \
-    $(moopython)/codegen/defsparser.py        \
-    $(moopython)/codegen/docgen.py            \
-    $(moopython)/codegen/mergedefs.py         \
-    $(moopython)/codegen/mkskel.py            \
-    $(moopython)/codegen/override.py          \
-    $(moopython)/codegen/reversewrapper.py    \
-    $(moopython)/codegen/scmexpr.py
-
-moopython_sources =                           \
-    $(moopython)/moo-pygtk.c                  \
-    $(moopython)/moo-pygtk.h                  \
-    $(moopython)/mooapp-mod.h                 \
-    $(moopython)/mooedit-mod.h                \
-    $(moopython)/mooterm-mod.h                \
-    $(moopython)/mooutils-mod.h               \
-    $(moopython)/moo-mod.h
-
-moopython_built_sources =                     \
-    $(moopython)/mooapp-mod.h                 \
-    $(moopython)/mooedit-mod.h                \
-    $(moopython)/mooterm-mod.h                \
-    $(moopython)/mooutils-mod.h               \
-    $(moopython)/moo-mod.h
-
-nodist_moopython_sources =
-moopython_cleanfiles = $(moopython)/moo-mod.h
-
-mooedit_defs_files =                          \
-    $(moopython)/mooeditor.defs               \
-    $(moopython)/mooplugin.defs
-
-# mooutils_override_files =                     \
-#     $(moopython)/moowindow.override
-
-moopython_extra_dist =                        \
-    $(moopython_plugins)                      \
-    $(moopython_codegen)                      \
-    $(moopython)/moo-mod.py                   \
-    $(moopython)/moo-pygtk.c                  \
-    $(moopython)/mooapp-mod.py                \
-    $(moopython)/mooapp-pygtk.defs            \
-    $(moopython)/mooapp-pygtk.override        \
-    $(moopython)/mooapp-mod.c                 \
-    $(mooedit_defs_files)                     \
-    $(moopython)/mooedit-mod.py               \
-    $(moopython)/mooedit-pygtk.defs           \
-    $(moopython)/mooedit-pygtk.override       \
-    $(moopython)/mooedit-mod.c                \
-    $(moopython)/mooterm-mod.py               \
-    $(moopython)/mooterm-pygtk.defs           \
-    $(moopython)/mooterm-pygtk.override       \
-    $(moopython)/mooterm-mod.c                \
-    $(moopython)/mooutils-mod.py              \
-    $(moopython)/mooutils-pygtk.defs          \
-    $(moopython)/mooutils-pygtk.override      \
-    $(moopython)/mooutils-mod.c               \
-    $(mooutils_defs_files)                    \
-    $(mooutils_override_files)
-
-
-if MOO_BUILD_UTILS
-moopython_sources += $(moopython)/mooutils-mod.c
-nodist_moopython_sources += $(moopython)/mooutils-pygtk.c
-moopython_built_sources += $(moopython)/mooutils-pygtk.c
-moopython_cleanfiles += $(moopython)/mooutils-pygtk.c
-endif MOO_BUILD_UTILS
-
-if MOO_BUILD_TERM
-moopython_sources += $(moopython)/mooterm-mod.c
-nodist_moopython_sources += $(moopython)/mooterm-pygtk.c
-moopython_built_sources += $(moopython)/mooterm-pygtk.c
-moopython_cleanfiles += $(moopython)/mooterm-pygtk.c
-endif MOO_BUILD_TERM
-
-if MOO_BUILD_EDIT
-moopython_sources += $(moopython)/mooedit-mod.c
-nodist_moopython_sources += $(moopython)/mooedit-pygtk.c
-moopython_built_sources += $(moopython)/mooedit-pygtk.c
-moopython_cleanfiles += $(moopython)/mooedit-pygtk.c
-endif MOO_BUILD_EDIT
-
-if MOO_BUILD_APP
-moopython_sources += $(moopython)/mooapp-mod.c
-nodist_moopython_sources += $(moopython)/mooapp-pygtk.c
-moopython_built_sources += $(moopython)/mooapp-pygtk.c
-moopython_cleanfiles += $(moopython)/mooapp-pygtk.c
-endif MOO_BUILD_APP
-
-if MOO_OS_MINGW
-codegen_platform = --platform win32
-endif
-
-$(moopython)/mooutils-pygtk.c: $(moopython)/mooutils-pygtk.defs $(moopython)/mooutils-pygtk.override $(mooutils_override_files)
-	mkdir -p $(moopython)
-	$(PYTHON) $(moopython_srcdir)/codegen/codegen.py \
-	--prefix _moo_utils $(codegen_platform) \
-	--register $(PYGTK_DEFS_DIR)/gtk-types.defs \
-	--register $(PYGTK_DEFS_DIR)/gdk-types.defs \
-	--override $(moopython_srcdir)/mooutils-pygtk.override \
-	--outfilename $(moopython)/mooutils-pygtk.c \
-	$(moopython_srcdir)/mooutils-pygtk.defs > $(moopython)/mooutils-pygtk.c
-
-$(moopython)/mooterm-pygtk.c: $(moopython)/mooterm-pygtk.defs $(moopython)/mooterm-pygtk.override
-	mkdir -p $(moopython)
-	$(PYTHON) $(moopython_srcdir)/codegen/codegen.py \
-	--prefix _moo_term $(codegen_platform) \
-	--register $(PYGTK_DEFS_DIR)/gtk-types.defs \
-	--register $(PYGTK_DEFS_DIR)/gdk-types.defs \
-	--register $(moopython_srcdir)/mooutils-pygtk.defs \
-	--override $(moopython_srcdir)/mooterm-pygtk.override \
-	--outfilename $(moopython)/mooterm-pygtk.c \
-	$(moopython_srcdir)/mooterm-pygtk.defs > $(moopython)/mooterm-pygtk.c
-
-$(moopython)/mooedit-pygtk.c: $(moopython)/mooedit-pygtk.defs $(moopython)/mooedit-pygtk.override $(mooedit_defs_files)
-	mkdir -p $(moopython)
-	$(PYTHON) $(moopython_srcdir)/codegen/codegen.py \
-	--prefix _moo_edit $(codegen_platform) \
-	--register $(PYGTK_DEFS_DIR)/gtk-types.defs \
-	--register $(PYGTK_DEFS_DIR)/gdk-types.defs \
-	--register $(moopython_srcdir)/mooutils-pygtk.defs \
-	--override $(moopython_srcdir)/mooedit-pygtk.override \
-	--outfilename $(moopython)/mooedit-pygtk.c \
-	$(moopython_srcdir)/mooedit-pygtk.defs > $(moopython)/mooedit-pygtk.c
-
-$(moopython)/mooapp-pygtk.c: $(moopython)/mooapp-pygtk.defs $(moopython)/mooapp-pygtk.override
-	mkdir -p $(moopython)
-	$(PYTHON) $(moopython_srcdir)/codegen/codegen.py \
-	--prefix _moo_app $(codegen_platform) \
-	--register $(PYGTK_DEFS_DIR)/gtk-types.defs \
-	--register $(PYGTK_DEFS_DIR)/gdk-types.defs \
-	--register $(moopython_srcdir)/mooedit-pygtk.defs \
-	--register $(moopython_srcdir)/mooterm-pygtk.defs \
-	--register $(moopython_srcdir)/mooutils-pygtk.defs \
-	--override $(moopython_srcdir)/mooapp-pygtk.override \
-	--outfilename $(moopython)/mooapp-pygtk.c \
-	$(moopython_srcdir)/mooapp-pygtk.defs > $(moopython)/mooapp-pygtk.c
-
-$(moopython)/moo-mod.h: $(moopython)/moo-mod.py $(PY2H)
-	mkdir -p $(moopython)
-	sh $(PY2H) MOO_PY $(moopython)/moo-mod.py > $(moopython)/moo-mod.h
-$(moopython)/mooedit-mod.h: $(moopython)/mooedit-mod.py $(PY2H)
-	mkdir -p $(moopython)
-	sh $(PY2H) MOO_EDIT_PY $(moopython_srcdir)/mooedit-mod.py > $(moopython)/mooedit-mod.h
-$(moopython)/mooapp-mod.h: $(moopython)/mooapp-mod.py $(PY2H)
-	mkdir -p $(moopython)
-	sh $(PY2H) MOO_APP_PY $(moopython_srcdir)/mooapp-mod.py > $(moopython)/mooapp-mod.h
-$(moopython)/mooutils-mod.h: $(moopython)/mooutils-mod.py $(PY2H)
-	mkdir -p $(moopython)
-	sh $(PY2H) MOO_UTILS_PY $(moopython_srcdir)/mooutils-mod.py > $(moopython)/mooutils-mod.h
-$(moopython)/mooterm-mod.h: $(moopython)/mooterm-mod.py $(PY2H)
-	mkdir -p $(moopython)
-	sh $(PY2H) MOO_TERM_PY $(moopython_srcdir)/mooterm-mod.py > $(moopython)/mooterm-mod.h
-
-if MOO_USE_PYGTK
-moo_sources += $(moopython_sources)
-moo_built_sources += $(moopython_built_sources)
-moo_nodist_sources += $(nodist_moopython_sources)
-moo_cleanfiles += $(moopython_cleanfiles)
-endif
-
-moo_extra_dist += $(moopython_extra_dist)
-
-
-###########################################################################
-# Python plugin
-
 mooplugin_python_sources =                      \
     $(moopython)/mooplugin-python.c             \
     $(moopython)/mooplugin-python.h
diff --git a/moo/moopython/codegen/Makefile.incl b/moo/moopython/codegen/Makefile.incl
new file mode 100644
index 00000000..a17d90fe
--- /dev/null
+++ b/moo/moopython/codegen/Makefile.incl
@@ -0,0 +1,16 @@
+#
+# moo/moopython/codegen/Makefile.incl
+#
+
+moo_extra_dist +=                             \
+    $(moopython)/codegen/__init__.py          \
+    $(moopython)/codegen/argtypes.py          \
+    $(moopython)/codegen/codegen.py           \
+    $(moopython)/codegen/definitions.py       \
+    $(moopython)/codegen/defsparser.py        \
+    $(moopython)/codegen/docgen.py            \
+    $(moopython)/codegen/mergedefs.py         \
+    $(moopython)/codegen/mkskel.py            \
+    $(moopython)/codegen/override.py          \
+    $(moopython)/codegen/reversewrapper.py    \
+    $(moopython)/codegen/scmexpr.py
diff --git a/moo/moopython/module/Makefile.incl b/moo/moopython/module/Makefile.incl
new file mode 100644
index 00000000..9c393adb
--- /dev/null
+++ b/moo/moopython/module/Makefile.incl
@@ -0,0 +1,158 @@
+#
+# moo/moopython/Makefile.incl
+#
+
+moomodule = $(moopython)/module
+moomodule_srcdir = $(srcdir)/$(moomodule)
+
+moomodule_sources =                           \
+    $(moomodule)/moo-pygtk.c                  \
+    $(moomodule)/moo-pygtk.h                  \
+    $(moomodule)/mooapp-mod.h                 \
+    $(moomodule)/mooedit-mod.h                \
+    $(moomodule)/mooterm-mod.h                \
+    $(moomodule)/mooutils-mod.h               \
+    $(moomodule)/moo-mod.h
+
+moomodule_built_sources =                     \
+    $(moomodule)/mooapp-mod.h                 \
+    $(moomodule)/mooedit-mod.h                \
+    $(moomodule)/mooterm-mod.h                \
+    $(moomodule)/mooutils-mod.h               \
+    $(moomodule)/moo-mod.h
+
+nodist_moomodule_sources =
+moomodule_cleanfiles = $(moomodule)/moo-mod.h
+
+mooedit_defs_files =                          \
+    $(moomodule)/mooeditor.defs               \
+    $(moomodule)/mooplugin.defs
+
+# mooutils_override_files =                     \
+#     $(moomodule)/moowindow.override
+
+moomodule_extra_dist =                        \
+    $(moomodule)/moo-mod.py                   \
+    $(moomodule)/moo-pygtk.c                  \
+    $(moomodule)/mooapp-mod.py                \
+    $(moomodule)/mooapp-pygtk.defs            \
+    $(moomodule)/mooapp-pygtk.override        \
+    $(moomodule)/mooapp-mod.c                 \
+    $(mooedit_defs_files)                     \
+    $(moomodule)/mooedit-mod.py               \
+    $(moomodule)/mooedit-pygtk.defs           \
+    $(moomodule)/mooedit-pygtk.override       \
+    $(moomodule)/mooedit-mod.c                \
+    $(moomodule)/mooterm-mod.py               \
+    $(moomodule)/mooterm-pygtk.defs           \
+    $(moomodule)/mooterm-pygtk.override       \
+    $(moomodule)/mooterm-mod.c                \
+    $(moomodule)/mooutils-mod.py              \
+    $(moomodule)/mooutils-pygtk.defs          \
+    $(moomodule)/mooutils-pygtk.override      \
+    $(moomodule)/mooutils-mod.c               \
+    $(mooutils_defs_files)                    \
+    $(mooutils_override_files)
+
+
+if MOO_BUILD_UTILS
+moomodule_sources += $(moomodule)/mooutils-mod.c
+nodist_moomodule_sources += $(moomodule)/mooutils-pygtk.c
+moomodule_built_sources += $(moomodule)/mooutils-pygtk.c
+moomodule_cleanfiles += $(moomodule)/mooutils-pygtk.c
+endif MOO_BUILD_UTILS
+
+if MOO_BUILD_TERM
+moomodule_sources += $(moomodule)/mooterm-mod.c
+nodist_moomodule_sources += $(moomodule)/mooterm-pygtk.c
+moomodule_built_sources += $(moomodule)/mooterm-pygtk.c
+moomodule_cleanfiles += $(moomodule)/mooterm-pygtk.c
+endif MOO_BUILD_TERM
+
+if MOO_BUILD_EDIT
+moomodule_sources += $(moomodule)/mooedit-mod.c
+nodist_moomodule_sources += $(moomodule)/mooedit-pygtk.c
+moomodule_built_sources += $(moomodule)/mooedit-pygtk.c
+moomodule_cleanfiles += $(moomodule)/mooedit-pygtk.c
+endif MOO_BUILD_EDIT
+
+if MOO_BUILD_APP
+moomodule_sources += $(moomodule)/mooapp-mod.c
+nodist_moomodule_sources += $(moomodule)/mooapp-pygtk.c
+moomodule_built_sources += $(moomodule)/mooapp-pygtk.c
+moomodule_cleanfiles += $(moomodule)/mooapp-pygtk.c
+endif MOO_BUILD_APP
+
+if MOO_OS_MINGW
+codegen_platform = --platform win32
+endif
+
+$(moomodule)/mooutils-pygtk.c: $(moomodule)/mooutils-pygtk.defs $(moomodule)/mooutils-pygtk.override $(mooutils_override_files)
+	mkdir -p $(moomodule)
+	$(PYTHON) $(moopython_srcdir)/codegen/codegen.py \
+	--prefix _moo_utils $(codegen_platform) \
+	--register $(PYGTK_DEFS_DIR)/gtk-types.defs \
+	--register $(PYGTK_DEFS_DIR)/gdk-types.defs \
+	--override $(moomodule_srcdir)/mooutils-pygtk.override \
+	--outfilename $(moomodule)/mooutils-pygtk.c \
+	$(moomodule_srcdir)/mooutils-pygtk.defs > $(moomodule)/mooutils-pygtk.c
+
+$(moomodule)/mooterm-pygtk.c: $(moomodule)/mooterm-pygtk.defs $(moomodule)/mooterm-pygtk.override
+	mkdir -p $(moomodule)
+	$(PYTHON) $(moopython_srcdir)/codegen/codegen.py \
+	--prefix _moo_term $(codegen_platform) \
+	--register $(PYGTK_DEFS_DIR)/gtk-types.defs \
+	--register $(PYGTK_DEFS_DIR)/gdk-types.defs \
+	--register $(moomodule_srcdir)/mooutils-pygtk.defs \
+	--override $(moomodule_srcdir)/mooterm-pygtk.override \
+	--outfilename $(moomodule)/mooterm-pygtk.c \
+	$(moomodule_srcdir)/mooterm-pygtk.defs > $(moomodule)/mooterm-pygtk.c
+
+$(moomodule)/mooedit-pygtk.c: $(moomodule)/mooedit-pygtk.defs $(moomodule)/mooedit-pygtk.override $(mooedit_defs_files)
+	mkdir -p $(moomodule)
+	$(PYTHON) $(moopython_srcdir)/codegen/codegen.py \
+	--prefix _moo_edit $(codegen_platform) \
+	--register $(PYGTK_DEFS_DIR)/gtk-types.defs \
+	--register $(PYGTK_DEFS_DIR)/gdk-types.defs \
+	--register $(moomodule_srcdir)/mooutils-pygtk.defs \
+	--override $(moomodule_srcdir)/mooedit-pygtk.override \
+	--outfilename $(moomodule)/mooedit-pygtk.c \
+	$(moomodule_srcdir)/mooedit-pygtk.defs > $(moomodule)/mooedit-pygtk.c
+
+$(moomodule)/mooapp-pygtk.c: $(moomodule)/mooapp-pygtk.defs $(moomodule)/mooapp-pygtk.override
+	mkdir -p $(moomodule)
+	$(PYTHON) $(moopython_srcdir)/codegen/codegen.py \
+	--prefix _moo_app $(codegen_platform) \
+	--register $(PYGTK_DEFS_DIR)/gtk-types.defs \
+	--register $(PYGTK_DEFS_DIR)/gdk-types.defs \
+	--register $(moomodule_srcdir)/mooedit-pygtk.defs \
+	--register $(moomodule_srcdir)/mooterm-pygtk.defs \
+	--register $(moomodule_srcdir)/mooutils-pygtk.defs \
+	--override $(moomodule_srcdir)/mooapp-pygtk.override \
+	--outfilename $(moomodule)/mooapp-pygtk.c \
+	$(moomodule_srcdir)/mooapp-pygtk.defs > $(moomodule)/mooapp-pygtk.c
+
+$(moomodule)/moo-mod.h: $(moomodule)/moo-mod.py $(PY2H)
+	mkdir -p $(moomodule)
+	sh $(PY2H) MOO_PY $(moomodule)/moo-mod.py > $(moomodule)/moo-mod.h
+$(moomodule)/mooedit-mod.h: $(moomodule)/mooedit-mod.py $(PY2H)
+	mkdir -p $(moomodule)
+	sh $(PY2H) MOO_EDIT_PY $(moomodule_srcdir)/mooedit-mod.py > $(moomodule)/mooedit-mod.h
+$(moomodule)/mooapp-mod.h: $(moomodule)/mooapp-mod.py $(PY2H)
+	mkdir -p $(moomodule)
+	sh $(PY2H) MOO_APP_PY $(moomodule_srcdir)/mooapp-mod.py > $(moomodule)/mooapp-mod.h
+$(moomodule)/mooutils-mod.h: $(moomodule)/mooutils-mod.py $(PY2H)
+	mkdir -p $(moomodule)
+	sh $(PY2H) MOO_UTILS_PY $(moomodule_srcdir)/mooutils-mod.py > $(moomodule)/mooutils-mod.h
+$(moomodule)/mooterm-mod.h: $(moomodule)/mooterm-mod.py $(PY2H)
+	mkdir -p $(moomodule)
+	sh $(PY2H) MOO_TERM_PY $(moomodule_srcdir)/mooterm-mod.py > $(moomodule)/mooterm-mod.h
+
+if MOO_USE_PYGTK
+moo_sources += $(moomodule_sources)
+moo_built_sources += $(moomodule_built_sources)
+moo_nodist_sources += $(nodist_moomodule_sources)
+moo_cleanfiles += $(moomodule_cleanfiles)
+endif
+
+moo_extra_dist += $(moomodule_extra_dist)
diff --git a/moo/moopython/moo-mod.py.in b/moo/moopython/module/moo-mod.py.in
similarity index 100%
rename from moo/moopython/moo-mod.py.in
rename to moo/moopython/module/moo-mod.py.in
diff --git a/moo/moopython/moo-pygtk.c b/moo/moopython/module/moo-pygtk.c
similarity index 100%
rename from moo/moopython/moo-pygtk.c
rename to moo/moopython/module/moo-pygtk.c
diff --git a/moo/moopython/moo-pygtk.h b/moo/moopython/module/moo-pygtk.h
similarity index 100%
rename from moo/moopython/moo-pygtk.h
rename to moo/moopython/module/moo-pygtk.h
diff --git a/moo/moopython/mooapp-mod.c b/moo/moopython/module/mooapp-mod.c
similarity index 100%
rename from moo/moopython/mooapp-mod.c
rename to moo/moopython/module/mooapp-mod.c
diff --git a/moo/moopython/mooapp-mod.py b/moo/moopython/module/mooapp-mod.py
similarity index 100%
rename from moo/moopython/mooapp-mod.py
rename to moo/moopython/module/mooapp-mod.py
diff --git a/moo/moopython/mooapp-pygtk.defs b/moo/moopython/module/mooapp-pygtk.defs
similarity index 100%
rename from moo/moopython/mooapp-pygtk.defs
rename to moo/moopython/module/mooapp-pygtk.defs
diff --git a/moo/moopython/mooapp-pygtk.override b/moo/moopython/module/mooapp-pygtk.override
similarity index 100%
rename from moo/moopython/mooapp-pygtk.override
rename to moo/moopython/module/mooapp-pygtk.override
diff --git a/moo/moopython/mooedit-mod.c b/moo/moopython/module/mooedit-mod.c
similarity index 100%
rename from moo/moopython/mooedit-mod.c
rename to moo/moopython/module/mooedit-mod.c
diff --git a/moo/moopython/mooedit-mod.py b/moo/moopython/module/mooedit-mod.py
similarity index 100%
rename from moo/moopython/mooedit-mod.py
rename to moo/moopython/module/mooedit-mod.py
diff --git a/moo/moopython/mooedit-pygtk.defs b/moo/moopython/module/mooedit-pygtk.defs
similarity index 100%
rename from moo/moopython/mooedit-pygtk.defs
rename to moo/moopython/module/mooedit-pygtk.defs
diff --git a/moo/moopython/mooedit-pygtk.override b/moo/moopython/module/mooedit-pygtk.override
similarity index 100%
rename from moo/moopython/mooedit-pygtk.override
rename to moo/moopython/module/mooedit-pygtk.override
diff --git a/moo/moopython/mooeditor.defs b/moo/moopython/module/mooeditor.defs
similarity index 100%
rename from moo/moopython/mooeditor.defs
rename to moo/moopython/module/mooeditor.defs
diff --git a/moo/moopython/mooplugin.defs b/moo/moopython/module/mooplugin.defs
similarity index 100%
rename from moo/moopython/mooplugin.defs
rename to moo/moopython/module/mooplugin.defs
diff --git a/moo/moopython/mooterm-mod.c b/moo/moopython/module/mooterm-mod.c
similarity index 100%
rename from moo/moopython/mooterm-mod.c
rename to moo/moopython/module/mooterm-mod.c
diff --git a/moo/moopython/mooterm-mod.py b/moo/moopython/module/mooterm-mod.py
similarity index 100%
rename from moo/moopython/mooterm-mod.py
rename to moo/moopython/module/mooterm-mod.py
diff --git a/moo/moopython/mooterm-pygtk.defs b/moo/moopython/module/mooterm-pygtk.defs
similarity index 100%
rename from moo/moopython/mooterm-pygtk.defs
rename to moo/moopython/module/mooterm-pygtk.defs
diff --git a/moo/moopython/mooterm-pygtk.override b/moo/moopython/module/mooterm-pygtk.override
similarity index 100%
rename from moo/moopython/mooterm-pygtk.override
rename to moo/moopython/module/mooterm-pygtk.override
diff --git a/moo/moopython/mooutils-mod.c b/moo/moopython/module/mooutils-mod.c
similarity index 100%
rename from moo/moopython/mooutils-mod.c
rename to moo/moopython/module/mooutils-mod.c
diff --git a/moo/moopython/mooutils-mod.py b/moo/moopython/module/mooutils-mod.py
similarity index 100%
rename from moo/moopython/mooutils-mod.py
rename to moo/moopython/module/mooutils-mod.py
diff --git a/moo/moopython/mooutils-pygtk.defs b/moo/moopython/module/mooutils-pygtk.defs
similarity index 100%
rename from moo/moopython/mooutils-pygtk.defs
rename to moo/moopython/module/mooutils-pygtk.defs
diff --git a/moo/moopython/mooutils-pygtk.override b/moo/moopython/module/mooutils-pygtk.override
similarity index 100%
rename from moo/moopython/mooutils-pygtk.override
rename to moo/moopython/module/mooutils-pygtk.override
diff --git a/moo/moopython/plugins/Makefile.incl b/moo/moopython/plugins/Makefile.incl
new file mode 100644
index 00000000..96583631
--- /dev/null
+++ b/moo/moopython/plugins/Makefile.incl
@@ -0,0 +1,8 @@
+#
+# moo/moopython/plugins/Makefile.incl
+#
+
+moo_extra_dist +=                             \
+    $(moopython)/plugins/console.py           \
+    $(moopython)/plugins/pyconsole.py         \
+    $(moopython)/plugins/pystuff.py