diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae39d02..3964bc3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CMAKE_C_EXTENSIONS OFF)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-set(b_modules core ds object serial term cmd io compress)
+set(b_modules core ds serial term cmd io compress)
 
 set(b_system_name ${CMAKE_SYSTEM_NAME})
 string(TOLOWER ${b_system_name} b_system_name)
diff --git a/object/class.c b/core/class.c
similarity index 97%
rename from object/class.c
rename to core/class.c
index b5449cc..4871c80 100644
--- a/object/class.c
+++ b/core/class.c
@@ -2,7 +2,7 @@
 
 #include "type.h"
 
-#include <blue/object/class.h>
+#include <blue/core/class.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/object/class.h b/core/class.h
similarity index 100%
rename from object/class.h
rename to core/class.h
diff --git a/object/include/blue/object/class.h b/core/include/blue/core/class.h
similarity index 93%
rename from object/include/blue/object/class.h
rename to core/include/blue/core/class.h
index d6a0ce2..e09776b 100644
--- a/object/include/blue/object/class.h
+++ b/core/include/blue/core/class.h
@@ -1,7 +1,7 @@
 #ifndef BLUE_OBJECT_CLASS_H_
 #define BLUE_OBJECT_CLASS_H_
 
-#include <blue/object/type.h>
+#include <blue/core/type.h>
 
 #define B_CLASS_MAGIC 0xDEADFACEDCAFEBEDULL
 #define B_CLASS(p)    ((b_class *)(p))
diff --git a/object/include/blue/object/macros.h b/core/include/blue/core/macros.h
similarity index 97%
rename from object/include/blue/object/macros.h
rename to core/include/blue/core/macros.h
index 69a96b7..ee9beb9 100644
--- a/object/include/blue/object/macros.h
+++ b/core/include/blue/core/macros.h
@@ -1,10 +1,10 @@
-#ifndef BLUE_OBJECT_MACROS_H_
-#define BLUE_OBJECT_MACROS_H_
+#ifndef BLUE_CORE_MACROS_H_
+#define BLUE_CORE_MACROS_H_
 
+#include <blue/core/class.h>
+#include <blue/core/object.h>
 #include <blue/core/thread.h>
-#include <blue/object/class.h>
-#include <blue/object/object.h>
-#include <blue/object/type.h>
+#include <blue/core/type.h>
 #include <stdlib.h>
 
 #define __B_IFACE_I0(p, x) p##x
diff --git a/object/include/blue/object/object.h b/core/include/blue/core/object.h
similarity index 93%
rename from object/include/blue/object/object.h
rename to core/include/blue/core/object.h
index b1c18db..2a929be 100644
--- a/object/include/blue/object/object.h
+++ b/core/include/blue/core/object.h
@@ -1,9 +1,9 @@
-#ifndef BLUE_OBJECT_OBJECT_H_
-#define BLUE_OBJECT_OBJECT_H_
+#ifndef BLUE_CORE_OBJECT_H_
+#define BLUE_CORE_OBJECT_H_
 
 #include <blue/core/misc.h>
 #include <blue/core/stringstream.h>
-#include <blue/object/type.h>
+#include <blue/core/type.h>
 
 #define B_OBJECT_MAGIC 0xDECAFC0C0ABEEF13ULL
 
diff --git a/object/include/blue/object/type.h b/core/include/blue/core/type.h
similarity index 95%
rename from object/include/blue/object/type.h
rename to core/include/blue/core/type.h
index 6ce6c63..4559bd5 100644
--- a/object/include/blue/object/type.h
+++ b/core/include/blue/core/type.h
@@ -1,5 +1,5 @@
-#ifndef BLUE_OBJECT_TYPE_H_
-#define BLUE_OBJECT_TYPE_H_
+#ifndef BLUE_CORE_TYPE_H_
+#define BLUE_CORE_TYPE_H_
 
 #include <blue/core/error.h>
 #include <blue/core/misc.h>
diff --git a/object/object.c b/core/object.c
similarity index 97%
rename from object/object.c
rename to core/object.c
index 7492db4..29d8385 100644
--- a/object/object.c
+++ b/core/object.c
@@ -2,10 +2,10 @@
 
 #include "type.h"
 
+#include <blue/core/class.h>
+#include <blue/core/macros.h>
+#include <blue/core/object.h>
 #include <blue/core/thread.h>
-#include <blue/object/class.h>
-#include <blue/object/macros.h>
-#include <blue/object/object.h>
 
 B_TYPE_CLASS_DEFINITION_BEGIN(b_object)
 	B_TYPE_CLASS_INTERFACE_BEGIN(b_object, B_TYPE_OBJECT)
diff --git a/object/object.h b/core/object.h
similarity index 100%
rename from object/object.h
rename to core/object.h
diff --git a/object/type.c b/core/type.c
similarity index 99%
rename from object/type.c
rename to core/type.c
index 1d272f1..ec04409 100644
--- a/object/type.c
+++ b/core/type.c
@@ -5,8 +5,8 @@
 
 #include <blue/core/btree.h>
 #include <blue/core/endian.h>
-#include <blue/object/object.h>
-#include <blue/object/type.h>
+#include <blue/core/object.h>
+#include <blue/core/type.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/object/type.h b/core/type.h
similarity index 96%
rename from object/type.h
rename to core/type.h
index e8f347b..c5b46b8 100644
--- a/object/type.h
+++ b/core/type.h
@@ -2,7 +2,7 @@
 #define _TYPE_H_
 
 #include <blue/core/btree.h>
-#include <blue/object/type.h>
+#include <blue/core/type.h>
 #include <stddef.h>
 
 enum b_type_category {