diff --git a/sandbox/btree/btree.c b/ds/btree.c
similarity index 100%
rename from sandbox/btree/btree.c
rename to ds/btree.c
diff --git a/sandbox/queue/queue.c b/ds/queue.c
similarity index 100%
rename from sandbox/queue/queue.c
rename to ds/queue.c
diff --git a/sandbox/btree/include/socks/btree.h b/include/socks/btree.h
similarity index 100%
rename from sandbox/btree/include/socks/btree.h
rename to include/socks/btree.h
diff --git a/sandbox/locks/include/socks/locks.h b/include/socks/locks.h
similarity index 100%
rename from sandbox/locks/include/socks/locks.h
rename to include/socks/locks.h
diff --git a/sandbox/memblock/include/socks/memblock.h b/include/socks/memblock.h
similarity index 100%
rename from sandbox/memblock/include/socks/memblock.h
rename to include/socks/memblock.h
diff --git a/sandbox/queue/include/socks/queue.h b/include/socks/queue.h
similarity index 100%
rename from sandbox/queue/include/socks/queue.h
rename to include/socks/queue.h
diff --git a/sandbox/base/include/socks/types.h b/include/socks/types.h
similarity index 100%
rename from sandbox/base/include/socks/types.h
rename to include/socks/types.h
diff --git a/sandbox/util/include/socks/util.h b/include/socks/util.h
similarity index 100%
rename from sandbox/util/include/socks/util.h
rename to include/socks/util.h
diff --git a/sandbox/vm/include/socks/vm.h b/include/socks/vm.h
similarity index 100%
rename from sandbox/vm/include/socks/vm.h
rename to include/socks/vm.h
diff --git a/sandbox/locks/spinlock.c b/kernel/spinlock.c
similarity index 100%
rename from sandbox/locks/spinlock.c
rename to kernel/spinlock.c
diff --git a/sandbox/base/include/socks/status.h b/sandbox/base/include/socks/status.h
deleted file mode 100644
index 6783f49..0000000
--- a/sandbox/base/include/socks/status.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef SOCKS_STATUS_H_
-#define SOCKS_STATUS_H_
-
-typedef unsigned int kern_status_t;
-
-#define KERN_OK			(0)
-#define KERN_ERR_UNIMPLEMENTED	(1)
-
-#endif
diff --git a/sandbox/util/data_size.c b/util/data_size.c
similarity index 100%
rename from sandbox/util/data_size.c
rename to util/data_size.c
diff --git a/sandbox/vm/bootstrap.c b/vm/bootstrap.c
similarity index 100%
rename from sandbox/vm/bootstrap.c
rename to vm/bootstrap.c
diff --git a/sandbox/vm/cache.c b/vm/cache.c
similarity index 100%
rename from sandbox/vm/cache.c
rename to vm/cache.c
diff --git a/sandbox/vm/kmalloc.c b/vm/kmalloc.c
similarity index 100%
rename from sandbox/vm/kmalloc.c
rename to vm/kmalloc.c
diff --git a/sandbox/memblock/memblock.c b/vm/memblock.c
similarity index 100%
rename from sandbox/memblock/memblock.c
rename to vm/memblock.c
diff --git a/sandbox/vm/page.c b/vm/page.c
similarity index 100%
rename from sandbox/vm/page.c
rename to vm/page.c
diff --git a/sandbox/vm/zone.c b/vm/zone.c
similarity index 100%
rename from sandbox/vm/zone.c
rename to vm/zone.c