diff --git a/src/core/BaseCore.cpp b/src/core/BaseCore.cpp
deleted file mode 100644
index b01c9efd..00000000
--- a/src/core/BaseCore.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <BaseCore.hpp>
-
-BaseCore::~BaseCore() {}
-BaseCore::BaseCore() {}
diff --git a/src/core/BaseCore.hpp b/src/core/BaseCore.hpp
deleted file mode 100644
index 03c49f27..00000000
--- a/src/core/BaseCore.hpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-#include <common.hpp>
-
-struct BaseCore {
-  virtual ~BaseCore() = 0;
-  BaseCore();
-};
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index f9f2a37c..862d9c9d 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -6,9 +6,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 add_subdirectory(gb)
 add_library(cores
-  BaseCore.cpp
-  BaseCore.hpp
   Scheduler.cpp
   Scheduler.hpp
   common.hpp)
 target_include_directories(cores PUBLIC .)
+target_link_libraries(cores PUBLIC gb)
diff --git a/src/core/gb/CMakeLists.txt b/src/core/gb/CMakeLists.txt
index 96915d6d..1a2d9426 100644
--- a/src/core/gb/CMakeLists.txt
+++ b/src/core/gb/CMakeLists.txt
@@ -2,3 +2,6 @@ cmake_minimum_required(VERSION 3.20)
 project(gb CXX)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+add_library(gb Core.hpp Core.cpp Cpu.hpp Cpu.cpp Ppu.hpp Ppu.cpp)
+target_include_directories(gb PUBLIC . ..)
diff --git a/src/core/gb/Core.cpp b/src/core/gb/Core.cpp
new file mode 100644
index 00000000..e69de29b
diff --git a/src/core/gb/Core.hpp b/src/core/gb/Core.hpp
new file mode 100644
index 00000000..3512c54e
--- /dev/null
+++ b/src/core/gb/Core.hpp
@@ -0,0 +1,13 @@
+#pragma once
+#include <Cpu.hpp>
+#include <Ppu.hpp>
+
+namespace natsukashii::core {
+struct Core {
+  Core();
+  void Run();
+private:
+  Cpu cpu;
+  // Ppu ppu;
+};
+}
diff --git a/src/core/gb/Cpu.cpp b/src/core/gb/Cpu.cpp
new file mode 100644
index 00000000..e69de29b
diff --git a/src/core/gb/Cpu.hpp b/src/core/gb/Cpu.hpp
new file mode 100644
index 00000000..0992de0b
--- /dev/null
+++ b/src/core/gb/Cpu.hpp
@@ -0,0 +1,6 @@
+#pragma once
+#include <common.hpp>
+
+namespace natsukashii::core {
+struct Cpu {};
+}
diff --git a/src/core/gb/Ppu.cpp b/src/core/gb/Ppu.cpp
new file mode 100644
index 00000000..e69de29b
diff --git a/src/core/gb/Ppu.hpp b/src/core/gb/Ppu.hpp
new file mode 100644
index 00000000..e69de29b