diff --git a/c/msgpack b/c/msgpack
deleted file mode 120000
index 945c9b46..00000000
--- a/c/msgpack
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/c/object.h b/c/msgpack/object.h
similarity index 100%
rename from c/object.h
rename to c/msgpack/object.h
diff --git a/c/pack.h b/c/msgpack/pack.h
similarity index 100%
rename from c/pack.h
rename to c/msgpack/pack.h
diff --git a/c/sbuffer.h b/c/msgpack/sbuffer.h
similarity index 100%
rename from c/sbuffer.h
rename to c/msgpack/sbuffer.h
diff --git a/c/unpack.h b/c/msgpack/unpack.h
similarity index 100%
rename from c/unpack.h
rename to c/msgpack/unpack.h
diff --git a/c/vrefbuffer.h b/c/msgpack/vrefbuffer.h
similarity index 100%
rename from c/vrefbuffer.h
rename to c/msgpack/vrefbuffer.h
diff --git a/c/zone.h b/c/msgpack/zone.h
similarity index 100%
rename from c/zone.h
rename to c/msgpack/zone.h
diff --git a/cpp/msgpack b/cpp/msgpack
deleted file mode 120000
index 945c9b46..00000000
--- a/cpp/msgpack
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/cpp/object.hpp b/cpp/msgpack/object.hpp
similarity index 100%
rename from cpp/object.hpp
rename to cpp/msgpack/object.hpp
diff --git a/cpp/pack.hpp b/cpp/msgpack/pack.hpp
similarity index 100%
rename from cpp/pack.hpp
rename to cpp/msgpack/pack.hpp
diff --git a/cpp/sbuffer.hpp b/cpp/msgpack/sbuffer.hpp
similarity index 100%
rename from cpp/sbuffer.hpp
rename to cpp/msgpack/sbuffer.hpp
diff --git a/cpp/type.hpp b/cpp/msgpack/type.hpp
similarity index 100%
rename from cpp/type.hpp
rename to cpp/msgpack/type.hpp
diff --git a/cpp/type/bool.hpp b/cpp/msgpack/type/bool.hpp
similarity index 100%
rename from cpp/type/bool.hpp
rename to cpp/msgpack/type/bool.hpp
diff --git a/cpp/type/define.hpp.erb b/cpp/msgpack/type/define.hpp.erb
similarity index 100%
rename from cpp/type/define.hpp.erb
rename to cpp/msgpack/type/define.hpp.erb
diff --git a/cpp/type/deque.hpp b/cpp/msgpack/type/deque.hpp
similarity index 100%
rename from cpp/type/deque.hpp
rename to cpp/msgpack/type/deque.hpp
diff --git a/cpp/type/float.hpp b/cpp/msgpack/type/float.hpp
similarity index 100%
rename from cpp/type/float.hpp
rename to cpp/msgpack/type/float.hpp
diff --git a/cpp/type/int.hpp b/cpp/msgpack/type/int.hpp
similarity index 100%
rename from cpp/type/int.hpp
rename to cpp/msgpack/type/int.hpp
diff --git a/cpp/type/list.hpp b/cpp/msgpack/type/list.hpp
similarity index 100%
rename from cpp/type/list.hpp
rename to cpp/msgpack/type/list.hpp
diff --git a/cpp/type/map.hpp b/cpp/msgpack/type/map.hpp
similarity index 100%
rename from cpp/type/map.hpp
rename to cpp/msgpack/type/map.hpp
diff --git a/cpp/type/nil.hpp b/cpp/msgpack/type/nil.hpp
similarity index 100%
rename from cpp/type/nil.hpp
rename to cpp/msgpack/type/nil.hpp
diff --git a/cpp/type/pair.hpp b/cpp/msgpack/type/pair.hpp
similarity index 100%
rename from cpp/type/pair.hpp
rename to cpp/msgpack/type/pair.hpp
diff --git a/cpp/type/raw.hpp b/cpp/msgpack/type/raw.hpp
similarity index 100%
rename from cpp/type/raw.hpp
rename to cpp/msgpack/type/raw.hpp
diff --git a/cpp/type/set.hpp b/cpp/msgpack/type/set.hpp
similarity index 100%
rename from cpp/type/set.hpp
rename to cpp/msgpack/type/set.hpp
diff --git a/cpp/type/string.hpp b/cpp/msgpack/type/string.hpp
similarity index 100%
rename from cpp/type/string.hpp
rename to cpp/msgpack/type/string.hpp
diff --git a/cpp/type/tr1/unordered_map.hpp b/cpp/msgpack/type/tr1/unordered_map.hpp
similarity index 100%
rename from cpp/type/tr1/unordered_map.hpp
rename to cpp/msgpack/type/tr1/unordered_map.hpp
diff --git a/cpp/type/tr1/unordered_set.hpp b/cpp/msgpack/type/tr1/unordered_set.hpp
similarity index 100%
rename from cpp/type/tr1/unordered_set.hpp
rename to cpp/msgpack/type/tr1/unordered_set.hpp
diff --git a/cpp/type/tuple.hpp.erb b/cpp/msgpack/type/tuple.hpp.erb
similarity index 100%
rename from cpp/type/tuple.hpp.erb
rename to cpp/msgpack/type/tuple.hpp.erb
diff --git a/cpp/type/vector.hpp b/cpp/msgpack/type/vector.hpp
similarity index 100%
rename from cpp/type/vector.hpp
rename to cpp/msgpack/type/vector.hpp
diff --git a/cpp/unpack.hpp b/cpp/msgpack/unpack.hpp
similarity index 100%
rename from cpp/unpack.hpp
rename to cpp/msgpack/unpack.hpp
diff --git a/cpp/vrefbuffer.hpp b/cpp/msgpack/vrefbuffer.hpp
similarity index 100%
rename from cpp/vrefbuffer.hpp
rename to cpp/msgpack/vrefbuffer.hpp
diff --git a/cpp/zone.hpp.erb b/cpp/msgpack/zone.hpp.erb
similarity index 100%
rename from cpp/zone.hpp.erb
rename to cpp/msgpack/zone.hpp.erb