diff --git a/unmaintained/bunny/authors.txt b/extra/bunny/authors.txt
similarity index 100%
rename from unmaintained/bunny/authors.txt
rename to extra/bunny/authors.txt
diff --git a/unmaintained/bunny/bun_zipper.ply b/extra/bunny/bun_zipper.ply
similarity index 100%
rename from unmaintained/bunny/bun_zipper.ply
rename to extra/bunny/bun_zipper.ply
diff --git a/unmaintained/bunny/bunny.factor b/extra/bunny/bunny.factor
similarity index 100%
rename from unmaintained/bunny/bunny.factor
rename to extra/bunny/bunny.factor
diff --git a/unmaintained/bunny/cel-shaded/cel-shaded.factor b/extra/bunny/cel-shaded/cel-shaded.factor
similarity index 100%
rename from unmaintained/bunny/cel-shaded/cel-shaded.factor
rename to extra/bunny/cel-shaded/cel-shaded.factor
diff --git a/unmaintained/bunny/deploy.factor b/extra/bunny/deploy.factor
similarity index 100%
rename from unmaintained/bunny/deploy.factor
rename to extra/bunny/deploy.factor
diff --git a/unmaintained/bunny/fixed-pipeline/fixed-pipeline.factor b/extra/bunny/fixed-pipeline/fixed-pipeline.factor
old mode 100644
new mode 100755
similarity index 90%
rename from unmaintained/bunny/fixed-pipeline/fixed-pipeline.factor
rename to extra/bunny/fixed-pipeline/fixed-pipeline.factor
index fd420d0b7d..0791773ba7
--- a/unmaintained/bunny/fixed-pipeline/fixed-pipeline.factor
+++ b/extra/bunny/fixed-pipeline/fixed-pipeline.factor
@@ -1,5 +1,6 @@
 USING: alien.c-types continuations destructors kernel
-opengl opengl.gl bunny.model specialized-arrays.float ;
+opengl opengl.gl bunny.model specialized-arrays.float
+accessors ;
 IN: bunny.fixed-pipeline
 
 TUPLE: bunny-fixed-pipeline ;
diff --git a/unmaintained/bunny/model/model.factor b/extra/bunny/model/model.factor
similarity index 96%
rename from unmaintained/bunny/model/model.factor
rename to extra/bunny/model/model.factor
index c9d109cb71..452adf5689 100755
--- a/unmaintained/bunny/model/model.factor
+++ b/extra/bunny/model/model.factor
@@ -3,7 +3,7 @@ http.client io io.encodings.ascii io.files kernel math
 math.matrices math.parser math.vectors opengl
 opengl.capabilities opengl.gl opengl.demo-support sequences
 sequences.lib splitting vectors words
-specialized-arrays.double specialized-arrays.uint ;
+specialized-arrays.float specialized-arrays.uint ;
 IN: bunny.model
 
 : numbers ( str -- seq )
@@ -66,7 +66,7 @@ TUPLE: bunny-buffers array element-array nv ni ;
     {
         [
             [ first concat ] [ second concat ] bi
-            append >double-array underlying>>
+            append >float-array underlying>>
             GL_ARRAY_BUFFER swap GL_STATIC_DRAW <gl-buffer>
         ]
         [
diff --git a/unmaintained/bunny/outlined/outlined.factor b/extra/bunny/outlined/outlined.factor
similarity index 100%
rename from unmaintained/bunny/outlined/outlined.factor
rename to extra/bunny/outlined/outlined.factor
diff --git a/unmaintained/bunny/summary.txt b/extra/bunny/summary.txt
similarity index 100%
rename from unmaintained/bunny/summary.txt
rename to extra/bunny/summary.txt
diff --git a/unmaintained/bunny/tags.txt b/extra/bunny/tags.txt
similarity index 100%
rename from unmaintained/bunny/tags.txt
rename to extra/bunny/tags.txt
diff --git a/extra/opengl/shaders/shaders.factor b/extra/opengl/shaders/shaders.factor
index a88ea6de4d..476bb1be71 100755
--- a/extra/opengl/shaders/shaders.factor
+++ b/extra/opengl/shaders/shaders.factor
@@ -2,7 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel opengl.gl alien.c-types continuations namespaces
 assocs alien alien.strings libc opengl math sequences combinators
-combinators.lib macros arrays io.encodings.ascii fry ;
+combinators.lib macros arrays io.encodings.ascii fry
+specialized-arrays.uint destructors accessors ;
 IN: opengl.shaders
 
 : with-gl-shader-source-ptr ( string quot -- )
@@ -93,9 +94,9 @@ PREDICATE: fragment-shader < gl-shader (fragment-shader?) ;
 
 : gl-program-shaders ( program -- shaders )
     dup gl-program-shaders-length
-    dup <uint-array>
-    0 <int> swap
-    [ underlying>> glGetAttachedShaders ] { 3 1 } multikeep ;
+    0 <int>
+    over <uint-array>
+    [ underlying>> glGetAttachedShaders ] keep ;
 
 : delete-gl-program-only ( program -- )
     glDeleteProgram ; inline
diff --git a/unmaintained/spheres/authors.txt b/extra/spheres/authors.txt
similarity index 100%
rename from unmaintained/spheres/authors.txt
rename to extra/spheres/authors.txt
diff --git a/unmaintained/spheres/deploy.factor b/extra/spheres/deploy.factor
similarity index 100%
rename from unmaintained/spheres/deploy.factor
rename to extra/spheres/deploy.factor
diff --git a/unmaintained/spheres/spheres.factor b/extra/spheres/spheres.factor
similarity index 100%
rename from unmaintained/spheres/spheres.factor
rename to extra/spheres/spheres.factor
diff --git a/unmaintained/spheres/summary.txt b/extra/spheres/summary.txt
similarity index 100%
rename from unmaintained/spheres/summary.txt
rename to extra/spheres/summary.txt
diff --git a/unmaintained/spheres/tags.txt b/extra/spheres/tags.txt
similarity index 100%
rename from unmaintained/spheres/tags.txt
rename to extra/spheres/tags.txt