diff --git a/build b/build
index 4c360c3..e6bbce9 100755
--- a/build
+++ b/build
@@ -14,7 +14,7 @@ export GOPATH=${PWD}/gopath
 eval $(go env)
 
 echo "Building rkt (stage0)..."
-go build -o $GOBIN/rkt ${REPO_PATH}/rkt
+go build -o $GOBIN/rkt ${REPO_PATH}/stage0
 
 echo "Building stage1..."
-go build -o $GOBIN/stage1 ${REPO_PATH}/scf
+go build -o $GOBIN/stage1 ${REPO_PATH}/stage1
diff --git a/scf/src b/scf/src
deleted file mode 120000
index 945c9b4..0000000
--- a/scf/src
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/rkt/rkt.go b/stage0/rkt.go
similarity index 100%
rename from rkt/rkt.go
rename to stage0/rkt.go
diff --git a/scf/container.go b/stage1/container.go
similarity index 100%
rename from scf/container.go
rename to stage1/container.go
diff --git a/scf/scf/examples/execgroup-skel/container b/stage1/examples/execgroup-skel/container
similarity index 100%
rename from scf/scf/examples/execgroup-skel/container
rename to stage1/examples/execgroup-skel/container
diff --git a/scf/scf/examples/execgroup-skel/stage1/opt/stage2/example_2ecom_2fdata_2ddownloader_2d1_2e0_2e0/apps/example.com/data-downloader-1.0.0 b/stage1/examples/execgroup-skel/stage1/opt/stage2/example_2ecom_2fdata_2ddownloader_2d1_2e0_2e0/apps/example.com/data-downloader-1.0.0
similarity index 100%
rename from scf/scf/examples/execgroup-skel/stage1/opt/stage2/example_2ecom_2fdata_2ddownloader_2d1_2e0_2e0/apps/example.com/data-downloader-1.0.0
rename to stage1/examples/execgroup-skel/stage1/opt/stage2/example_2ecom_2fdata_2ddownloader_2d1_2e0_2e0/apps/example.com/data-downloader-1.0.0
diff --git a/scf/scf/examples/execgroup-skel/stage1/opt/stage2/example_2ecom_2flogbackup_2d1_2e0_2e0/apps/example.com/logbackup-1.0.0 b/stage1/examples/execgroup-skel/stage1/opt/stage2/example_2ecom_2flogbackup_2d1_2e0_2e0/apps/example.com/logbackup-1.0.0
similarity index 100%
rename from scf/scf/examples/execgroup-skel/stage1/opt/stage2/example_2ecom_2flogbackup_2d1_2e0_2e0/apps/example.com/logbackup-1.0.0
rename to stage1/examples/execgroup-skel/stage1/opt/stage2/example_2ecom_2flogbackup_2d1_2e0_2e0/apps/example.com/logbackup-1.0.0
diff --git a/scf/scf/examples/execgroup-skel/stage1/opt/stage2/example_2ecom_2fourapp_2d1_2e0_2e0/apps/example.com/ourapp-1.0.0 b/stage1/examples/execgroup-skel/stage1/opt/stage2/example_2ecom_2fourapp_2d1_2e0_2e0/apps/example.com/ourapp-1.0.0
similarity index 100%
rename from scf/scf/examples/execgroup-skel/stage1/opt/stage2/example_2ecom_2fourapp_2d1_2e0_2e0/apps/example.com/ourapp-1.0.0
rename to stage1/examples/execgroup-skel/stage1/opt/stage2/example_2ecom_2fourapp_2d1_2e0_2e0/apps/example.com/ourapp-1.0.0
diff --git a/scf/init.go b/stage1/init.go
similarity index 100%
rename from scf/init.go
rename to stage1/init.go
diff --git a/scf/path.go b/stage1/path.go
similarity index 100%
rename from scf/path.go
rename to stage1/path.go
diff --git a/scf/transform.go b/stage1/transform.go
similarity index 100%
rename from scf/transform.go
rename to stage1/transform.go