diff --git a/library/bootstrap/boot-stage1.factor b/library/bootstrap/boot-stage1.factor
index 6a928e1e21..cc19dac1c2 100644
--- a/library/bootstrap/boot-stage1.factor
+++ b/library/bootstrap/boot-stage1.factor
@@ -77,7 +77,7 @@ vectors words ;
         "/library/generic/math-combination.factor"
         "/library/generic/tuple.factor"
         
-        "/library/alien/aliens.factor"
+        "/library/compiler/alien/aliens.factor"
         
         "/library/syntax/prettyprint.factor"
         "/library/syntax/see.factor"
@@ -111,33 +111,35 @@ vectors words ;
 
         "/library/compiler/architecture.factor"
 
-        "/library/inference/shuffle.factor"
-        "/library/inference/dataflow.factor"
-        "/library/inference/inference.factor"
-        "/library/inference/branches.factor"
-        "/library/inference/words.factor"
-        "/library/inference/class-infer.factor"
-        "/library/inference/kill-literals.factor"
-        "/library/inference/optimizer.factor"
-        "/library/inference/inline-methods.factor"
-        "/library/inference/known-words.factor"
-        "/library/inference/stack.factor"
-        "/library/inference/call-optimizers.factor"
-        "/library/inference/print-dataflow.factor"
+        "/library/compiler/inference/shuffle.factor"
+        "/library/compiler/inference/dataflow.factor"
+        "/library/compiler/inference/inference.factor"
+        "/library/compiler/inference/branches.factor"
+        "/library/compiler/inference/words.factor"
+        "/library/compiler/inference/stack.factor"
+
+        "/library/compiler/optimizer/class-infer.factor"
+        "/library/compiler/optimizer/kill-literals.factor"
+        "/library/compiler/optimizer/optimizer.factor"
+        "/library/compiler/optimizer/inline-methods.factor"
+        "/library/compiler/optimizer/known-words.factor"
+        "/library/compiler/optimizer/call-optimizers.factor"
+        "/library/compiler/optimizer/print-dataflow.factor"
+
+        "/library/compiler/generator/assembler.factor"
+        "/library/compiler/generator/templates.factor"
+        "/library/compiler/generator/xt.factor"
+        "/library/compiler/generator/generator.factor"
 
-        "/library/compiler/assembler.factor"
-        "/library/compiler/templates.factor"
-        "/library/compiler/xt.factor"
-        "/library/compiler/generator.factor"
         "/library/compiler/compiler.factor"
 
-        "/library/alien/malloc.factor"
-        "/library/alien/c-types.factor"
-        "/library/alien/structs.factor"
-        "/library/alien/compiler.factor"
-        "/library/alien/alien-invoke.factor"
-        "/library/alien/alien-callback.factor"
-        "/library/alien/syntax.factor"
+        "/library/compiler/alien/malloc.factor"
+        "/library/compiler/alien/c-types.factor"
+        "/library/compiler/alien/structs.factor"
+        "/library/compiler/alien/compiler.factor"
+        "/library/compiler/alien/alien-invoke.factor"
+        "/library/compiler/alien/alien-callback.factor"
+        "/library/compiler/alien/syntax.factor"
         
         "/library/io/buffer.factor"
 
@@ -189,13 +191,13 @@ vectors words ;
         "/library/kernel.facts"
         "/library/threads.facts"
         "/library/words.facts"
-        "/library/alien/alien-callback.facts"
-        "/library/alien/alien-invoke.facts"
-        "/library/alien/aliens.facts"
-        "/library/alien/c-types.facts"
-        "/library/alien/malloc.facts"
-        "/library/alien/structs.facts"
-        "/library/alien/syntax.facts"
+        "/library/compiler/alien/alien-callback.facts"
+        "/library/compiler/alien/alien-invoke.facts"
+        "/library/compiler/alien/aliens.facts"
+        "/library/compiler/alien/c-types.facts"
+        "/library/compiler/alien/malloc.facts"
+        "/library/compiler/alien/structs.facts"
+        "/library/compiler/alien/syntax.facts"
         "/library/bootstrap/image.facts"
         "/library/collections/growable.facts"
         "/library/collections/arrays.facts"
@@ -293,11 +295,7 @@ vectors words ;
                 {
                     "/library/compiler/ppc/assembler.factor"
                     "/library/compiler/ppc/architecture.factor"
-                    ! "/library/compiler/ppc/generator.factor"
-                    ! "/library/compiler/ppc/slots.factor"
-                    ! "/library/compiler/ppc/stack.factor"
-                    ! "/library/compiler/ppc/fixnum.factor"
-                    ! "/library/compiler/ppc/alien.factor"
+                    "/library/compiler/ppc/intrinsics.factor"
                 }
             ]
         } {
diff --git a/library/alien/alien-callback.factor b/library/compiler/alien/alien-callback.factor
similarity index 100%
rename from library/alien/alien-callback.factor
rename to library/compiler/alien/alien-callback.factor
diff --git a/library/alien/alien-callback.facts b/library/compiler/alien/alien-callback.facts
similarity index 100%
rename from library/alien/alien-callback.facts
rename to library/compiler/alien/alien-callback.facts
diff --git a/library/alien/alien-invoke.factor b/library/compiler/alien/alien-invoke.factor
similarity index 100%
rename from library/alien/alien-invoke.factor
rename to library/compiler/alien/alien-invoke.factor
diff --git a/library/alien/alien-invoke.facts b/library/compiler/alien/alien-invoke.facts
similarity index 100%
rename from library/alien/alien-invoke.facts
rename to library/compiler/alien/alien-invoke.facts
diff --git a/library/alien/aliens.factor b/library/compiler/alien/aliens.factor
similarity index 100%
rename from library/alien/aliens.factor
rename to library/compiler/alien/aliens.factor
diff --git a/library/alien/aliens.facts b/library/compiler/alien/aliens.facts
similarity index 100%
rename from library/alien/aliens.facts
rename to library/compiler/alien/aliens.facts
diff --git a/library/alien/c-types.factor b/library/compiler/alien/c-types.factor
similarity index 100%
rename from library/alien/c-types.factor
rename to library/compiler/alien/c-types.factor
diff --git a/library/alien/c-types.facts b/library/compiler/alien/c-types.facts
similarity index 100%
rename from library/alien/c-types.facts
rename to library/compiler/alien/c-types.facts
diff --git a/library/alien/compiler.factor b/library/compiler/alien/compiler.factor
similarity index 100%
rename from library/alien/compiler.factor
rename to library/compiler/alien/compiler.factor
diff --git a/library/alien/malloc.factor b/library/compiler/alien/malloc.factor
similarity index 100%
rename from library/alien/malloc.factor
rename to library/compiler/alien/malloc.factor
diff --git a/library/alien/malloc.facts b/library/compiler/alien/malloc.facts
similarity index 100%
rename from library/alien/malloc.facts
rename to library/compiler/alien/malloc.facts
diff --git a/library/alien/primitive-types.factor b/library/compiler/alien/primitive-types.factor
similarity index 100%
rename from library/alien/primitive-types.factor
rename to library/compiler/alien/primitive-types.factor
diff --git a/library/alien/structs.factor b/library/compiler/alien/structs.factor
similarity index 100%
rename from library/alien/structs.factor
rename to library/compiler/alien/structs.factor
diff --git a/library/alien/structs.facts b/library/compiler/alien/structs.facts
similarity index 100%
rename from library/alien/structs.facts
rename to library/compiler/alien/structs.facts
diff --git a/library/alien/syntax.factor b/library/compiler/alien/syntax.factor
similarity index 100%
rename from library/alien/syntax.factor
rename to library/compiler/alien/syntax.factor
diff --git a/library/alien/syntax.facts b/library/compiler/alien/syntax.facts
similarity index 100%
rename from library/alien/syntax.facts
rename to library/compiler/alien/syntax.facts
diff --git a/library/compiler/architecture.factor b/library/compiler/generator/architecture.factor
similarity index 100%
rename from library/compiler/architecture.factor
rename to library/compiler/generator/architecture.factor
diff --git a/library/compiler/assembler.factor b/library/compiler/generator/assembler.factor
similarity index 100%
rename from library/compiler/assembler.factor
rename to library/compiler/generator/assembler.factor
diff --git a/library/compiler/generator.factor b/library/compiler/generator/generator.factor
similarity index 100%
rename from library/compiler/generator.factor
rename to library/compiler/generator/generator.factor
diff --git a/library/compiler/templates.factor b/library/compiler/generator/templates.factor
similarity index 100%
rename from library/compiler/templates.factor
rename to library/compiler/generator/templates.factor
diff --git a/library/compiler/xt.factor b/library/compiler/generator/xt.factor
similarity index 100%
rename from library/compiler/xt.factor
rename to library/compiler/generator/xt.factor
diff --git a/library/inference/branches.factor b/library/compiler/inference/branches.factor
similarity index 100%
rename from library/inference/branches.factor
rename to library/compiler/inference/branches.factor
diff --git a/library/inference/dataflow.factor b/library/compiler/inference/dataflow.factor
similarity index 100%
rename from library/inference/dataflow.factor
rename to library/compiler/inference/dataflow.factor
diff --git a/library/inference/inference.factor b/library/compiler/inference/inference.factor
similarity index 100%
rename from library/inference/inference.factor
rename to library/compiler/inference/inference.factor
diff --git a/library/inference/inference.facts b/library/compiler/inference/inference.facts
similarity index 100%
rename from library/inference/inference.facts
rename to library/compiler/inference/inference.facts
diff --git a/library/inference/known-words.factor b/library/compiler/inference/known-words.factor
similarity index 100%
rename from library/inference/known-words.factor
rename to library/compiler/inference/known-words.factor
diff --git a/library/inference/shuffle.factor b/library/compiler/inference/shuffle.factor
similarity index 100%
rename from library/inference/shuffle.factor
rename to library/compiler/inference/shuffle.factor
diff --git a/library/inference/stack.factor b/library/compiler/inference/stack.factor
similarity index 100%
rename from library/inference/stack.factor
rename to library/compiler/inference/stack.factor
diff --git a/library/inference/words.factor b/library/compiler/inference/words.factor
similarity index 100%
rename from library/inference/words.factor
rename to library/compiler/inference/words.factor
diff --git a/library/inference/call-optimizers.factor b/library/compiler/optimizer/call-optimizers.factor
similarity index 100%
rename from library/inference/call-optimizers.factor
rename to library/compiler/optimizer/call-optimizers.factor
diff --git a/library/inference/class-infer.factor b/library/compiler/optimizer/class-infer.factor
similarity index 100%
rename from library/inference/class-infer.factor
rename to library/compiler/optimizer/class-infer.factor
diff --git a/library/inference/inline-methods.factor b/library/compiler/optimizer/inline-methods.factor
similarity index 100%
rename from library/inference/inline-methods.factor
rename to library/compiler/optimizer/inline-methods.factor
diff --git a/library/inference/kill-literals.factor b/library/compiler/optimizer/kill-literals.factor
similarity index 100%
rename from library/inference/kill-literals.factor
rename to library/compiler/optimizer/kill-literals.factor
diff --git a/library/inference/optimizer.factor b/library/compiler/optimizer/optimizer.factor
similarity index 100%
rename from library/inference/optimizer.factor
rename to library/compiler/optimizer/optimizer.factor
diff --git a/library/inference/print-dataflow.factor b/library/compiler/optimizer/print-dataflow.factor
similarity index 100%
rename from library/inference/print-dataflow.factor
rename to library/compiler/optimizer/print-dataflow.factor