diff --git a/unmaintained/boids/authors.txt b/extra/boids/authors.txt
similarity index 100%
rename from unmaintained/boids/authors.txt
rename to extra/boids/authors.txt
diff --git a/unmaintained/boids/boids.factor b/extra/boids/boids.factor
similarity index 100%
rename from unmaintained/boids/boids.factor
rename to extra/boids/boids.factor
diff --git a/unmaintained/boids/summary.txt b/extra/boids/summary.txt
similarity index 100%
rename from unmaintained/boids/summary.txt
rename to extra/boids/summary.txt
diff --git a/unmaintained/bubble-chamber/bubble-chamber-docs.factor b/extra/bubble-chamber/bubble-chamber-docs.factor
similarity index 100%
rename from unmaintained/bubble-chamber/bubble-chamber-docs.factor
rename to extra/bubble-chamber/bubble-chamber-docs.factor
diff --git a/unmaintained/bubble-chamber/bubble-chamber.factor b/extra/bubble-chamber/bubble-chamber.factor
similarity index 100%
rename from unmaintained/bubble-chamber/bubble-chamber.factor
rename to extra/bubble-chamber/bubble-chamber.factor
diff --git a/unmaintained/bubble-chamber/common/common.factor b/extra/bubble-chamber/common/common.factor
similarity index 100%
rename from unmaintained/bubble-chamber/common/common.factor
rename to extra/bubble-chamber/common/common.factor
diff --git a/unmaintained/bubble-chamber/particle/axion/axion.factor b/extra/bubble-chamber/particle/axion/axion.factor
similarity index 100%
rename from unmaintained/bubble-chamber/particle/axion/axion.factor
rename to extra/bubble-chamber/particle/axion/axion.factor
diff --git a/unmaintained/bubble-chamber/particle/hadron/hadron.factor b/extra/bubble-chamber/particle/hadron/hadron.factor
similarity index 100%
rename from unmaintained/bubble-chamber/particle/hadron/hadron.factor
rename to extra/bubble-chamber/particle/hadron/hadron.factor
diff --git a/unmaintained/bubble-chamber/particle/muon/colors/colors.factor b/extra/bubble-chamber/particle/muon/colors/colors.factor
similarity index 100%
rename from unmaintained/bubble-chamber/particle/muon/colors/colors.factor
rename to extra/bubble-chamber/particle/muon/colors/colors.factor
diff --git a/unmaintained/bubble-chamber/particle/muon/muon.factor b/extra/bubble-chamber/particle/muon/muon.factor
similarity index 100%
rename from unmaintained/bubble-chamber/particle/muon/muon.factor
rename to extra/bubble-chamber/particle/muon/muon.factor
diff --git a/unmaintained/bubble-chamber/particle/particle.factor b/extra/bubble-chamber/particle/particle.factor
similarity index 100%
rename from unmaintained/bubble-chamber/particle/particle.factor
rename to extra/bubble-chamber/particle/particle.factor
diff --git a/unmaintained/bubble-chamber/particle/quark/quark.factor b/extra/bubble-chamber/particle/quark/quark.factor
similarity index 100%
rename from unmaintained/bubble-chamber/particle/quark/quark.factor
rename to extra/bubble-chamber/particle/quark/quark.factor
diff --git a/unmaintained/bubble-chamber/tags.txt b/extra/bubble-chamber/tags.txt
similarity index 100%
rename from unmaintained/bubble-chamber/tags.txt
rename to extra/bubble-chamber/tags.txt
diff --git a/unmaintained/processing/gadget/gadget.factor b/extra/processing/gadget/gadget.factor
similarity index 100%
rename from unmaintained/processing/gadget/gadget.factor
rename to extra/processing/gadget/gadget.factor
diff --git a/unmaintained/processing/gallery/trails/trails.factor b/extra/processing/gallery/trails/trails.factor
similarity index 100%
rename from unmaintained/processing/gallery/trails/trails.factor
rename to extra/processing/gallery/trails/trails.factor
diff --git a/unmaintained/processing/processing.factor b/extra/processing/processing.factor
similarity index 100%
rename from unmaintained/processing/processing.factor
rename to extra/processing/processing.factor
diff --git a/unmaintained/processing/shapes/shapes.factor b/extra/processing/shapes/shapes.factor
similarity index 94%
rename from unmaintained/processing/shapes/shapes.factor
rename to extra/processing/shapes/shapes.factor
index a530be64fa..51979dc96a 100644
--- a/unmaintained/processing/shapes/shapes.factor
+++ b/extra/processing/shapes/shapes.factor
@@ -2,13 +2,17 @@
 USING: kernel namespaces arrays sequences grouping
        alien.c-types
        math math.vectors math.geometry.rect
-       opengl.gl opengl.glu opengl.demo-support opengl generalizations vars
+       opengl.gl opengl.glu opengl generalizations vars
        combinators.cleave colors ;
 
 IN: processing.shapes
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
+: do-state ( mode quot -- ) swap glBegin call glEnd ; inline
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
 VAR: fill-color
 VAR: stroke-color