diff --git a/.gitmodules b/.gitmodules
index c3efe7a..667196a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
-[submodule "lib/core/llama.cpp"]
-	path = lib/core/llama.cpp
+[submodule "core/llama.cpp"]
+	path = core/llama.cpp
 	url = https://github.com/ggerganov/llama.cpp.git
 	branch = master
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 2fddaf8..569b890 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -90,7 +90,7 @@ android {
 
     externalNativeBuild {
         cmake {
-            path "../../lib/core/CMakeLists.txt"
+            path "../../core/CMakeLists.txt"
         }
     }
 }
diff --git a/lib/core/.gitkeep b/core/.gitkeep
similarity index 100%
rename from lib/core/.gitkeep
rename to core/.gitkeep
diff --git a/lib/core/CMakeLists.txt b/core/CMakeLists.txt
similarity index 100%
rename from lib/core/CMakeLists.txt
rename to core/CMakeLists.txt
diff --git a/lib/core/core.cpp b/core/core.cpp
similarity index 100%
rename from lib/core/core.cpp
rename to core/core.cpp
diff --git a/lib/core/core.h b/core/core.h
similarity index 100%
rename from lib/core/core.h
rename to core/core.h
diff --git a/lib/core/llama.cpp b/core/llama.cpp
similarity index 100%
rename from lib/core/llama.cpp
rename to core/llama.cpp
diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt
index c4bcd26..72bbb03 100644
--- a/linux/CMakeLists.txt
+++ b/linux/CMakeLists.txt
@@ -137,5 +137,5 @@ if(NOT CMAKE_BUILD_TYPE MATCHES "Debug")
     COMPONENT Runtime)
 endif()
 
-add_subdirectory(../lib/core core)
+add_subdirectory(../core core)
 install(FILES ${PROJECT_BINARY_DIR}/bin/libcore.so DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" COMPONENT Runtime)
diff --git a/pubspec.yaml b/pubspec.yaml
index 75ed989..b98b760 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -61,7 +61,7 @@ ffigen:
   output: lib/core/bindings.dart
   headers:
     entry-points:
-      - "lib/core/core.h"
+      - "core/core.h"
 # The following section is specific to Flutter packages.
 flutter:
 
diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt
index c9935fd..2a78f59 100644
--- a/windows/CMakeLists.txt
+++ b/windows/CMakeLists.txt
@@ -104,5 +104,5 @@ install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
 set(CMAKE_INSTALL_BINDIR ${BUILD_BUNDLE_DIR})
 
 # Build the core library.
-add_subdirectory(../lib/core core)
+add_subdirectory(../core core)
 install(FILES ${PROJECT_BINARY_DIR}/core/Release/core.dll DESTINATION ${BUILD_BUNDLE_DIR})
\ No newline at end of file