diff --git a/basis/macros/macros-docs.factor b/basis/macros/macros-docs.factor
index 022458cc7c..6b54da0856 100644
--- a/basis/macros/macros-docs.factor
+++ b/basis/macros/macros-docs.factor
@@ -21,7 +21,7 @@ HELP: macro-expand
 { $values { "..." "inputs to a macro" } { "word" macro } { "quot" quotation } }
 { $description "Expands a macro. Useful for debugging." }
 { $examples
-    { $code "USING: math macros combinators.lib ;" "{ [ integer? ] [ 0 > ] [ 13 mod zero? ] } \ 1&& macro-expand ." }
+    { $code "USING: math macros combinators.short-circuit ;" "{ [ integer? ] [ 0 > ] [ 13 mod zero? ] } \ 1&& macro-expand ." }
 } ;
 
 ARTICLE: "macros" "Macros"
diff --git a/basis/io/windows/ce/authors.txt b/unmaintained/ce/authors.txt
similarity index 100%
rename from basis/io/windows/ce/authors.txt
rename to unmaintained/ce/authors.txt
diff --git a/basis/io/windows/ce/backend/authors.txt b/unmaintained/ce/backend/authors.txt
similarity index 100%
rename from basis/io/windows/ce/backend/authors.txt
rename to unmaintained/ce/backend/authors.txt
diff --git a/basis/io/windows/ce/backend/backend.factor b/unmaintained/ce/backend/backend.factor
similarity index 100%
rename from basis/io/windows/ce/backend/backend.factor
rename to unmaintained/ce/backend/backend.factor
diff --git a/basis/io/windows/ce/ce.factor b/unmaintained/ce/ce.factor
similarity index 100%
rename from basis/io/windows/ce/ce.factor
rename to unmaintained/ce/ce.factor
diff --git a/basis/io/windows/ce/files/authors.txt b/unmaintained/ce/files/authors.txt
similarity index 100%
rename from basis/io/windows/ce/files/authors.txt
rename to unmaintained/ce/files/authors.txt
diff --git a/basis/io/windows/ce/files/files.factor b/unmaintained/ce/files/files.factor
similarity index 100%
rename from basis/io/windows/ce/files/files.factor
rename to unmaintained/ce/files/files.factor
diff --git a/basis/io/windows/ce/privileges/privileges.factor b/unmaintained/ce/privileges/privileges.factor
similarity index 100%
rename from basis/io/windows/ce/privileges/privileges.factor
rename to unmaintained/ce/privileges/privileges.factor
diff --git a/basis/io/windows/ce/sockets/authors.txt b/unmaintained/ce/sockets/authors.txt
similarity index 100%
rename from basis/io/windows/ce/sockets/authors.txt
rename to unmaintained/ce/sockets/authors.txt
diff --git a/basis/io/windows/ce/sockets/sockets.factor b/unmaintained/ce/sockets/sockets.factor
similarity index 100%
rename from basis/io/windows/ce/sockets/sockets.factor
rename to unmaintained/ce/sockets/sockets.factor
diff --git a/basis/io/windows/ce/summary.txt b/unmaintained/ce/summary.txt
similarity index 100%
rename from basis/io/windows/ce/summary.txt
rename to unmaintained/ce/summary.txt