diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 6d0d008be..4eca5fb8c 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -297,7 +297,7 @@ jobs:
         name: "Build"
         with:
           bundle: deskflow-${{env.DESKFLOW_PACKAGE_VERSION}}-linux-x86_64.flatpak
-          manifest-path: deploy/dist/flatpak/org.deskflow.deskflow.yml
+          manifest-path: deploy/linux/flatpak/org.deskflow.deskflow.yml
           cache-key: flatpak-builder-${{ github.sha }}
           upload-artifact: false
 
diff --git a/deploy/CMakeLists.txt b/deploy/CMakeLists.txt
index 39846298f..c5be4cef8 100644
--- a/deploy/CMakeLists.txt
+++ b/deploy/CMakeLists.txt
@@ -16,34 +16,6 @@ if(WIN32)
     ${CMAKE_CURRENT_LIST_DIR}/version.rc.in
     ${PROJECT_BINARY_DIR}/src/version.rc @ONLY
   )
-
-elseif(NOT APPLE)
-
-  # Install our desktop file
-  install(
-    FILES ${CMAKE_CURRENT_LIST_DIR}/org.deskflow.deskflow.desktop
-    DESTINATION share/applications
-  )
-
-  # Install our icon
-  install(
-    FILES ${CMAKE_CURRENT_LIST_DIR}/deskflow.png
-    DESTINATION share/icons/hicolor/512x512/apps/
-    RENAME org.deskflow.deskflow.png
-  )
-
-  # Install our metainfo
-  install(
-    FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.deskflow.deskflow.metainfo.xml
-    DESTINATION share/metainfo/
-  )
-
-  # Prepare PKGBUILD for Arch Linux
-  configure_file(
-    ${CMAKE_CURRENT_LIST_DIR}/dist/arch/PKGBUILD.in
-    ${CMAKE_BINARY_DIR}/PKGBUILD
-    @ONLY
-  )
 endif()
 
 if(WIN32)
@@ -66,12 +38,6 @@ if(NOT PACKAGE_VERSION_LABEL)
     set (PACKAGE_VERSION_LABEL "${CPACK_PACKAGE_VERSION}")
 endif()
 
-set(CPACK_DEBIAN_PACKAGE_SECTION "utils")
-set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
-set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
-set(CPACK_RPM_PACKAGE_GROUP "Applications/System")
-
-
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 
   set(CPACK_WIX_UPGRADE_GUID "027D1C8A-E7A5-4754-BB93-B2D45BFDBDC8")
@@ -120,75 +86,15 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set(CPACK_DMG_VOLUME_NAME "Deskflow")
   set(CPACK_DMG_SLA_USE_RESOURCE_FILE_LICENSE ON)
   set(CPACK_GENERATOR "DragNDrop")
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-  # Get Distro name information
-  if(EXISTS "/etc/os-release")
-    FILE(STRINGS "/etc/os-release" RELEASE_FILE_CONTENTS)
-  else()
-    message(FATAL_ERROR "Unable to read file /etc/os-release")
-  endif()
-
-  foreach(LINE IN LISTS RELEASE_FILE_CONTENTS)
-    if( "${LINE}" MATCHES "^ID=")
-      string(REGEX REPLACE "^ID=" "" DISTRO_NAME ${LINE})
-      string(REGEX REPLACE "\"" "" DISTRO_NAME ${DISTRO_NAME})
-      message(DEBUG "Distro Name :${DISTRO_NAME}")
-    elseif( "${LINE}" MATCHES "^ID_LIKE=")
-      string(REGEX REPLACE "^ID_LIKE=" "" DISTRO_LIKE "${LINE}")
-      string(REGEX REPLACE "\"" "" DISTRO_LIKE ${DISTRO_LIKE})
-      message(DEBUG "Distro Like :${DISTRO_LIKE}")
-    elseif( "${LINE}" MATCHES "^VERSION_CODENAME=")
-      string(REGEX REPLACE "^VERSION_CODENAME=" "" DISTRO_CODENAME "${LINE}")
-      string(REGEX REPLACE "\"" "" DISTRO_CODENAME "${DISTRO_CODENAME}")
-      message(DEBUG "Distro Codename:${DISTRO_CODENAME}")
-    elseif( "${LINE}" MATCHES "^VERSION_ID=")
-      string(REGEX REPLACE "^VERSION_ID=" "" DISTRO_VERSION_ID "${LINE}")
-      string(REGEX REPLACE "\"" "" DISTRO_VERSION_ID "${DISTRO_VERSION_ID}")
-      message(DEBUG "Distro VersionID:${DISTRO_VERSION_ID}")
-    endif()
-  endforeach()
-
-  # Check if Debian-link
-  string(REGEX MATCH debian|buntu DEBTYPE "${DISTRO_LIKE}")
-  if((NOT ("${DEBTYPE}" STREQUAL "")) OR ("${DISTRO_NAME}" STREQUAL "debian"))
-    set(CPACK_GENERATOR "DEB")
-  endif()
-
-  # Check if Rpm-like
-  string(REGEX MATCH suse|fedora|rhel RPMTYPE "${DISTRO_LIKE}")
-  string(REGEX MATCH fedora|suse|rhel RPMNAME "${DISTRO_NAME}")
-  if((NOT ("${RPMTYPE}" STREQUAL "")) OR (NOT ("${RPMNAME}" STREQUAL "")))
-      set(CPACK_GENERATOR "RPM")
-  endif()
-
-  # Disto specific name adjustments
-  if("${DISTRO_NAME}" STREQUAL "opensuse-tumbleweed")
-    set(DISTRO_NAME "opensuse")
-    set(DISTRO_CODENAME "tumbleweed")
-  elseif("${DISTRO_NAME}" STREQUAL "arch")
-    # Arch linux is rolling the version id reported is the date of last iso.
-    set(DISTRO_VERSION_ID "")
-  endif()
-
-  # Determain the code name to be used if any
-  if(NOT "${DISTRO_VERSION_ID}" STREQUAL "")
-    set(CN_STRING "${DISTRO_VERSION_ID}-")
-  endif()
-
-  if(NOT "${DISTRO_CODENAME}" STREQUAL "")
-    set(CN_STRING "${DISTRO_CODENAME}-")
-  endif()
-
-  if("${DISTRO_NAME}" STREQUAL "")
-    set(DISTRO_NAME "linux")
-  endif()
-
-  set(OS_STRING "${DISTRO_NAME}-${CN_STRING}${CMAKE_SYSTEM_PROCESSOR}")
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "|.*BSD")
-  message(STATUS "BSD packaging not yet supported")
-  set(OS_STRING ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
 endif()
 
+if(NOT APPLE)
+  # install linux / unix suport files
+  include(linux/deploy.cmake)
+endif()
+
+
+
 # Always use "deskflow" for start of name
 set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PACKAGE_VERSION_LABEL}-${OS_STRING}")
 message(STATUS "Package Basename: ${CPACK_PACKAGE_FILE_NAME}")
diff --git a/deploy/dist/arch/PKGBUILD.in b/deploy/linux/arch/PKGBUILD.in
similarity index 100%
rename from deploy/dist/arch/PKGBUILD.in
rename to deploy/linux/arch/PKGBUILD.in
diff --git a/deploy/linux/deploy.cmake b/deploy/linux/deploy.cmake
new file mode 100644
index 000000000..ef335a9e1
--- /dev/null
+++ b/deploy/linux/deploy.cmake
@@ -0,0 +1,107 @@
+# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-License-Identifier: MIT
+
+# HACK This is set when the files is included so its the real path
+# calling CMAKE_CURRENT_LIST_DIR after include would return the wrong scope var
+set(MY_DIR ${CMAKE_CURRENT_LIST_DIR})
+
+# Install our desktop file
+install(
+  FILES ${MY_DIR}/org.deskflow.deskflow.desktop
+  DESTINATION share/applications
+)
+
+# Install our icon
+install(
+  FILES ${MY_DIR}/deskflow.png
+  DESTINATION share/icons/hicolor/512x512/apps/
+  RENAME org.deskflow.deskflow.png
+)
+
+# Install our metainfo
+install(
+  FILES ${MY_DIR}/org.deskflow.deskflow.metainfo.xml
+  DESTINATION share/metainfo/
+)
+
+# Prepare PKGBUILD for Arch Linux
+configure_file(
+  ${MY_DIR}/arch/PKGBUILD.in
+  ${CMAKE_BINARY_DIR}/PKGBUILD
+  @ONLY
+)
+
+
+set(CPACK_DEBIAN_PACKAGE_SECTION "utils")
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
+set(CPACK_RPM_PACKAGE_GROUP "Applications/System")
+
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  # Get Distro name information
+  if(EXISTS "/etc/os-release")
+    FILE(STRINGS "/etc/os-release" RELEASE_FILE_CONTENTS)
+  else()
+    message(FATAL_ERROR "Unable to read file /etc/os-release")
+  endif()
+
+  foreach(LINE IN LISTS RELEASE_FILE_CONTENTS)
+    if( "${LINE}" MATCHES "^ID=")
+      string(REGEX REPLACE "^ID=" "" DISTRO_NAME ${LINE})
+      string(REGEX REPLACE "\"" "" DISTRO_NAME ${DISTRO_NAME})
+      message(DEBUG "Distro Name :${DISTRO_NAME}")
+    elseif( "${LINE}" MATCHES "^ID_LIKE=")
+      string(REGEX REPLACE "^ID_LIKE=" "" DISTRO_LIKE "${LINE}")
+      string(REGEX REPLACE "\"" "" DISTRO_LIKE ${DISTRO_LIKE})
+      message(DEBUG "Distro Like :${DISTRO_LIKE}")
+    elseif( "${LINE}" MATCHES "^VERSION_CODENAME=")
+      string(REGEX REPLACE "^VERSION_CODENAME=" "" DISTRO_CODENAME "${LINE}")
+      string(REGEX REPLACE "\"" "" DISTRO_CODENAME "${DISTRO_CODENAME}")
+      message(DEBUG "Distro Codename:${DISTRO_CODENAME}")
+    elseif( "${LINE}" MATCHES "^VERSION_ID=")
+      string(REGEX REPLACE "^VERSION_ID=" "" DISTRO_VERSION_ID "${LINE}")
+      string(REGEX REPLACE "\"" "" DISTRO_VERSION_ID "${DISTRO_VERSION_ID}")
+      message(DEBUG "Distro VersionID:${DISTRO_VERSION_ID}")
+    endif()
+  endforeach()
+
+  # Check if Debian-link
+  string(REGEX MATCH debian|buntu DEBTYPE "${DISTRO_LIKE}")
+  if((NOT ("${DEBTYPE}" STREQUAL "")) OR ("${DISTRO_NAME}" STREQUAL "debian"))
+    set(CPACK_GENERATOR "DEB")
+  endif()
+
+  # Check if Rpm-like
+  string(REGEX MATCH suse|fedora|rhel RPMTYPE "${DISTRO_LIKE}")
+  string(REGEX MATCH fedora|suse|rhel RPMNAME "${DISTRO_NAME}")
+  if((NOT ("${RPMTYPE}" STREQUAL "")) OR (NOT ("${RPMNAME}" STREQUAL "")))
+      set(CPACK_GENERATOR "RPM")
+  endif()
+
+  # Disto specific name adjustments
+  if("${DISTRO_NAME}" STREQUAL "opensuse-tumbleweed")
+    set(DISTRO_NAME "opensuse")
+    set(DISTRO_CODENAME "tumbleweed")
+  elseif("${DISTRO_NAME}" STREQUAL "arch")
+    # Arch linux is rolling the version id reported is the date of last iso.
+    set(DISTRO_VERSION_ID "")
+  endif()
+
+  # Determain the code name to be used if any
+  if(NOT "${DISTRO_VERSION_ID}" STREQUAL "")
+    set(CN_STRING "${DISTRO_VERSION_ID}-")
+  endif()
+
+  if(NOT "${DISTRO_CODENAME}" STREQUAL "")
+    set(CN_STRING "${DISTRO_CODENAME}-")
+  endif()
+
+  if("${DISTRO_NAME}" STREQUAL "")
+    set(DISTRO_NAME "linux")
+  endif()
+  set(OS_STRING "${DISTRO_NAME}-${CN_STRING}${CMAKE_SYSTEM_PROCESSOR}")
+
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "|.*BSD")
+  message(STATUS "BSD packaging not yet supported")
+  set(OS_STRING ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
+endif()
diff --git a/deploy/deskflow.png b/deploy/linux/deskflow.png
similarity index 100%
rename from deploy/deskflow.png
rename to deploy/linux/deskflow.png
diff --git a/deploy/dist/flatpak/org.deskflow.deskflow.yml b/deploy/linux/flatpak/org.deskflow.deskflow.yml
similarity index 100%
rename from deploy/dist/flatpak/org.deskflow.deskflow.yml
rename to deploy/linux/flatpak/org.deskflow.deskflow.yml
diff --git a/deploy/org.deskflow.deskflow.desktop b/deploy/linux/org.deskflow.deskflow.desktop
similarity index 100%
rename from deploy/org.deskflow.deskflow.desktop
rename to deploy/linux/org.deskflow.deskflow.desktop
diff --git a/deploy/org.deskflow.deskflow.metainfo.xml b/deploy/linux/org.deskflow.deskflow.metainfo.xml
similarity index 100%
rename from deploy/org.deskflow.deskflow.metainfo.xml
rename to deploy/linux/org.deskflow.deskflow.metainfo.xml