diff --git a/extra/factory/authors.txt b/unmaintained/factory/authors.txt
similarity index 100%
rename from extra/factory/authors.txt
rename to unmaintained/factory/authors.txt
diff --git a/extra/factory/commands/authors.txt b/unmaintained/factory/commands/authors.txt
similarity index 100%
rename from extra/factory/commands/authors.txt
rename to unmaintained/factory/commands/authors.txt
diff --git a/extra/factory/commands/commands.factor b/unmaintained/factory/commands/commands.factor
similarity index 100%
rename from extra/factory/commands/commands.factor
rename to unmaintained/factory/commands/commands.factor
diff --git a/extra/factory/factory-menus b/unmaintained/factory/factory-menus
similarity index 100%
rename from extra/factory/factory-menus
rename to unmaintained/factory/factory-menus
diff --git a/extra/factory/factory-rc b/unmaintained/factory/factory-rc
similarity index 100%
rename from extra/factory/factory-rc
rename to unmaintained/factory/factory-rc
diff --git a/extra/factory/factory.factor b/unmaintained/factory/factory.factor
similarity index 100%
rename from extra/factory/factory.factor
rename to unmaintained/factory/factory.factor
diff --git a/extra/factory/load/authors.txt b/unmaintained/factory/load/authors.txt
similarity index 100%
rename from extra/factory/load/authors.txt
rename to unmaintained/factory/load/authors.txt
diff --git a/extra/factory/load/load.factor b/unmaintained/factory/load/load.factor
similarity index 100%
rename from extra/factory/load/load.factor
rename to unmaintained/factory/load/load.factor
diff --git a/extra/factory/summary.txt b/unmaintained/factory/summary.txt
similarity index 100%
rename from extra/factory/summary.txt
rename to unmaintained/factory/summary.txt
diff --git a/extra/factory/tags.txt b/unmaintained/factory/tags.txt
similarity index 100%
rename from extra/factory/tags.txt
rename to unmaintained/factory/tags.txt
diff --git a/extra/mortar/authors.txt b/unmaintained/mortar/authors.txt
similarity index 100%
rename from extra/mortar/authors.txt
rename to unmaintained/mortar/authors.txt
diff --git a/extra/mortar/mortar.factor b/unmaintained/mortar/mortar.factor
similarity index 100%
rename from extra/mortar/mortar.factor
rename to unmaintained/mortar/mortar.factor
diff --git a/extra/mortar/sugar/sugar.factor b/unmaintained/mortar/sugar/sugar.factor
similarity index 100%
rename from extra/mortar/sugar/sugar.factor
rename to unmaintained/mortar/sugar/sugar.factor
diff --git a/extra/mortar/tags.txt b/unmaintained/mortar/tags.txt
similarity index 100%
rename from extra/mortar/tags.txt
rename to unmaintained/mortar/tags.txt
diff --git a/extra/ui/gadgets/tiling/tiling.factor b/unmaintained/tiling/tiling.factor
similarity index 100%
rename from extra/ui/gadgets/tiling/tiling.factor
rename to unmaintained/tiling/tiling.factor
diff --git a/extra/x/authors.txt b/unmaintained/x/authors.txt
similarity index 100%
rename from extra/x/authors.txt
rename to unmaintained/x/authors.txt
diff --git a/extra/x/font/authors.txt b/unmaintained/x/font/authors.txt
similarity index 100%
rename from extra/x/font/authors.txt
rename to unmaintained/x/font/authors.txt
diff --git a/extra/x/font/font.factor b/unmaintained/x/font/font.factor
similarity index 100%
rename from extra/x/font/font.factor
rename to unmaintained/x/font/font.factor
diff --git a/extra/x/gc/authors.txt b/unmaintained/x/gc/authors.txt
similarity index 100%
rename from extra/x/gc/authors.txt
rename to unmaintained/x/gc/authors.txt
diff --git a/extra/x/gc/gc.factor b/unmaintained/x/gc/gc.factor
similarity index 100%
rename from extra/x/gc/gc.factor
rename to unmaintained/x/gc/gc.factor
diff --git a/extra/x/keysym-table/authors.txt b/unmaintained/x/keysym-table/authors.txt
similarity index 100%
rename from extra/x/keysym-table/authors.txt
rename to unmaintained/x/keysym-table/authors.txt
diff --git a/extra/x/keysym-table/keysym-table.factor b/unmaintained/x/keysym-table/keysym-table.factor
similarity index 100%
rename from extra/x/keysym-table/keysym-table.factor
rename to unmaintained/x/keysym-table/keysym-table.factor
diff --git a/extra/x/pen/authors.txt b/unmaintained/x/pen/authors.txt
similarity index 100%
rename from extra/x/pen/authors.txt
rename to unmaintained/x/pen/authors.txt
diff --git a/extra/x/pen/pen.factor b/unmaintained/x/pen/pen.factor
similarity index 100%
rename from extra/x/pen/pen.factor
rename to unmaintained/x/pen/pen.factor
diff --git a/extra/x/widgets/authors.txt b/unmaintained/x/widgets/authors.txt
similarity index 100%
rename from extra/x/widgets/authors.txt
rename to unmaintained/x/widgets/authors.txt
diff --git a/extra/x/widgets/button/authors.txt b/unmaintained/x/widgets/button/authors.txt
similarity index 100%
rename from extra/x/widgets/button/authors.txt
rename to unmaintained/x/widgets/button/authors.txt
diff --git a/extra/x/widgets/button/button.factor b/unmaintained/x/widgets/button/button.factor
similarity index 100%
rename from extra/x/widgets/button/button.factor
rename to unmaintained/x/widgets/button/button.factor
diff --git a/extra/x/widgets/keymenu/authors.txt b/unmaintained/x/widgets/keymenu/authors.txt
similarity index 100%
rename from extra/x/widgets/keymenu/authors.txt
rename to unmaintained/x/widgets/keymenu/authors.txt
diff --git a/extra/x/widgets/keymenu/keymenu.factor b/unmaintained/x/widgets/keymenu/keymenu.factor
similarity index 100%
rename from extra/x/widgets/keymenu/keymenu.factor
rename to unmaintained/x/widgets/keymenu/keymenu.factor
diff --git a/extra/x/widgets/label/authors.txt b/unmaintained/x/widgets/label/authors.txt
similarity index 100%
rename from extra/x/widgets/label/authors.txt
rename to unmaintained/x/widgets/label/authors.txt
diff --git a/extra/x/widgets/label/label.factor b/unmaintained/x/widgets/label/label.factor
similarity index 100%
rename from extra/x/widgets/label/label.factor
rename to unmaintained/x/widgets/label/label.factor
diff --git a/extra/x/widgets/widgets.factor b/unmaintained/x/widgets/widgets.factor
similarity index 100%
rename from extra/x/widgets/widgets.factor
rename to unmaintained/x/widgets/widgets.factor
diff --git a/extra/x/widgets/wm/child/authors.txt b/unmaintained/x/widgets/wm/child/authors.txt
similarity index 100%
rename from extra/x/widgets/wm/child/authors.txt
rename to unmaintained/x/widgets/wm/child/authors.txt
diff --git a/extra/x/widgets/wm/child/child.factor b/unmaintained/x/widgets/wm/child/child.factor
similarity index 100%
rename from extra/x/widgets/wm/child/child.factor
rename to unmaintained/x/widgets/wm/child/child.factor
diff --git a/extra/x/widgets/wm/frame/authors.txt b/unmaintained/x/widgets/wm/frame/authors.txt
similarity index 100%
rename from extra/x/widgets/wm/frame/authors.txt
rename to unmaintained/x/widgets/wm/frame/authors.txt
diff --git a/extra/x/widgets/wm/frame/drag/authors.txt b/unmaintained/x/widgets/wm/frame/drag/authors.txt
similarity index 100%
rename from extra/x/widgets/wm/frame/drag/authors.txt
rename to unmaintained/x/widgets/wm/frame/drag/authors.txt
diff --git a/extra/x/widgets/wm/frame/drag/drag.factor b/unmaintained/x/widgets/wm/frame/drag/drag.factor
similarity index 100%
rename from extra/x/widgets/wm/frame/drag/drag.factor
rename to unmaintained/x/widgets/wm/frame/drag/drag.factor
diff --git a/extra/x/widgets/wm/frame/drag/move/authors.txt b/unmaintained/x/widgets/wm/frame/drag/move/authors.txt
similarity index 100%
rename from extra/x/widgets/wm/frame/drag/move/authors.txt
rename to unmaintained/x/widgets/wm/frame/drag/move/authors.txt
diff --git a/extra/x/widgets/wm/frame/drag/move/move.factor b/unmaintained/x/widgets/wm/frame/drag/move/move.factor
similarity index 100%
rename from extra/x/widgets/wm/frame/drag/move/move.factor
rename to unmaintained/x/widgets/wm/frame/drag/move/move.factor
diff --git a/extra/x/widgets/wm/frame/drag/size/authors.txt b/unmaintained/x/widgets/wm/frame/drag/size/authors.txt
similarity index 100%
rename from extra/x/widgets/wm/frame/drag/size/authors.txt
rename to unmaintained/x/widgets/wm/frame/drag/size/authors.txt
diff --git a/extra/x/widgets/wm/frame/drag/size/size.factor b/unmaintained/x/widgets/wm/frame/drag/size/size.factor
similarity index 100%
rename from extra/x/widgets/wm/frame/drag/size/size.factor
rename to unmaintained/x/widgets/wm/frame/drag/size/size.factor
diff --git a/extra/x/widgets/wm/frame/frame.factor b/unmaintained/x/widgets/wm/frame/frame.factor
similarity index 100%
rename from extra/x/widgets/wm/frame/frame.factor
rename to unmaintained/x/widgets/wm/frame/frame.factor
diff --git a/extra/x/widgets/wm/menu/authors.txt b/unmaintained/x/widgets/wm/menu/authors.txt
similarity index 100%
rename from extra/x/widgets/wm/menu/authors.txt
rename to unmaintained/x/widgets/wm/menu/authors.txt
diff --git a/extra/x/widgets/wm/menu/menu.factor b/unmaintained/x/widgets/wm/menu/menu.factor
similarity index 100%
rename from extra/x/widgets/wm/menu/menu.factor
rename to unmaintained/x/widgets/wm/menu/menu.factor
diff --git a/extra/x/widgets/wm/root/authors.txt b/unmaintained/x/widgets/wm/root/authors.txt
similarity index 100%
rename from extra/x/widgets/wm/root/authors.txt
rename to unmaintained/x/widgets/wm/root/authors.txt
diff --git a/extra/x/widgets/wm/root/root.factor b/unmaintained/x/widgets/wm/root/root.factor
similarity index 100%
rename from extra/x/widgets/wm/root/root.factor
rename to unmaintained/x/widgets/wm/root/root.factor
diff --git a/extra/x/widgets/wm/unmapped-frames-menu/authors.txt b/unmaintained/x/widgets/wm/unmapped-frames-menu/authors.txt
similarity index 100%
rename from extra/x/widgets/wm/unmapped-frames-menu/authors.txt
rename to unmaintained/x/widgets/wm/unmapped-frames-menu/authors.txt
diff --git a/extra/x/widgets/wm/unmapped-frames-menu/unmapped-frames-menu.factor b/unmaintained/x/widgets/wm/unmapped-frames-menu/unmapped-frames-menu.factor
similarity index 100%
rename from extra/x/widgets/wm/unmapped-frames-menu/unmapped-frames-menu.factor
rename to unmaintained/x/widgets/wm/unmapped-frames-menu/unmapped-frames-menu.factor
diff --git a/extra/x/widgets/wm/workspace/authors.txt b/unmaintained/x/widgets/wm/workspace/authors.txt
similarity index 100%
rename from extra/x/widgets/wm/workspace/authors.txt
rename to unmaintained/x/widgets/wm/workspace/authors.txt
diff --git a/extra/x/widgets/wm/workspace/workspace.factor b/unmaintained/x/widgets/wm/workspace/workspace.factor
similarity index 100%
rename from extra/x/widgets/wm/workspace/workspace.factor
rename to unmaintained/x/widgets/wm/workspace/workspace.factor
diff --git a/extra/x/x.factor b/unmaintained/x/x.factor
similarity index 100%
rename from extra/x/x.factor
rename to unmaintained/x/x.factor