diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt
index 66fd7c4d..3e3b7e91 100644
--- a/android/CMakeLists.txt
+++ b/android/CMakeLists.txt
@@ -8,11 +8,12 @@ include_directories(
 )
 
 if (USE_SQLCIPHER)
-  include_directories(../cpp/sqlcipher)
+  include_directories(../cpp/opsqlite/sqlcipher)
 endif()
 
 if (USE_LIBSQL)
   include_directories(src/main/jniLibs/include)
+  include_directories(../cpp/opsqlite/libsql)
 endif()
 
 separate_arguments(SQLITE_FLAGS_LIST UNIX_COMMAND "${SQLITE_FLAGS}")
@@ -24,18 +25,18 @@ add_definitions(
 add_library(
   ${PACKAGE_NAME}
   SHARED
-  ../cpp/OPSqlite.cpp
-  ../cpp/utils.cpp
-  ../cpp/OPThreadPool.cpp
-  ../cpp/SmartHostObject.cpp
-  ../cpp/PreparedStatementHostObject.cpp
-  ../cpp/DumbHostObject.cpp
-  ../cpp/DBHostObject.cpp
+  ../cpp/opsqlite/OPSqlite.cpp
+  ../cpp/opsqlite/utils.cpp
+  ../cpp/opsqlite/OPThreadPool.cpp
+  ../cpp/opsqlite/SmartHostObject.cpp
+  ../cpp/opsqlite/PreparedStatementHostObject.cpp
+  ../cpp/opsqlite/DumbHostObject.cpp
+  ../cpp/opsqlite/DBHostObject.cpp
   cpp-adapter.cpp
 )
 
 if (USE_SQLCIPHER)
-  target_sources(${PACKAGE_NAME} PRIVATE ../cpp/sqlcipher/sqlite3.h ../cpp/sqlcipher/sqlite3.c ../cpp/bridge.cpp ../cpp/bridge.h)
+  target_sources(${PACKAGE_NAME} PRIVATE ../cpp/opsqlite/sqlcipher/sqlite3.h ../cpp/opsqlite/sqlcipher/sqlite3.c ../cpp/opsqlite/bridge.cpp ../cpp/opsqlite/bridge.h)
 
   add_definitions(
     -DOP_SQLITE_USE_SQLCIPHER=1
@@ -47,13 +48,13 @@ if (USE_SQLCIPHER)
 
   find_package(openssl REQUIRED CONFIG)
 elseif (USE_LIBSQL)
-  target_sources(${PACKAGE_NAME} PRIVATE ../cpp/libsql/bridge.cpp)
+  target_sources(${PACKAGE_NAME} PRIVATE ../cpp/opsqlite/libsql/bridge.cpp)
 
   add_definitions(
     -DOP_SQLITE_USE_LIBSQL=1
   )
 else()
- target_sources(${PACKAGE_NAME} PRIVATE ../cpp/sqlite3.c ../cpp/bridge.cpp)
+ target_sources(${PACKAGE_NAME} PRIVATE ../cpp/sqlite3.c ../cpp/opsqlite/bridge.cpp)
 endif()
 
 if (USE_CRSQLITE)
diff --git a/android/cpp-adapter.cpp b/android/cpp-adapter.cpp
index 5912d7b1..0368b2fa 100644
--- a/android/cpp-adapter.cpp
+++ b/android/cpp-adapter.cpp
@@ -1,5 +1,5 @@
-#include "OPSqlite.hpp"
-#include "logs.h"
+#include "opsqlite/OPSqlite.hpp"
+#include "opsqlite/logs.h"
 #include <ReactCommon/CallInvokerHolder.h>
 #include <fbjni/fbjni.h>
 #include <jni.h>
diff --git a/cpp/DBHostObject.cpp b/cpp/opsqlite/DBHostObject.cpp
similarity index 98%
rename from cpp/DBHostObject.cpp
rename to cpp/opsqlite/DBHostObject.cpp
index 96829412..4334d4a2 100644
--- a/cpp/DBHostObject.cpp
+++ b/cpp/opsqlite/DBHostObject.cpp
@@ -1,13 +1,13 @@
-#include "DBHostObject.h"
-#include "PreparedStatementHostObject.h"
+#include "opsqlite/DBHostObject.h"
+#include "opsqlite/PreparedStatementHostObject.h"
 #if OP_SQLITE_USE_LIBSQL
-#include "libsql/bridge.hpp"
+#include "opsqlite/libsql/bridge.hpp"
 #else
-#include "bridge.h"
+#include "opsqlite/bridge.h"
 #endif
-#include "logs.h"
-#include "macros.hpp"
-#include "utils.hpp"
+#include "opsqlite/logs.h"
+#include "opsqlite/macros.hpp"
+#include "opsqlite/utils.hpp"
 #include <iostream>
 #include <utility>
 
diff --git a/cpp/DBHostObject.h b/cpp/opsqlite/DBHostObject.h
similarity index 96%
rename from cpp/DBHostObject.h
rename to cpp/opsqlite/DBHostObject.h
index 002b8c98..41d51e8e 100644
--- a/cpp/DBHostObject.h
+++ b/cpp/opsqlite/DBHostObject.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "OPThreadPool.h"
-#include "types.hpp"
+#include "opsqlite/OPThreadPool.h"
+#include "opsqlite/types.hpp"
 #include <ReactCommon/CallInvoker.h>
 #include <jsi/jsi.h>
 #include <set>
 #ifdef OP_SQLITE_USE_LIBSQL
-#include "libsql/bridge.hpp"
+#include "opsqlite/libsql/bridge.hpp"
 #else
 #ifdef __ANDROID__
 #include "sqlite3.h"
diff --git a/cpp/DumbHostObject.cpp b/cpp/opsqlite/DumbHostObject.cpp
similarity index 94%
rename from cpp/DumbHostObject.cpp
rename to cpp/opsqlite/DumbHostObject.cpp
index 9b799f26..7c5bdba5 100644
--- a/cpp/DumbHostObject.cpp
+++ b/cpp/opsqlite/DumbHostObject.cpp
@@ -1,6 +1,6 @@
-#include "DumbHostObject.h"
-#include "SmartHostObject.h"
-#include "utils.hpp"
+#include "opsqlite/DumbHostObject.h"
+#include "opsqlite/SmartHostObject.h"
+#include "opsqlite/utils.hpp"
 #include <iostream>
 
 namespace opsqlite {
diff --git a/cpp/DumbHostObject.h b/cpp/opsqlite/DumbHostObject.h
similarity index 91%
rename from cpp/DumbHostObject.h
rename to cpp/opsqlite/DumbHostObject.h
index 5781bfa8..a37bf58f 100644
--- a/cpp/DumbHostObject.h
+++ b/cpp/opsqlite/DumbHostObject.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "SmartHostObject.h"
-#include "types.hpp"
+#include "opsqlite/SmartHostObject.h"
+#include "opsqlite/types.hpp"
 #include <any>
 #include <jsi/jsi.h>
 #include <stdio.h>
diff --git a/cpp/OPSqlite.cpp b/cpp/opsqlite/OPSqlite.cpp
similarity index 95%
rename from cpp/OPSqlite.cpp
rename to cpp/opsqlite/OPSqlite.cpp
index e33579af..613b6af5 100644
--- a/cpp/OPSqlite.cpp
+++ b/cpp/opsqlite/OPSqlite.cpp
@@ -1,15 +1,15 @@
-#include "OPSqlite.hpp"
-#include "DBHostObject.h"
-#include "DumbHostObject.h"
-#include "OPThreadPool.h"
+#include "opsqlite/OPSqlite.hpp"
+#include "opsqlite/DBHostObject.h"
+#include "opsqlite/DumbHostObject.h"
+#include "opsqlite/OPThreadPool.h"
 #ifdef OP_SQLITE_USE_LIBSQL
-#include "libsql/bridge.hpp"
+#include "opsqlite/libsql/bridge.hpp"
 #else
-#include "bridge.h"
+#include "opsqlite/bridge.h"
 #endif
-#include "logs.h"
-#include "macros.hpp"
-#include "utils.hpp"
+#include "opsqlite/logs.h"
+#include "opsqlite/macros.hpp"
+#include "opsqlite/utils.hpp"
 #include <iostream>
 #include <string>
 #include <unordered_map>
diff --git a/cpp/OPSqlite.hpp b/cpp/opsqlite/OPSqlite.hpp
similarity index 100%
rename from cpp/OPSqlite.hpp
rename to cpp/opsqlite/OPSqlite.hpp
diff --git a/cpp/OPThreadPool.cpp b/cpp/opsqlite/OPThreadPool.cpp
similarity index 98%
rename from cpp/OPThreadPool.cpp
rename to cpp/opsqlite/OPThreadPool.cpp
index 93a439bc..5ea6788f 100644
--- a/cpp/OPThreadPool.cpp
+++ b/cpp/opsqlite/OPThreadPool.cpp
@@ -1,4 +1,4 @@
-#include "OPThreadPool.h"
+#include "opsqlite/OPThreadPool.h"
 
 namespace opsqlite {
 
diff --git a/cpp/OPThreadPool.h b/cpp/opsqlite/OPThreadPool.h
similarity index 100%
rename from cpp/OPThreadPool.h
rename to cpp/opsqlite/OPThreadPool.h
diff --git a/cpp/PreparedStatementHostObject.cpp b/cpp/opsqlite/PreparedStatementHostObject.cpp
similarity index 95%
rename from cpp/PreparedStatementHostObject.cpp
rename to cpp/opsqlite/PreparedStatementHostObject.cpp
index e53d04f8..dfd6a0a1 100644
--- a/cpp/PreparedStatementHostObject.cpp
+++ b/cpp/opsqlite/PreparedStatementHostObject.cpp
@@ -1,11 +1,11 @@
-#include "PreparedStatementHostObject.h"
+#include "opsqlite/PreparedStatementHostObject.h"
 #if OP_SQLITE_USE_LIBSQL
-#include "libsql/bridge.hpp"
+#include "opsqlite/libsql/bridge.hpp"
 #else
-#include "bridge.h"
+#include "opsqlite/bridge.h"
 #endif
-#include "macros.hpp"
-#include "utils.hpp"
+#include "opsqlite/macros.hpp"
+#include "opsqlite/utils.hpp"
 
 namespace opsqlite {
 
diff --git a/cpp/PreparedStatementHostObject.h b/cpp/opsqlite/PreparedStatementHostObject.h
similarity index 93%
rename from cpp/PreparedStatementHostObject.h
rename to cpp/opsqlite/PreparedStatementHostObject.h
index 5621d4e5..275d9118 100644
--- a/cpp/PreparedStatementHostObject.h
+++ b/cpp/opsqlite/PreparedStatementHostObject.h
@@ -4,8 +4,8 @@
 #include <jsi/jsi.h>
 #include <memory>
 #ifdef OP_SQLITE_USE_LIBSQL
-#include "libsql.h"
-#include "libsql/bridge.hpp"
+#include <libsql.h>
+#include "opsqlite/libsql/bridge.hpp"
 #else
 #ifdef __ANDROID__
 #include "sqlite3.h"
@@ -13,7 +13,7 @@
 #include <sqlite3.h>
 #endif
 #endif
-#include "OPThreadPool.h"
+#include "opsqlite/OPThreadPool.h"
 #include <string>
 #include <utility>
 
diff --git a/cpp/SmartHostObject.cpp b/cpp/opsqlite/SmartHostObject.cpp
similarity index 91%
rename from cpp/SmartHostObject.cpp
rename to cpp/opsqlite/SmartHostObject.cpp
index b56e385c..f5bd1b95 100644
--- a/cpp/SmartHostObject.cpp
+++ b/cpp/opsqlite/SmartHostObject.cpp
@@ -1,5 +1,5 @@
-#include "SmartHostObject.h"
-#include "utils.hpp"
+#include "opsqlite/SmartHostObject.h"
+#include "opsqlite/utils.hpp"
 
 namespace opsqlite {
 
diff --git a/cpp/SmartHostObject.h b/cpp/opsqlite/SmartHostObject.h
similarity index 93%
rename from cpp/SmartHostObject.h
rename to cpp/opsqlite/SmartHostObject.h
index dd1151a9..022e4522 100644
--- a/cpp/SmartHostObject.h
+++ b/cpp/opsqlite/SmartHostObject.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.hpp"
+#include "opsqlite/types.hpp"
 #include <any>
 #include <jsi/jsi.h>
 #include <vector>
diff --git a/cpp/bridge.cpp b/cpp/opsqlite/bridge.cpp
similarity index 99%
rename from cpp/bridge.cpp
rename to cpp/opsqlite/bridge.cpp
index f298505f..79b1b45d 100644
--- a/cpp/bridge.cpp
+++ b/cpp/opsqlite/bridge.cpp
@@ -2,12 +2,12 @@
 // Allows a clear defined boundary between the JSI and the SQLite operations
 // so that threading operations are safe and contained within DBHostObject
 
-#include "bridge.h"
-#include "DBHostObject.h"
-#include "DumbHostObject.h"
-#include "SmartHostObject.h"
-#include "logs.h"
-#include "utils.hpp"
+#include "opsqlite/bridge.h"
+#include "opsqlite/DBHostObject.h"
+#include "opsqlite/DumbHostObject.h"
+#include "opsqlite/SmartHostObject.h"
+#include "opsqlite/logs.h"
+#include "opsqlite/utils.hpp"
 #include <filesystem>
 #include <iostream>
 #include <sstream>
diff --git a/cpp/bridge.h b/cpp/opsqlite/bridge.h
similarity index 95%
rename from cpp/bridge.h
rename to cpp/opsqlite/bridge.h
index bdc6bc8c..c199dfe0 100644
--- a/cpp/bridge.h
+++ b/cpp/opsqlite/bridge.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "DumbHostObject.h"
-#include "SmartHostObject.h"
-#include "types.hpp"
-#include "utils.hpp"
+#include "opsqlite/DumbHostObject.h"
+#include "opsqlite/SmartHostObject.h"
+#include "opsqlite/types.hpp"
+#include "opsqlite/utils.hpp"
 #ifdef __ANDROID__
 #include "sqlite3.h"
 #else
diff --git a/cpp/libsql/LICENSE.txt b/cpp/opsqlite/libsql/LICENSE.txt
similarity index 100%
rename from cpp/libsql/LICENSE.txt
rename to cpp/opsqlite/libsql/LICENSE.txt
diff --git a/cpp/libsql/bridge.cpp b/cpp/opsqlite/libsql/bridge.cpp
similarity index 99%
rename from cpp/libsql/bridge.cpp
rename to cpp/opsqlite/libsql/bridge.cpp
index fdd9a5d1..2746450d 100644
--- a/cpp/libsql/bridge.cpp
+++ b/cpp/opsqlite/libsql/bridge.cpp
@@ -1,9 +1,9 @@
-#include "bridge.hpp"
-#include "DumbHostObject.h"
-#include "SmartHostObject.h"
-#include "libsql.h"
-#include "logs.h"
-#include "utils.hpp"
+#include "opsqlite/libsql/bridge.hpp"
+#include "opsqlite/DumbHostObject.h"
+#include "opsqlite/SmartHostObject.h"
+#include <libsql.h>
+#include "opsqlite/logs.h"
+#include "opsqlite/utils.hpp"
 #include <filesystem>
 #include <iostream>
 #include <unordered_map>
diff --git a/cpp/libsql/bridge.hpp b/cpp/opsqlite/libsql/bridge.hpp
similarity index 95%
rename from cpp/libsql/bridge.hpp
rename to cpp/opsqlite/libsql/bridge.hpp
index cbe55eed..9f16f67c 100644
--- a/cpp/libsql/bridge.hpp
+++ b/cpp/opsqlite/libsql/bridge.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "DumbHostObject.h"
-#include "SmartHostObject.h"
-#include "libsql.h"
-#include "types.hpp"
-#include "utils.hpp"
+#include "opsqlite/DumbHostObject.h"
+#include "opsqlite/SmartHostObject.h"
+#include <libsql.h>
+#include "opsqlite/types.hpp"
+#include "opsqlite/utils.hpp"
 #include <vector>
 
 #define LIBSQL_INT 1
diff --git a/cpp/logs.h b/cpp/opsqlite/logs.h
similarity index 100%
rename from cpp/logs.h
rename to cpp/opsqlite/logs.h
diff --git a/cpp/macros.hpp b/cpp/opsqlite/macros.hpp
similarity index 100%
rename from cpp/macros.hpp
rename to cpp/opsqlite/macros.hpp
diff --git a/cpp/sqlcipher/LICENSE.txt b/cpp/opsqlite/sqlcipher/LICENSE.txt
similarity index 100%
rename from cpp/sqlcipher/LICENSE.txt
rename to cpp/opsqlite/sqlcipher/LICENSE.txt
diff --git a/cpp/sqlcipher/sqlite3.c b/cpp/opsqlite/sqlcipher/sqlite3.c
similarity index 100%
rename from cpp/sqlcipher/sqlite3.c
rename to cpp/opsqlite/sqlcipher/sqlite3.c
diff --git a/cpp/sqlcipher/sqlite3.h b/cpp/opsqlite/sqlcipher/sqlite3.h
similarity index 100%
rename from cpp/sqlcipher/sqlite3.h
rename to cpp/opsqlite/sqlcipher/sqlite3.h
diff --git a/cpp/types.hpp b/cpp/opsqlite/types.hpp
similarity index 100%
rename from cpp/types.hpp
rename to cpp/opsqlite/types.hpp
diff --git a/cpp/utils.cpp b/cpp/opsqlite/utils.cpp
similarity index 98%
rename from cpp/utils.cpp
rename to cpp/opsqlite/utils.cpp
index 69ae0f6c..4ff031fc 100644
--- a/cpp/utils.cpp
+++ b/cpp/opsqlite/utils.cpp
@@ -1,11 +1,11 @@
-#include "utils.hpp"
-#include "SmartHostObject.h"
-#include "types.hpp"
+#include "opsqlite/utils.hpp"
+#include "opsqlite/SmartHostObject.h"
+#include "opsqlite/types.hpp"
 #ifndef OP_SQLITE_USE_LIBSQL
-#include "bridge.h"
+#include "opsqlite/bridge.h"
 #endif
-#include "OPThreadPool.h"
-#include "macros.hpp"
+#include "opsqlite/OPThreadPool.h"
+#include "opsqlite/macros.hpp"
 #include <fstream>
 #include <sys/stat.h>
 #include <utility>
diff --git a/cpp/utils.hpp b/cpp/opsqlite/utils.hpp
similarity index 92%
rename from cpp/utils.hpp
rename to cpp/opsqlite/utils.hpp
index 12627aa3..23b64c97 100644
--- a/cpp/utils.hpp
+++ b/cpp/opsqlite/utils.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "DumbHostObject.h"
-#include "SmartHostObject.h"
-#include "types.hpp"
+#include "opsqlite/DumbHostObject.h"
+#include "opsqlite/SmartHostObject.h"
+#include "opsqlite/types.hpp"
 #include <jsi/jsi.h>
 #ifdef __ANDROID__
 #include "sqlite3.h"
@@ -12,7 +12,7 @@
 #include <ReactCommon/CallInvoker.h>
 #include <string>
 #include <vector>
-#include "OPThreadPool.h"
+#include "opsqlite/OPThreadPool.h"
 
 namespace opsqlite {
 
diff --git a/ios/OPSQLite.mm b/ios/OPSQLite.mm
index 8200ea71..bac87190 100644
--- a/ios/OPSQLite.mm
+++ b/ios/OPSQLite.mm
@@ -1,5 +1,5 @@
 #import "OPSQLite.h"
-#import "../cpp/OPSqlite.hpp"
+#import "opsqlite/OPSqlite.hpp"
 #import <React/RCTBridge+Private.h>
 #import <React/RCTLog.h>
 #import <React/RCTUtils.h>
diff --git a/op-sqlite.podspec b/op-sqlite.podspec
index e717811f..1ba3326a 100644
--- a/op-sqlite.podspec
+++ b/op-sqlite.podspec
@@ -120,21 +120,22 @@ Pod::Spec.new do |s|
     :GCC_PREPROCESSOR_DEFINITIONS => "",
     :CLANG_CXX_LANGUAGE_STANDARD => "c++20",
     :GCC_OPTIMIZATION_LEVEL => "2",
+    :HEADER_SEARCH_PATHS => "\"$(PODS_TARGET_SRCROOT)/cpp\"",
   }
   
   exclude_files = []
   
   if use_sqlcipher then
     log_message.call("[OP-SQLITE] using SQLCipher")
-    exclude_files += ["cpp/sqlite3.c", "cpp/sqlite3.h", "cpp/libsql/bridge.c", "cpp/libsql/bridge.h", "cpp/libsql/bridge.cpp", "cpp/libsql/libsql.h", "ios/libsql.xcframework/**/*"]
+    exclude_files += ["cpp/sqlite3.c", "cpp/sqlite3.h", "cpp/opsqlite/libsql/bridge.c", "cpp/opsqlite/libsql/bridge.h", "cpp/opsqlite/libsql/bridge.cpp", "cpp/opsqlite/libsql/libsql.h", "ios/libsql.xcframework/**/*"]
     xcconfig[:GCC_PREPROCESSOR_DEFINITIONS] += " OP_SQLITE_USE_SQLCIPHER=1 HAVE_FULLFSYNC=1 SQLITE_HAS_CODEC SQLITE_TEMP_STORE=3 SQLITE_EXTRA_INIT=sqlcipher_extra_init SQLITE_EXTRA_SHUTDOWN=sqlcipher_extra_shutdown"
     s.dependency "OpenSSL-Universal"    
   elsif use_libsql then
     log_message.call("[OP-SQLITE] ⚠️ Using libsql. If you have libsql questions please ask in the Turso Discord server.")
-    exclude_files += ["cpp/sqlite3.c", "cpp/sqlite3.h", "cpp/sqlcipher/sqlite3.c", "cpp/sqlcipher/sqlite3.h", "cpp/bridge.h", "cpp/bridge.cpp"]
+    exclude_files += ["cpp/sqlite3.c", "cpp/sqlite3.h", "cpp/opsqlite/sqlcipher/sqlite3.c", "cpp/opsqlite/sqlcipher/sqlite3.h", "cpp/opsqlite/bridge.h", "cpp/opsqlite/bridge.cpp"]
   else
     log_message.call("[OP-SQLITE] using pure SQLite")
-    exclude_files += ["cpp/sqlcipher/sqlite3.c", "cpp/sqlcipher/sqlite3.h", "cpp/libsql/bridge.c", "cpp/libsql/bridge.h", "cpp/libsql/bridge.cpp", "cpp/libsql/libsql.h", "ios/libsql.xcframework/**/*"]
+    exclude_files += ["cpp/opsqlite/sqlcipher/sqlite3.c", "cpp/opsqlite/sqlcipher/sqlite3.h", "cpp/opsqlite/libsql/bridge.c", "cpp/opsqlite/libsql/bridge.h", "cpp/opsqlite/libsql/bridge.cpp", "cpp/opsqlite/libsql/libsql.h", "ios/libsql.xcframework/**/*"]
   end
 
    # Exclude xcframeworks that aren't being used