diff --git a/Cargo.lock b/Cargo.lock
index feda1569..0ac2e678 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,11 +2,15 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "blog_os"
+version = "0.1.0"
+
 [[package]]
 name = "bootloader_api"
-version = "0.11.2"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec2d46a2b93edb1383023db2a95fc9480847a6e137c60e214f3fb62727f028da"
+checksum = "19c9d143f231f95e18d3907023e4a8e6a3cbebb7b09ce7da4774a17edf4cce6d"
 
 [[package]]
 name = "kernel"
diff --git a/Cargo.toml b/Cargo.toml
index 90b04d76..7db62664 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,11 @@
 [package]
-name = "kernel"
+name = "blog_os"
 version = "0.1.0"
 edition = "2021"
 
+[workspace]
+members = ["kernel"]
+
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bootloader_api = "0.11.0"
diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml
new file mode 100644
index 00000000..90b04d76
--- /dev/null
+++ b/kernel/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "kernel"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+bootloader_api = "0.11.0"
diff --git a/kernel/src/main.rs b/kernel/src/main.rs
new file mode 100644
index 00000000..9c2ce591
--- /dev/null
+++ b/kernel/src/main.rs
@@ -0,0 +1,16 @@
+#![no_std]
+#![no_main]
+
+use core::panic::PanicInfo;
+
+bootloader_api::entry_point!(kernel_main);
+
+fn kernel_main(bootinfo: &'static mut bootloader_api::BootInfo) -> ! {
+    loop {}
+}
+
+/// This function is called on panic.
+#[panic_handler]
+fn panic(_info: &PanicInfo) -> ! {
+    loop {}
+}
diff --git a/src/main.rs b/src/main.rs
index 9c2ce591..e7a11a96 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,16 +1,3 @@
-#![no_std]
-#![no_main]
-
-use core::panic::PanicInfo;
-
-bootloader_api::entry_point!(kernel_main);
-
-fn kernel_main(bootinfo: &'static mut bootloader_api::BootInfo) -> ! {
-    loop {}
-}
-
-/// This function is called on panic.
-#[panic_handler]
-fn panic(_info: &PanicInfo) -> ! {
-    loop {}
+fn main() {
+    println!("Hello, world!");
 }