diff --git a/sys/denali/denali.cpp b/sys/denali/denali.cpp
index 2811e6f..ad19818 100644
--- a/sys/denali/denali.cpp
+++ b/sys/denali/denali.cpp
@@ -4,7 +4,6 @@
 #include <mammoth/init.h>
 #include <mammoth/port_client.h>
 #include <stdint.h>
-#include <yellowstone.h>
 #include <yellowstone/yellowstone.yunq.client.h>
 
 #include "ahci/ahci_driver.h"
diff --git a/sys/yellowstone/CMakeLists.txt b/sys/yellowstone/CMakeLists.txt
index 7a3d6ff..06fbdfd 100644
--- a/sys/yellowstone/CMakeLists.txt
+++ b/sys/yellowstone/CMakeLists.txt
@@ -22,14 +22,13 @@ set_target_properties(yellowstone PROPERTIES
 
 
 add_library(yellowstone_yunq
-  include/yellowstone/yellowstone.yunq.cpp
-  include/yellowstone/yellowstone.yunq.client.cpp
-  include/yellowstone/yellowstone.yunq.server.cpp
+  lib/yellowstone/yellowstone.yunq.cpp
+  lib/yellowstone/yellowstone.yunq.client.cpp
+  lib/yellowstone/yellowstone.yunq.server.cpp
   )
 
 target_include_directories(yellowstone_yunq
-   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
-   PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
+  PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/lib")
 
 target_link_libraries(yellowstone_yunq
   denali_stub
diff --git a/sys/yellowstone/include/yellowstone.h b/sys/yellowstone/include/yellowstone.h
deleted file mode 100644
index ba1bb78..0000000
--- a/sys/yellowstone/include/yellowstone.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-const uint64_t kYellowstoneGetRegistration = 0x01;
-const uint64_t kYellowstoneGetAhci = 0x02;
-const uint64_t kYellowstoneGetDenali = 0x03;
-
-struct YellowstoneGetReq {
-  uint64_t type;
-};
-
-struct YellowstoneGetRegistrationResp {};
-struct YellowstoneGetAhciResp {
-  uint64_t type;
-  uint64_t ahci_length;
-};
-
-// Has a denali cap attached.
-struct YellowstoneGetDenaliResp {
-  uint64_t type;
-  uint64_t device_id;
-  uint64_t lba_offset;
-};
diff --git a/sys/yellowstone/include/yellowstone_stub.h b/sys/yellowstone/include/yellowstone_stub.h
deleted file mode 100644
index 71e4ff4..0000000
--- a/sys/yellowstone/include/yellowstone_stub.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include <denali/denali_client.h>
-#include <mammoth/endpoint_client.h>
-#include <mammoth/memory_region.h>
-#include <mammoth/port_client.h>
-#include <ztypes.h>
-
-class YellowstoneStub {
- public:
-  explicit YellowstoneStub(z_cap_t yellowstone_cap);
-
-  glcr::ErrorOr<MappedMemoryRegion> GetAhciConfig();
-  glcr::ErrorOr<ScopedDenaliClient> GetDenali();
-
-  [[nodiscard]] glcr::ErrorCode Register(glcr::String name,
-                                         const EndpointClient& client);
-
- private:
-  glcr::UniquePtr<EndpointClient> yellowstone_stub_;
-  PortClient register_port_;
-};
diff --git a/sys/yellowstone/include/yellowstone/yellowstone.yunq b/sys/yellowstone/lib/yellowstone/yellowstone.yunq
similarity index 100%
rename from sys/yellowstone/include/yellowstone/yellowstone.yunq
rename to sys/yellowstone/lib/yellowstone/yellowstone.yunq
diff --git a/sys/yellowstone/include/yellowstone/yellowstone.yunq.client.cpp b/sys/yellowstone/lib/yellowstone/yellowstone.yunq.client.cpp
similarity index 100%
rename from sys/yellowstone/include/yellowstone/yellowstone.yunq.client.cpp
rename to sys/yellowstone/lib/yellowstone/yellowstone.yunq.client.cpp
diff --git a/sys/yellowstone/include/yellowstone/yellowstone.yunq.client.h b/sys/yellowstone/lib/yellowstone/yellowstone.yunq.client.h
similarity index 100%
rename from sys/yellowstone/include/yellowstone/yellowstone.yunq.client.h
rename to sys/yellowstone/lib/yellowstone/yellowstone.yunq.client.h
diff --git a/sys/yellowstone/include/yellowstone/yellowstone.yunq.cpp b/sys/yellowstone/lib/yellowstone/yellowstone.yunq.cpp
similarity index 100%
rename from sys/yellowstone/include/yellowstone/yellowstone.yunq.cpp
rename to sys/yellowstone/lib/yellowstone/yellowstone.yunq.cpp
diff --git a/sys/yellowstone/include/yellowstone/yellowstone.yunq.h b/sys/yellowstone/lib/yellowstone/yellowstone.yunq.h
similarity index 100%
rename from sys/yellowstone/include/yellowstone/yellowstone.yunq.h
rename to sys/yellowstone/lib/yellowstone/yellowstone.yunq.h
diff --git a/sys/yellowstone/include/yellowstone/yellowstone.yunq.server.cpp b/sys/yellowstone/lib/yellowstone/yellowstone.yunq.server.cpp
similarity index 100%
rename from sys/yellowstone/include/yellowstone/yellowstone.yunq.server.cpp
rename to sys/yellowstone/lib/yellowstone/yellowstone.yunq.server.cpp
diff --git a/sys/yellowstone/include/yellowstone/yellowstone.yunq.server.h b/sys/yellowstone/lib/yellowstone/yellowstone.yunq.server.h
similarity index 100%
rename from sys/yellowstone/include/yellowstone/yellowstone.yunq.server.h
rename to sys/yellowstone/lib/yellowstone/yellowstone.yunq.server.h
diff --git a/sys/yellowstone/yellowstone_server.cpp b/sys/yellowstone/yellowstone_server.cpp
index 69dbef5..aa37405 100644
--- a/sys/yellowstone/yellowstone_server.cpp
+++ b/sys/yellowstone/yellowstone_server.cpp
@@ -9,7 +9,6 @@
 
 #include "hw/gpt.h"
 #include "hw/pcie.h"
-#include "include/yellowstone.h"
 
 namespace {
 
diff --git a/sys/yellowstone/yellowstone_server.h b/sys/yellowstone/yellowstone_server.h
index 633ab2d..c037f76 100644
--- a/sys/yellowstone/yellowstone_server.h
+++ b/sys/yellowstone/yellowstone_server.h
@@ -7,7 +7,7 @@
 #include <mammoth/thread.h>
 
 #include "hw/pcie.h"
-#include "include/yellowstone/yellowstone.yunq.server.h"
+#include "lib/yellowstone/yellowstone.yunq.server.h"
 
 class YellowstoneServer : public YellowstoneServerBase {
  public: