diff --git a/configure.ac b/configure.ac
index 195d8747ab..694c9f6d08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1898,8 +1898,7 @@ modules/printbackends/lpr/Makefile
 modules/printbackends/file/Makefile
 modules/printbackends/papi/Makefile
 modules/printbackends/test/Makefile
-modules/other/Makefile
-modules/other/parasite/Makefile
+modules/inspector/Makefile
 ])
 
 AC_OUTPUT
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 34b26acf36..f0649d18b7 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = input other
+SUBDIRS = input inspector
 
 if OS_UNIX
 SUBDIRS += printbackends
diff --git a/modules/other/parasite/Makefile.am b/modules/inspector/Makefile.am
similarity index 100%
rename from modules/other/parasite/Makefile.am
rename to modules/inspector/Makefile.am
diff --git a/modules/other/parasite/button-path.c b/modules/inspector/button-path.c
similarity index 100%
rename from modules/other/parasite/button-path.c
rename to modules/inspector/button-path.c
diff --git a/modules/other/parasite/button-path.h b/modules/inspector/button-path.h
similarity index 100%
rename from modules/other/parasite/button-path.h
rename to modules/inspector/button-path.h
diff --git a/modules/other/parasite/button-path.ui b/modules/inspector/button-path.ui
similarity index 100%
rename from modules/other/parasite/button-path.ui
rename to modules/inspector/button-path.ui
diff --git a/modules/other/parasite/classes-list.c b/modules/inspector/classes-list.c
similarity index 100%
rename from modules/other/parasite/classes-list.c
rename to modules/inspector/classes-list.c
diff --git a/modules/other/parasite/classes-list.h b/modules/inspector/classes-list.h
similarity index 100%
rename from modules/other/parasite/classes-list.h
rename to modules/inspector/classes-list.h
diff --git a/modules/other/parasite/classes-list.ui b/modules/inspector/classes-list.ui
similarity index 100%
rename from modules/other/parasite/classes-list.ui
rename to modules/inspector/classes-list.ui
diff --git a/modules/other/parasite/css-editor.c b/modules/inspector/css-editor.c
similarity index 100%
rename from modules/other/parasite/css-editor.c
rename to modules/inspector/css-editor.c
diff --git a/modules/other/parasite/css-editor.h b/modules/inspector/css-editor.h
similarity index 100%
rename from modules/other/parasite/css-editor.h
rename to modules/inspector/css-editor.h
diff --git a/modules/other/parasite/css-editor.ui b/modules/inspector/css-editor.ui
similarity index 100%
rename from modules/other/parasite/css-editor.ui
rename to modules/inspector/css-editor.ui
diff --git a/modules/other/parasite/inspect-button.c b/modules/inspector/inspect-button.c
similarity index 100%
rename from modules/other/parasite/inspect-button.c
rename to modules/inspector/inspect-button.c
diff --git a/modules/other/parasite/inspector.gresource.xml b/modules/inspector/inspector.gresource.xml
similarity index 100%
rename from modules/other/parasite/inspector.gresource.xml
rename to modules/inspector/inspector.gresource.xml
diff --git a/modules/other/parasite/module.c b/modules/inspector/module.c
similarity index 100%
rename from modules/other/parasite/module.c
rename to modules/inspector/module.c
diff --git a/modules/other/parasite/object-hierarchy.c b/modules/inspector/object-hierarchy.c
similarity index 100%
rename from modules/other/parasite/object-hierarchy.c
rename to modules/inspector/object-hierarchy.c
diff --git a/modules/other/parasite/object-hierarchy.h b/modules/inspector/object-hierarchy.h
similarity index 100%
rename from modules/other/parasite/object-hierarchy.h
rename to modules/inspector/object-hierarchy.h
diff --git a/modules/other/parasite/object-hierarchy.ui b/modules/inspector/object-hierarchy.ui
similarity index 100%
rename from modules/other/parasite/object-hierarchy.ui
rename to modules/inspector/object-hierarchy.ui
diff --git a/modules/other/parasite/prop-list.c b/modules/inspector/prop-list.c
similarity index 100%
rename from modules/other/parasite/prop-list.c
rename to modules/inspector/prop-list.c
diff --git a/modules/other/parasite/prop-list.h b/modules/inspector/prop-list.h
similarity index 100%
rename from modules/other/parasite/prop-list.h
rename to modules/inspector/prop-list.h
diff --git a/modules/other/parasite/prop-list.ui b/modules/inspector/prop-list.ui
similarity index 100%
rename from modules/other/parasite/prop-list.ui
rename to modules/inspector/prop-list.ui
diff --git a/modules/other/parasite/property-cell-renderer.c b/modules/inspector/property-cell-renderer.c
similarity index 100%
rename from modules/other/parasite/property-cell-renderer.c
rename to modules/inspector/property-cell-renderer.c
diff --git a/modules/other/parasite/property-cell-renderer.h b/modules/inspector/property-cell-renderer.h
similarity index 100%
rename from modules/other/parasite/property-cell-renderer.h
rename to modules/inspector/property-cell-renderer.h
diff --git a/modules/other/parasite/python-hooks.c b/modules/inspector/python-hooks.c
similarity index 100%
rename from modules/other/parasite/python-hooks.c
rename to modules/inspector/python-hooks.c
diff --git a/modules/other/parasite/python-hooks.h b/modules/inspector/python-hooks.h
similarity index 100%
rename from modules/other/parasite/python-hooks.h
rename to modules/inspector/python-hooks.h
diff --git a/modules/other/parasite/python-shell.c b/modules/inspector/python-shell.c
similarity index 100%
rename from modules/other/parasite/python-shell.c
rename to modules/inspector/python-shell.c
diff --git a/modules/other/parasite/python-shell.h b/modules/inspector/python-shell.h
similarity index 100%
rename from modules/other/parasite/python-shell.h
rename to modules/inspector/python-shell.h
diff --git a/modules/other/parasite/themes.c b/modules/inspector/themes.c
similarity index 100%
rename from modules/other/parasite/themes.c
rename to modules/inspector/themes.c
diff --git a/modules/other/parasite/themes.h b/modules/inspector/themes.h
similarity index 100%
rename from modules/other/parasite/themes.h
rename to modules/inspector/themes.h
diff --git a/modules/other/parasite/themes.ui b/modules/inspector/themes.ui
similarity index 100%
rename from modules/other/parasite/themes.ui
rename to modules/inspector/themes.ui
diff --git a/modules/other/parasite/widget-tree.c b/modules/inspector/widget-tree.c
similarity index 100%
rename from modules/other/parasite/widget-tree.c
rename to modules/inspector/widget-tree.c
diff --git a/modules/other/parasite/widget-tree.h b/modules/inspector/widget-tree.h
similarity index 100%
rename from modules/other/parasite/widget-tree.h
rename to modules/inspector/widget-tree.h
diff --git a/modules/other/parasite/widget-tree.ui b/modules/inspector/widget-tree.ui
similarity index 100%
rename from modules/other/parasite/widget-tree.ui
rename to modules/inspector/widget-tree.ui
diff --git a/modules/other/parasite/window.c b/modules/inspector/window.c
similarity index 100%
rename from modules/other/parasite/window.c
rename to modules/inspector/window.c
diff --git a/modules/other/parasite/window.h b/modules/inspector/window.h
similarity index 100%
rename from modules/other/parasite/window.h
rename to modules/inspector/window.h
diff --git a/modules/other/parasite/window.ui b/modules/inspector/window.ui
similarity index 100%
rename from modules/other/parasite/window.ui
rename to modules/inspector/window.ui
diff --git a/modules/other/Makefile.am b/modules/other/Makefile.am
deleted file mode 100644
index e1689249de..0000000000
--- a/modules/other/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = parasite