diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..3f958c4
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "src/core/airplay"]
+	path = src/core/airplay
+	url = https://github.com/uncor3/airplay
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a15685d..98b22ec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,9 +11,6 @@ include_directories(/usr/local/include)
 include_directories(/usr/include/python3.13)
 set(ENV{PKG_CONFIG_PATH} "/usr/local/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}")
 
-add_subdirectory(src/core/ipatool)
-
-
 find_package(PkgConfig REQUIRED)
 find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets Svg SvgWidgets Multimedia Network)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets Svg SvgWidgets Multimedia Network)
@@ -185,7 +182,6 @@ target_link_libraries(iDescriptor PRIVATE
     PkgConfig::PLIST
     PkgConfig::QRENCODE
     airplay
-    ipatool
 )
 
 # Add compile definition for source directory
diff --git a/src/core/airplay b/src/core/airplay
deleted file mode 120000
index 3417c75..0000000
--- a/src/core/airplay
+++ /dev/null
@@ -1 +0,0 @@
-/home/uncore/Desktop/clones/RPiPlay
\ No newline at end of file
diff --git a/src/core/airplay b/src/core/airplay
new file mode 160000
index 0000000..115bd78
--- /dev/null
+++ b/src/core/airplay
@@ -0,0 +1 @@
+Subproject commit 115bd78c12fa162e50b2106bdf8a7633d6a00441
diff --git a/src/core/ipatool b/src/core/ipatool
deleted file mode 120000
index bd1aec4..0000000
--- a/src/core/ipatool
+++ /dev/null
@@ -1 +0,0 @@
-/home/uncore/Desktop/clones/ipatool
\ No newline at end of file