diff --git a/.gitignore b/.gitignore
index f147edf..03b4981 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
+# Binaries
+gpclient
+gpservice
+
 # C++ objects and libs
 *.slo
 *.lo
diff --git a/GPClient/.qmake.stash b/GPClient/.qmake.stash
deleted file mode 100644
index d389915..0000000
--- a/GPClient/.qmake.stash
+++ /dev/null
@@ -1,21 +0,0 @@
-QMAKE_CXX.QT_COMPILER_STDCXX = 201402L
-QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 9
-QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 2
-QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0
-QMAKE_CXX.COMPILER_MACROS = \
-    QT_COMPILER_STDCXX \
-    QMAKE_GCC_MAJOR_VERSION \
-    QMAKE_GCC_MINOR_VERSION \
-    QMAKE_GCC_PATCH_VERSION
-QMAKE_CXX.INCDIRS = \
-    /usr/include/c++/9.2.0 \
-    /usr/include/c++/9.2.0/x86_64-pc-linux-gnu \
-    /usr/include/c++/9.2.0/backward \
-    /usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/include \
-    /usr/local/include \
-    /usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/include-fixed \
-    /usr/include
-QMAKE_CXX.LIBDIRS = \
-    /usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0 \
-    /usr/lib \
-    /lib
diff --git a/GPClient/GPClient b/GPClient/GPClient
deleted file mode 100755
index c2ab6d4..0000000
Binary files a/GPClient/GPClient and /dev/null differ
diff --git a/GPClient/GPClient.pro b/GPClient/GPClient.pro
index 7bca10b..843eb68 100644
--- a/GPClient/GPClient.pro
+++ b/GPClient/GPClient.pro
@@ -1,3 +1,5 @@
+TARGET = gpclient
+
 QT       += core gui network websockets dbus webenginewidgets
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
@@ -17,7 +19,6 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # In order to do so, uncomment the following line.
 # You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
 SOURCES += \
     cdpcommand.cpp \
     cdpcommandmanager.cpp \
@@ -39,6 +40,5 @@ FORMS += \
 DBUS_INTERFACES += ../GPService/gpservice.xml
 
 # Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target
+target.path = /usr/local/bin
+INSTALLS += target
diff --git a/GPService/.qmake.stash b/GPService/.qmake.stash
deleted file mode 100644
index d389915..0000000
--- a/GPService/.qmake.stash
+++ /dev/null
@@ -1,21 +0,0 @@
-QMAKE_CXX.QT_COMPILER_STDCXX = 201402L
-QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 9
-QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 2
-QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0
-QMAKE_CXX.COMPILER_MACROS = \
-    QT_COMPILER_STDCXX \
-    QMAKE_GCC_MAJOR_VERSION \
-    QMAKE_GCC_MINOR_VERSION \
-    QMAKE_GCC_PATCH_VERSION
-QMAKE_CXX.INCDIRS = \
-    /usr/include/c++/9.2.0 \
-    /usr/include/c++/9.2.0/x86_64-pc-linux-gnu \
-    /usr/include/c++/9.2.0/backward \
-    /usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/include \
-    /usr/local/include \
-    /usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/include-fixed \
-    /usr/include
-QMAKE_CXX.LIBDIRS = \
-    /usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0 \
-    /usr/lib \
-    /lib
diff --git a/GPService/GPService b/GPService/GPService
deleted file mode 100755
index b387ae3..0000000
Binary files a/GPService/GPService and /dev/null differ
diff --git a/GPService/GPService.pro b/GPService/GPService.pro
index b12d1bb..380b0e7 100644
--- a/GPService/GPService.pro
+++ b/GPService/GPService.pro
@@ -1,3 +1,5 @@
+TARGET = gpservice
+
 QT += dbus
 QT -= gui
 
@@ -30,6 +32,5 @@ SOURCES += \
 DBUS_ADAPTORS += gpservice.xml
 
 # Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target
+target.path = /usr/local/bin
+INSTALLS += target