diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1521057
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+# Xmake cache
+.xmake/
+build/
+
+# MacOS Cache
+.DS_Store
+
+
diff --git a/build.sh b/build.sh
deleted file mode 100755
index d9f2136..0000000
--- a/build.sh
+++ /dev/null
@@ -1 +0,0 @@
-g++ -o sqlconn main.cc -I/usr/include/mysql -lmysqlclient -std=c++23 -g && ./sqlconn
diff --git a/sqlConnection.h b/include/sqlConnection.h
similarity index 100%
rename from sqlConnection.h
rename to include/sqlConnection.h
diff --git a/util.h b/include/util.h
similarity index 100%
rename from util.h
rename to include/util.h
diff --git a/result b/result
deleted file mode 100644
index e69de29..0000000
diff --git a/sqlconn b/sqlconn
deleted file mode 100755
index 9bc423e..0000000
Binary files a/sqlconn and /dev/null differ
diff --git a/main.cc b/src/main.cc
similarity index 100%
rename from main.cc
rename to src/main.cc
diff --git a/xmake.lua b/xmake.lua
new file mode 100644
index 0000000..d80e793
--- /dev/null
+++ b/xmake.lua
@@ -0,0 +1,78 @@
+add_rules("mode.debug", "mode.release")
+set_languages("c++23")
+
+target("sqlConnection")
+    set_kind("binary")
+    add_files("src/*.cc")
+    add_links("mysqlclient")
+    add_includedirs("include/", "/usr/include/mysql")
+
+--
+-- If you want to known more usage about xmake, please see https://xmake.io
+--
+-- ## FAQ
+--
+-- You can enter the project directory firstly before building project.
+--
+--   $ cd projectdir
+--
+-- 1. How to build project?
+--
+--   $ xmake
+--
+-- 2. How to configure project?
+--
+--   $ xmake f -p [macosx|linux|iphoneos ..] -a [x86_64|i386|arm64 ..] -m [debug|release]
+--
+-- 3. Where is the build output directory?
+--
+--   The default output directory is `./build` and you can configure the output directory.
+--
+--   $ xmake f -o outputdir
+--   $ xmake
+--
+-- 4. How to run and debug target after building project?
+--
+--   $ xmake run [targetname]
+--   $ xmake run -d [targetname]
+--
+-- 5. How to install target to the system directory or other output directory?
+--
+--   $ xmake install
+--   $ xmake install -o installdir
+--
+-- 6. Add some frequently-used compilation flags in xmake.lua
+--
+-- @code
+--    -- add debug and release modes
+--    add_rules("mode.debug", "mode.release")
+--
+--    -- add macro definition
+--    add_defines("NDEBUG", "_GNU_SOURCE=1")
+--
+--    -- set warning all as error
+--    set_warnings("all", "error")
+--
+--    -- set language: c99, c++11
+--    set_languages("c99", "c++11")
+--
+--    -- set optimization: none, faster, fastest, smallest
+--    set_optimize("fastest")
+--
+--    -- add include search directories
+--    add_includedirs("/usr/include", "/usr/local/include")
+--
+--    -- add link libraries and search directories
+--    add_links("tbox")
+--    add_linkdirs("/usr/local/lib", "/usr/lib")
+--
+--    -- add system link libraries
+--    add_syslinks("z", "pthread")
+--
+--    -- add compilation and link flags
+--    add_cxflags("-stdnolib", "-fno-strict-aliasing")
+--    add_ldflags("-L/usr/local/lib", "-lpthread", {force = true})
+--
+-- @endcode
+--
+