diff --git a/library/Makefile.in b/library/Makefile.in
index b14a814ff9..b986195919 100644
--- a/library/Makefile.in
+++ b/library/Makefile.in
@@ -6,7 +6,7 @@ SRCS = $(shell find . -name '*.lean')
 OBJS = $(SRCS:.lean=.olean)
 DEPS = $(SRCS:.lean=.depend)
 OPTS = @LEAN_EXTRA_MAKE_OPTS@
-STAGE0_DIR = ../src/boot
+STAGE0_DIR = ../src/stage0
 STAGE1_DIR = ../src/stage1
 CPPS = $(addprefix $(STAGE1_DIR)/,$(patsubst %.lean,%.cpp,$(SRCS)))
 # ensure deterministic ordering
@@ -43,7 +43,7 @@ $(STAGE1_DIR)/libleanstdlib.a: $(patsubst %.cpp,%.o,$(CPPS))
 update-stage0:
 	rm -r $(STAGE0_DIR)/init
 	cp -R $(STAGE1_DIR)/init $(STAGE0_DIR)/init
-	echo "add_library (boot OBJECT $(CPPS_CORE))" > $(STAGE0_DIR)/CMakeLists.txt
+	echo "add_library (stage0 OBJECT $(CPPS_CORE))" > $(STAGE0_DIR)/CMakeLists.txt
 
 .PRECIOUS: %.depend $(STAGE1_DIR)/%.cpp
 
diff --git a/script/pre-push b/script/pre-push
index be3995896f..9859396fc1 100755
--- a/script/pre-push
+++ b/script/pre-push
@@ -4,7 +4,7 @@ DIR="$( cd "$( dirname "$0" )" && pwd )"
 CHECKER=$DIR/../../src/cmake/Modules/cpplint.py
 while read local_ref local_sha remote_ref remote_sha;
 do
-    CHANGED_FILES=`git diff --name-only $local_sha $remote_sha | grep '\(cpp\|h\)$' | grep -v 'src/boot/'`
+    CHANGED_FILES=`git diff --name-only $local_sha $remote_sha | grep '\(cpp\|h\)$' | grep -v 'src/stage0/'`
     if [ ! -z "$CHANGED_FILES" -a "$CHANGED_FILES" != " " ]; then
         echo $CHANGED_FILES | xargs $CHECKER
         RET=$?
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b47a242061..ab5caa5c8d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -444,7 +444,7 @@ add_subdirectory(frontends/lean)
 set(LEAN_OBJS ${LEAN_OBJS} $<TARGET_OBJECTS:lean_frontend>)
 add_subdirectory(init)
 set(LEAN_OBJS ${LEAN_OBJS} $<TARGET_OBJECTS:init>)
-add_subdirectory(boot)
+add_subdirectory(stage0)
 if(STAGE1)
   add_subdirectory(stage1)
 endif()
@@ -454,7 +454,7 @@ else()
    set(LEAN_LIBRARY_TYPE STATIC)
 endif()
 
-add_library(leanstatic_stage0 ${LEAN_LIBRARY_TYPE} ${LEAN_OBJS} $<TARGET_OBJECTS:boot>)
+add_library(leanstatic_stage0 ${LEAN_LIBRARY_TYPE} ${LEAN_OBJS} $<TARGET_OBJECTS:stage0>)
 target_link_libraries(leanstatic_stage0 ${EXTRA_LIBS})
 
 add_custom_target(build_leanstdlib
@@ -526,7 +526,7 @@ endfunction()
 escape_regex(LEAN_SOURCE_DIR_REGEX_SAFE ${LEAN_SOURCE_DIR})
 
 foreach(SOURCE ${LEAN_SOURCES})
-  if(${SOURCE} MATCHES "${LEAN_SOURCE_DIR_REGEX_SAFE}/(boot|stage.)/.*")
+  if(${SOURCE} MATCHES "${LEAN_SOURCE_DIR_REGEX_SAFE}/stage./.*")
     LIST(REMOVE_ITEM LEAN_SOURCES ${SOURCE})
   endif()
 endforeach()
diff --git a/src/boot/CMakeLists.txt b/src/boot/CMakeLists.txt
deleted file mode 100644
index 1bd237f4dc..0000000000
--- a/src/boot/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_library (boot OBJECT ./init/coe.cpp ./init/control/alternative.cpp ./init/control/applicative.cpp ./init/control/combinators.cpp ./init/control/default.cpp ./init/control/estate.cpp ./init/control/except.cpp ./init/control/functor.cpp ./init/control/id.cpp ./init/control/lift.cpp ./init/control/monad.cpp ./init/control/monad_fail.cpp ./init/control/option.cpp ./init/control/reader.cpp ./init/control/state.cpp ./init/core.cpp ./init/data/array/basic.cpp ./init/data/array/default.cpp ./init/data/basic.cpp ./init/data/char/basic.cpp ./init/data/char/default.cpp ./init/data/default.cpp ./init/data/dlist.cpp ./init/data/fin/basic.cpp ./init/data/fin/default.cpp ./init/data/hashable.cpp ./init/data/hashmap/basic.cpp ./init/data/int/basic.cpp ./init/data/int/default.cpp ./init/data/list/basic.cpp ./init/data/list/default.cpp ./init/data/list/instances.cpp ./init/data/nat/basic.cpp ./init/data/nat/bitwise.cpp ./init/data/nat/default.cpp ./init/data/nat/div.cpp ./init/data/option/basic.cpp ./init/data/option/instances.cpp ./init/data/ordering/basic.cpp ./init/data/ordering/default.cpp ./init/data/rbmap/basic.cpp ./init/data/rbmap/default.cpp ./init/data/rbtree/basic.cpp ./init/data/rbtree/default.cpp ./init/data/repr.cpp ./init/data/string/basic.cpp ./init/data/string/default.cpp ./init/data/to_string.cpp ./init/data/uint.cpp ./init/default.cpp ./init/env_ext.cpp ./init/fix.cpp ./init/function.cpp ./init/io.cpp ./init/lean/compiler/const_folding.cpp ./init/lean/compiler/default.cpp ./init/lean/compiler/ir.cpp ./init/lean/compiler/util.cpp ./init/lean/config.cpp ./init/lean/declaration.cpp ./init/lean/default.cpp ./init/lean/disjoint_set.cpp ./init/lean/elaborator.cpp ./init/lean/expander.cpp ./init/lean/expr.cpp ./init/lean/extern.cpp ./init/lean/format.cpp ./init/lean/frontend.cpp ./init/lean/kvmap.cpp ./init/lean/level.cpp ./init/lean/message.cpp ./init/lean/name.cpp ./init/lean/name_mangling.cpp ./init/lean/options.cpp ./init/lean/parser/basic.cpp ./init/lean/parser/combinators.cpp ./init/lean/parser/command.cpp ./init/lean/parser/declaration.cpp ./init/lean/parser/identifier.cpp ./init/lean/parser/level.cpp ./init/lean/parser/module.cpp ./init/lean/parser/notation.cpp ./init/lean/parser/parsec.cpp ./init/lean/parser/pratt.cpp ./init/lean/parser/rec.cpp ./init/lean/parser/string_literal.cpp ./init/lean/parser/syntax.cpp ./init/lean/parser/term.cpp ./init/lean/parser/token.cpp ./init/lean/parser/trie.cpp ./init/lean/position.cpp ./init/lean/trace.cpp ./init/lean/util.cpp ./init/platform.cpp ./init/util.cpp ./init/wf.cpp)
diff --git a/src/boot/.gitattributes b/src/stage0/.gitattributes
similarity index 100%
rename from src/boot/.gitattributes
rename to src/stage0/.gitattributes
diff --git a/src/stage0/CMakeLists.txt b/src/stage0/CMakeLists.txt
new file mode 100644
index 0000000000..18459fac66
--- /dev/null
+++ b/src/stage0/CMakeLists.txt
@@ -0,0 +1 @@
+add_library (stage0 OBJECT ./init/coe.cpp ./init/control/alternative.cpp ./init/control/applicative.cpp ./init/control/combinators.cpp ./init/control/default.cpp ./init/control/estate.cpp ./init/control/except.cpp ./init/control/functor.cpp ./init/control/id.cpp ./init/control/lift.cpp ./init/control/monad.cpp ./init/control/monad_fail.cpp ./init/control/option.cpp ./init/control/reader.cpp ./init/control/state.cpp ./init/core.cpp ./init/data/array/basic.cpp ./init/data/array/default.cpp ./init/data/basic.cpp ./init/data/char/basic.cpp ./init/data/char/default.cpp ./init/data/default.cpp ./init/data/dlist.cpp ./init/data/fin/basic.cpp ./init/data/fin/default.cpp ./init/data/hashable.cpp ./init/data/hashmap/basic.cpp ./init/data/int/basic.cpp ./init/data/int/default.cpp ./init/data/list/basic.cpp ./init/data/list/default.cpp ./init/data/list/instances.cpp ./init/data/nat/basic.cpp ./init/data/nat/bitwise.cpp ./init/data/nat/default.cpp ./init/data/nat/div.cpp ./init/data/option/basic.cpp ./init/data/option/instances.cpp ./init/data/ordering/basic.cpp ./init/data/ordering/default.cpp ./init/data/rbmap/basic.cpp ./init/data/rbmap/default.cpp ./init/data/rbtree/basic.cpp ./init/data/rbtree/default.cpp ./init/data/repr.cpp ./init/data/string/basic.cpp ./init/data/string/default.cpp ./init/data/to_string.cpp ./init/data/uint.cpp ./init/default.cpp ./init/env_ext.cpp ./init/fix.cpp ./init/function.cpp ./init/io.cpp ./init/lean/compiler/const_folding.cpp ./init/lean/compiler/default.cpp ./init/lean/compiler/ir.cpp ./init/lean/compiler/util.cpp ./init/lean/config.cpp ./init/lean/declaration.cpp ./init/lean/default.cpp ./init/lean/disjoint_set.cpp ./init/lean/elaborator.cpp ./init/lean/expander.cpp ./init/lean/expr.cpp ./init/lean/extern.cpp ./init/lean/format.cpp ./init/lean/frontend.cpp ./init/lean/kvmap.cpp ./init/lean/level.cpp ./init/lean/message.cpp ./init/lean/name.cpp ./init/lean/name_mangling.cpp ./init/lean/options.cpp ./init/lean/parser/basic.cpp ./init/lean/parser/combinators.cpp ./init/lean/parser/command.cpp ./init/lean/parser/declaration.cpp ./init/lean/parser/identifier.cpp ./init/lean/parser/level.cpp ./init/lean/parser/module.cpp ./init/lean/parser/notation.cpp ./init/lean/parser/parsec.cpp ./init/lean/parser/pratt.cpp ./init/lean/parser/rec.cpp ./init/lean/parser/string_literal.cpp ./init/lean/parser/syntax.cpp ./init/lean/parser/term.cpp ./init/lean/parser/token.cpp ./init/lean/parser/trie.cpp ./init/lean/position.cpp ./init/lean/trace.cpp ./init/lean/util.cpp ./init/platform.cpp ./init/util.cpp ./init/wf.cpp)
diff --git a/src/boot/init/coe.cpp b/src/stage0/init/coe.cpp
similarity index 100%
rename from src/boot/init/coe.cpp
rename to src/stage0/init/coe.cpp
diff --git a/src/boot/init/control/alternative.cpp b/src/stage0/init/control/alternative.cpp
similarity index 100%
rename from src/boot/init/control/alternative.cpp
rename to src/stage0/init/control/alternative.cpp
diff --git a/src/boot/init/control/applicative.cpp b/src/stage0/init/control/applicative.cpp
similarity index 100%
rename from src/boot/init/control/applicative.cpp
rename to src/stage0/init/control/applicative.cpp
diff --git a/src/boot/init/control/combinators.cpp b/src/stage0/init/control/combinators.cpp
similarity index 100%
rename from src/boot/init/control/combinators.cpp
rename to src/stage0/init/control/combinators.cpp
diff --git a/src/boot/init/control/default.cpp b/src/stage0/init/control/default.cpp
similarity index 100%
rename from src/boot/init/control/default.cpp
rename to src/stage0/init/control/default.cpp
diff --git a/src/boot/init/control/estate.cpp b/src/stage0/init/control/estate.cpp
similarity index 100%
rename from src/boot/init/control/estate.cpp
rename to src/stage0/init/control/estate.cpp
diff --git a/src/boot/init/control/except.cpp b/src/stage0/init/control/except.cpp
similarity index 100%
rename from src/boot/init/control/except.cpp
rename to src/stage0/init/control/except.cpp
diff --git a/src/boot/init/control/functor.cpp b/src/stage0/init/control/functor.cpp
similarity index 100%
rename from src/boot/init/control/functor.cpp
rename to src/stage0/init/control/functor.cpp
diff --git a/src/boot/init/control/id.cpp b/src/stage0/init/control/id.cpp
similarity index 100%
rename from src/boot/init/control/id.cpp
rename to src/stage0/init/control/id.cpp
diff --git a/src/boot/init/control/lift.cpp b/src/stage0/init/control/lift.cpp
similarity index 100%
rename from src/boot/init/control/lift.cpp
rename to src/stage0/init/control/lift.cpp
diff --git a/src/boot/init/control/monad.cpp b/src/stage0/init/control/monad.cpp
similarity index 100%
rename from src/boot/init/control/monad.cpp
rename to src/stage0/init/control/monad.cpp
diff --git a/src/boot/init/control/monad_fail.cpp b/src/stage0/init/control/monad_fail.cpp
similarity index 100%
rename from src/boot/init/control/monad_fail.cpp
rename to src/stage0/init/control/monad_fail.cpp
diff --git a/src/boot/init/control/option.cpp b/src/stage0/init/control/option.cpp
similarity index 100%
rename from src/boot/init/control/option.cpp
rename to src/stage0/init/control/option.cpp
diff --git a/src/boot/init/control/reader.cpp b/src/stage0/init/control/reader.cpp
similarity index 100%
rename from src/boot/init/control/reader.cpp
rename to src/stage0/init/control/reader.cpp
diff --git a/src/boot/init/control/state.cpp b/src/stage0/init/control/state.cpp
similarity index 100%
rename from src/boot/init/control/state.cpp
rename to src/stage0/init/control/state.cpp
diff --git a/src/boot/init/core.cpp b/src/stage0/init/core.cpp
similarity index 100%
rename from src/boot/init/core.cpp
rename to src/stage0/init/core.cpp
diff --git a/src/boot/init/data/array/basic.cpp b/src/stage0/init/data/array/basic.cpp
similarity index 100%
rename from src/boot/init/data/array/basic.cpp
rename to src/stage0/init/data/array/basic.cpp
diff --git a/src/boot/init/data/array/default.cpp b/src/stage0/init/data/array/default.cpp
similarity index 100%
rename from src/boot/init/data/array/default.cpp
rename to src/stage0/init/data/array/default.cpp
diff --git a/src/boot/init/data/basic.cpp b/src/stage0/init/data/basic.cpp
similarity index 100%
rename from src/boot/init/data/basic.cpp
rename to src/stage0/init/data/basic.cpp
diff --git a/src/boot/init/data/char/basic.cpp b/src/stage0/init/data/char/basic.cpp
similarity index 100%
rename from src/boot/init/data/char/basic.cpp
rename to src/stage0/init/data/char/basic.cpp
diff --git a/src/boot/init/data/char/default.cpp b/src/stage0/init/data/char/default.cpp
similarity index 100%
rename from src/boot/init/data/char/default.cpp
rename to src/stage0/init/data/char/default.cpp
diff --git a/src/boot/init/data/default.cpp b/src/stage0/init/data/default.cpp
similarity index 100%
rename from src/boot/init/data/default.cpp
rename to src/stage0/init/data/default.cpp
diff --git a/src/boot/init/data/dlist.cpp b/src/stage0/init/data/dlist.cpp
similarity index 100%
rename from src/boot/init/data/dlist.cpp
rename to src/stage0/init/data/dlist.cpp
diff --git a/src/boot/init/data/fin/basic.cpp b/src/stage0/init/data/fin/basic.cpp
similarity index 100%
rename from src/boot/init/data/fin/basic.cpp
rename to src/stage0/init/data/fin/basic.cpp
diff --git a/src/boot/init/data/fin/default.cpp b/src/stage0/init/data/fin/default.cpp
similarity index 100%
rename from src/boot/init/data/fin/default.cpp
rename to src/stage0/init/data/fin/default.cpp
diff --git a/src/boot/init/data/hashable.cpp b/src/stage0/init/data/hashable.cpp
similarity index 100%
rename from src/boot/init/data/hashable.cpp
rename to src/stage0/init/data/hashable.cpp
diff --git a/src/boot/init/data/hashmap/basic.cpp b/src/stage0/init/data/hashmap/basic.cpp
similarity index 100%
rename from src/boot/init/data/hashmap/basic.cpp
rename to src/stage0/init/data/hashmap/basic.cpp
diff --git a/src/boot/init/data/int/basic.cpp b/src/stage0/init/data/int/basic.cpp
similarity index 100%
rename from src/boot/init/data/int/basic.cpp
rename to src/stage0/init/data/int/basic.cpp
diff --git a/src/boot/init/data/int/default.cpp b/src/stage0/init/data/int/default.cpp
similarity index 100%
rename from src/boot/init/data/int/default.cpp
rename to src/stage0/init/data/int/default.cpp
diff --git a/src/boot/init/data/list/basic.cpp b/src/stage0/init/data/list/basic.cpp
similarity index 100%
rename from src/boot/init/data/list/basic.cpp
rename to src/stage0/init/data/list/basic.cpp
diff --git a/src/boot/init/data/list/default.cpp b/src/stage0/init/data/list/default.cpp
similarity index 100%
rename from src/boot/init/data/list/default.cpp
rename to src/stage0/init/data/list/default.cpp
diff --git a/src/boot/init/data/list/instances.cpp b/src/stage0/init/data/list/instances.cpp
similarity index 100%
rename from src/boot/init/data/list/instances.cpp
rename to src/stage0/init/data/list/instances.cpp
diff --git a/src/boot/init/data/nat/basic.cpp b/src/stage0/init/data/nat/basic.cpp
similarity index 100%
rename from src/boot/init/data/nat/basic.cpp
rename to src/stage0/init/data/nat/basic.cpp
diff --git a/src/boot/init/data/nat/bitwise.cpp b/src/stage0/init/data/nat/bitwise.cpp
similarity index 100%
rename from src/boot/init/data/nat/bitwise.cpp
rename to src/stage0/init/data/nat/bitwise.cpp
diff --git a/src/boot/init/data/nat/default.cpp b/src/stage0/init/data/nat/default.cpp
similarity index 100%
rename from src/boot/init/data/nat/default.cpp
rename to src/stage0/init/data/nat/default.cpp
diff --git a/src/boot/init/data/nat/div.cpp b/src/stage0/init/data/nat/div.cpp
similarity index 100%
rename from src/boot/init/data/nat/div.cpp
rename to src/stage0/init/data/nat/div.cpp
diff --git a/src/boot/init/data/option/basic.cpp b/src/stage0/init/data/option/basic.cpp
similarity index 100%
rename from src/boot/init/data/option/basic.cpp
rename to src/stage0/init/data/option/basic.cpp
diff --git a/src/boot/init/data/option/instances.cpp b/src/stage0/init/data/option/instances.cpp
similarity index 100%
rename from src/boot/init/data/option/instances.cpp
rename to src/stage0/init/data/option/instances.cpp
diff --git a/src/boot/init/data/ordering/basic.cpp b/src/stage0/init/data/ordering/basic.cpp
similarity index 100%
rename from src/boot/init/data/ordering/basic.cpp
rename to src/stage0/init/data/ordering/basic.cpp
diff --git a/src/boot/init/data/ordering/default.cpp b/src/stage0/init/data/ordering/default.cpp
similarity index 100%
rename from src/boot/init/data/ordering/default.cpp
rename to src/stage0/init/data/ordering/default.cpp
diff --git a/src/boot/init/data/rbmap/basic.cpp b/src/stage0/init/data/rbmap/basic.cpp
similarity index 100%
rename from src/boot/init/data/rbmap/basic.cpp
rename to src/stage0/init/data/rbmap/basic.cpp
diff --git a/src/boot/init/data/rbmap/default.cpp b/src/stage0/init/data/rbmap/default.cpp
similarity index 100%
rename from src/boot/init/data/rbmap/default.cpp
rename to src/stage0/init/data/rbmap/default.cpp
diff --git a/src/boot/init/data/rbtree/basic.cpp b/src/stage0/init/data/rbtree/basic.cpp
similarity index 100%
rename from src/boot/init/data/rbtree/basic.cpp
rename to src/stage0/init/data/rbtree/basic.cpp
diff --git a/src/boot/init/data/rbtree/default.cpp b/src/stage0/init/data/rbtree/default.cpp
similarity index 100%
rename from src/boot/init/data/rbtree/default.cpp
rename to src/stage0/init/data/rbtree/default.cpp
diff --git a/src/boot/init/data/repr.cpp b/src/stage0/init/data/repr.cpp
similarity index 100%
rename from src/boot/init/data/repr.cpp
rename to src/stage0/init/data/repr.cpp
diff --git a/src/boot/init/data/string/basic.cpp b/src/stage0/init/data/string/basic.cpp
similarity index 100%
rename from src/boot/init/data/string/basic.cpp
rename to src/stage0/init/data/string/basic.cpp
diff --git a/src/boot/init/data/string/default.cpp b/src/stage0/init/data/string/default.cpp
similarity index 100%
rename from src/boot/init/data/string/default.cpp
rename to src/stage0/init/data/string/default.cpp
diff --git a/src/boot/init/data/to_string.cpp b/src/stage0/init/data/to_string.cpp
similarity index 100%
rename from src/boot/init/data/to_string.cpp
rename to src/stage0/init/data/to_string.cpp
diff --git a/src/boot/init/data/uint.cpp b/src/stage0/init/data/uint.cpp
similarity index 100%
rename from src/boot/init/data/uint.cpp
rename to src/stage0/init/data/uint.cpp
diff --git a/src/boot/init/default.cpp b/src/stage0/init/default.cpp
similarity index 100%
rename from src/boot/init/default.cpp
rename to src/stage0/init/default.cpp
diff --git a/src/boot/init/env_ext.cpp b/src/stage0/init/env_ext.cpp
similarity index 100%
rename from src/boot/init/env_ext.cpp
rename to src/stage0/init/env_ext.cpp
diff --git a/src/boot/init/fix.cpp b/src/stage0/init/fix.cpp
similarity index 100%
rename from src/boot/init/fix.cpp
rename to src/stage0/init/fix.cpp
diff --git a/src/boot/init/function.cpp b/src/stage0/init/function.cpp
similarity index 100%
rename from src/boot/init/function.cpp
rename to src/stage0/init/function.cpp
diff --git a/src/boot/init/io.cpp b/src/stage0/init/io.cpp
similarity index 100%
rename from src/boot/init/io.cpp
rename to src/stage0/init/io.cpp
diff --git a/src/boot/init/lean/compiler/const_folding.cpp b/src/stage0/init/lean/compiler/const_folding.cpp
similarity index 100%
rename from src/boot/init/lean/compiler/const_folding.cpp
rename to src/stage0/init/lean/compiler/const_folding.cpp
diff --git a/src/boot/init/lean/compiler/default.cpp b/src/stage0/init/lean/compiler/default.cpp
similarity index 100%
rename from src/boot/init/lean/compiler/default.cpp
rename to src/stage0/init/lean/compiler/default.cpp
diff --git a/src/boot/init/lean/compiler/ir.cpp b/src/stage0/init/lean/compiler/ir.cpp
similarity index 100%
rename from src/boot/init/lean/compiler/ir.cpp
rename to src/stage0/init/lean/compiler/ir.cpp
diff --git a/src/boot/init/lean/compiler/util.cpp b/src/stage0/init/lean/compiler/util.cpp
similarity index 100%
rename from src/boot/init/lean/compiler/util.cpp
rename to src/stage0/init/lean/compiler/util.cpp
diff --git a/src/boot/init/lean/config.cpp b/src/stage0/init/lean/config.cpp
similarity index 100%
rename from src/boot/init/lean/config.cpp
rename to src/stage0/init/lean/config.cpp
diff --git a/src/boot/init/lean/declaration.cpp b/src/stage0/init/lean/declaration.cpp
similarity index 100%
rename from src/boot/init/lean/declaration.cpp
rename to src/stage0/init/lean/declaration.cpp
diff --git a/src/boot/init/lean/default.cpp b/src/stage0/init/lean/default.cpp
similarity index 100%
rename from src/boot/init/lean/default.cpp
rename to src/stage0/init/lean/default.cpp
diff --git a/src/boot/init/lean/disjoint_set.cpp b/src/stage0/init/lean/disjoint_set.cpp
similarity index 100%
rename from src/boot/init/lean/disjoint_set.cpp
rename to src/stage0/init/lean/disjoint_set.cpp
diff --git a/src/boot/init/lean/elaborator.cpp b/src/stage0/init/lean/elaborator.cpp
similarity index 100%
rename from src/boot/init/lean/elaborator.cpp
rename to src/stage0/init/lean/elaborator.cpp
diff --git a/src/boot/init/lean/expander.cpp b/src/stage0/init/lean/expander.cpp
similarity index 100%
rename from src/boot/init/lean/expander.cpp
rename to src/stage0/init/lean/expander.cpp
diff --git a/src/boot/init/lean/expr.cpp b/src/stage0/init/lean/expr.cpp
similarity index 100%
rename from src/boot/init/lean/expr.cpp
rename to src/stage0/init/lean/expr.cpp
diff --git a/src/boot/init/lean/extern.cpp b/src/stage0/init/lean/extern.cpp
similarity index 100%
rename from src/boot/init/lean/extern.cpp
rename to src/stage0/init/lean/extern.cpp
diff --git a/src/boot/init/lean/format.cpp b/src/stage0/init/lean/format.cpp
similarity index 100%
rename from src/boot/init/lean/format.cpp
rename to src/stage0/init/lean/format.cpp
diff --git a/src/boot/init/lean/frontend.cpp b/src/stage0/init/lean/frontend.cpp
similarity index 100%
rename from src/boot/init/lean/frontend.cpp
rename to src/stage0/init/lean/frontend.cpp
diff --git a/src/boot/init/lean/kvmap.cpp b/src/stage0/init/lean/kvmap.cpp
similarity index 100%
rename from src/boot/init/lean/kvmap.cpp
rename to src/stage0/init/lean/kvmap.cpp
diff --git a/src/boot/init/lean/level.cpp b/src/stage0/init/lean/level.cpp
similarity index 100%
rename from src/boot/init/lean/level.cpp
rename to src/stage0/init/lean/level.cpp
diff --git a/src/boot/init/lean/message.cpp b/src/stage0/init/lean/message.cpp
similarity index 100%
rename from src/boot/init/lean/message.cpp
rename to src/stage0/init/lean/message.cpp
diff --git a/src/boot/init/lean/name.cpp b/src/stage0/init/lean/name.cpp
similarity index 100%
rename from src/boot/init/lean/name.cpp
rename to src/stage0/init/lean/name.cpp
diff --git a/src/boot/init/lean/name_mangling.cpp b/src/stage0/init/lean/name_mangling.cpp
similarity index 100%
rename from src/boot/init/lean/name_mangling.cpp
rename to src/stage0/init/lean/name_mangling.cpp
diff --git a/src/boot/init/lean/options.cpp b/src/stage0/init/lean/options.cpp
similarity index 100%
rename from src/boot/init/lean/options.cpp
rename to src/stage0/init/lean/options.cpp
diff --git a/src/boot/init/lean/parser/basic.cpp b/src/stage0/init/lean/parser/basic.cpp
similarity index 100%
rename from src/boot/init/lean/parser/basic.cpp
rename to src/stage0/init/lean/parser/basic.cpp
diff --git a/src/boot/init/lean/parser/combinators.cpp b/src/stage0/init/lean/parser/combinators.cpp
similarity index 100%
rename from src/boot/init/lean/parser/combinators.cpp
rename to src/stage0/init/lean/parser/combinators.cpp
diff --git a/src/boot/init/lean/parser/command.cpp b/src/stage0/init/lean/parser/command.cpp
similarity index 100%
rename from src/boot/init/lean/parser/command.cpp
rename to src/stage0/init/lean/parser/command.cpp
diff --git a/src/boot/init/lean/parser/declaration.cpp b/src/stage0/init/lean/parser/declaration.cpp
similarity index 100%
rename from src/boot/init/lean/parser/declaration.cpp
rename to src/stage0/init/lean/parser/declaration.cpp
diff --git a/src/boot/init/lean/parser/identifier.cpp b/src/stage0/init/lean/parser/identifier.cpp
similarity index 100%
rename from src/boot/init/lean/parser/identifier.cpp
rename to src/stage0/init/lean/parser/identifier.cpp
diff --git a/src/boot/init/lean/parser/level.cpp b/src/stage0/init/lean/parser/level.cpp
similarity index 100%
rename from src/boot/init/lean/parser/level.cpp
rename to src/stage0/init/lean/parser/level.cpp
diff --git a/src/boot/init/lean/parser/module.cpp b/src/stage0/init/lean/parser/module.cpp
similarity index 100%
rename from src/boot/init/lean/parser/module.cpp
rename to src/stage0/init/lean/parser/module.cpp
diff --git a/src/boot/init/lean/parser/notation.cpp b/src/stage0/init/lean/parser/notation.cpp
similarity index 100%
rename from src/boot/init/lean/parser/notation.cpp
rename to src/stage0/init/lean/parser/notation.cpp
diff --git a/src/boot/init/lean/parser/parsec.cpp b/src/stage0/init/lean/parser/parsec.cpp
similarity index 100%
rename from src/boot/init/lean/parser/parsec.cpp
rename to src/stage0/init/lean/parser/parsec.cpp
diff --git a/src/boot/init/lean/parser/pratt.cpp b/src/stage0/init/lean/parser/pratt.cpp
similarity index 100%
rename from src/boot/init/lean/parser/pratt.cpp
rename to src/stage0/init/lean/parser/pratt.cpp
diff --git a/src/boot/init/lean/parser/rec.cpp b/src/stage0/init/lean/parser/rec.cpp
similarity index 100%
rename from src/boot/init/lean/parser/rec.cpp
rename to src/stage0/init/lean/parser/rec.cpp
diff --git a/src/boot/init/lean/parser/string_literal.cpp b/src/stage0/init/lean/parser/string_literal.cpp
similarity index 100%
rename from src/boot/init/lean/parser/string_literal.cpp
rename to src/stage0/init/lean/parser/string_literal.cpp
diff --git a/src/boot/init/lean/parser/syntax.cpp b/src/stage0/init/lean/parser/syntax.cpp
similarity index 100%
rename from src/boot/init/lean/parser/syntax.cpp
rename to src/stage0/init/lean/parser/syntax.cpp
diff --git a/src/boot/init/lean/parser/term.cpp b/src/stage0/init/lean/parser/term.cpp
similarity index 100%
rename from src/boot/init/lean/parser/term.cpp
rename to src/stage0/init/lean/parser/term.cpp
diff --git a/src/boot/init/lean/parser/token.cpp b/src/stage0/init/lean/parser/token.cpp
similarity index 100%
rename from src/boot/init/lean/parser/token.cpp
rename to src/stage0/init/lean/parser/token.cpp
diff --git a/src/boot/init/lean/parser/trie.cpp b/src/stage0/init/lean/parser/trie.cpp
similarity index 100%
rename from src/boot/init/lean/parser/trie.cpp
rename to src/stage0/init/lean/parser/trie.cpp
diff --git a/src/boot/init/lean/position.cpp b/src/stage0/init/lean/position.cpp
similarity index 100%
rename from src/boot/init/lean/position.cpp
rename to src/stage0/init/lean/position.cpp
diff --git a/src/boot/init/lean/trace.cpp b/src/stage0/init/lean/trace.cpp
similarity index 100%
rename from src/boot/init/lean/trace.cpp
rename to src/stage0/init/lean/trace.cpp
diff --git a/src/boot/init/lean/util.cpp b/src/stage0/init/lean/util.cpp
similarity index 100%
rename from src/boot/init/lean/util.cpp
rename to src/stage0/init/lean/util.cpp
diff --git a/src/boot/init/platform.cpp b/src/stage0/init/platform.cpp
similarity index 100%
rename from src/boot/init/platform.cpp
rename to src/stage0/init/platform.cpp
diff --git a/src/boot/init/util.cpp b/src/stage0/init/util.cpp
similarity index 100%
rename from src/boot/init/util.cpp
rename to src/stage0/init/util.cpp
diff --git a/src/boot/init/wf.cpp b/src/stage0/init/wf.cpp
similarity index 100%
rename from src/boot/init/wf.cpp
rename to src/stage0/init/wf.cpp