diff --git a/qt-openzwave.pro b/qt-openzwave.pro
index 77c83e8..eca841e 100644
--- a/qt-openzwave.pro
+++ b/qt-openzwave.pro
@@ -8,6 +8,7 @@ TEMPLATE = subdirs
 
 CONFIG += ordered silent
 
-SUBDIRS = qt-openzwave simpleclient \
+SUBDIRS = qt-openzwave \
     qt-openzwavedatabase \
-    qt-ozwdaemon
+    qt-ozwdaemon \
+    qt-simpleclient
diff --git a/simpleclient/bitsetwidget.cpp b/qt-simpleclient/bitsetwidget.cpp
similarity index 100%
rename from simpleclient/bitsetwidget.cpp
rename to qt-simpleclient/bitsetwidget.cpp
diff --git a/simpleclient/bitsetwidget.h b/qt-simpleclient/bitsetwidget.h
similarity index 100%
rename from simpleclient/bitsetwidget.h
rename to qt-simpleclient/bitsetwidget.h
diff --git a/simpleclient/bitsetwidget.ui b/qt-simpleclient/bitsetwidget.ui
similarity index 100%
rename from simpleclient/bitsetwidget.ui
rename to qt-simpleclient/bitsetwidget.ui
diff --git a/simpleclient/main.cpp b/qt-simpleclient/main.cpp
similarity index 100%
rename from simpleclient/main.cpp
rename to qt-simpleclient/main.cpp
diff --git a/simpleclient/mainwindow.cpp b/qt-simpleclient/mainwindow.cpp
similarity index 100%
rename from simpleclient/mainwindow.cpp
rename to qt-simpleclient/mainwindow.cpp
diff --git a/simpleclient/mainwindow.h b/qt-simpleclient/mainwindow.h
similarity index 100%
rename from simpleclient/mainwindow.h
rename to qt-simpleclient/mainwindow.h
diff --git a/simpleclient/mainwindow.ui b/qt-simpleclient/mainwindow.ui
similarity index 100%
rename from simpleclient/mainwindow.ui
rename to qt-simpleclient/mainwindow.ui
diff --git a/simpleclient/simpleclient.pro b/qt-simpleclient/qt-simpleclient.pro
similarity index 100%
rename from simpleclient/simpleclient.pro
rename to qt-simpleclient/qt-simpleclient.pro
diff --git a/simpleclient/qtozw_itemdelegate.cpp b/qt-simpleclient/qtozw_itemdelegate.cpp
similarity index 100%
rename from simpleclient/qtozw_itemdelegate.cpp
rename to qt-simpleclient/qtozw_itemdelegate.cpp
diff --git a/simpleclient/qtozw_itemdelegate.h b/qt-simpleclient/qtozw_itemdelegate.h
similarity index 100%
rename from simpleclient/qtozw_itemdelegate.h
rename to qt-simpleclient/qtozw_itemdelegate.h
diff --git a/simpleclient/res/ozw_SF2_notext.png b/qt-simpleclient/res/ozw_SF2_notext.png
similarity index 100%
rename from simpleclient/res/ozw_SF2_notext.png
rename to qt-simpleclient/res/ozw_SF2_notext.png
diff --git a/simpleclient/res/ozw_logo.icns b/qt-simpleclient/res/ozw_logo.icns
similarity index 100%
rename from simpleclient/res/ozw_logo.icns
rename to qt-simpleclient/res/ozw_logo.icns
diff --git a/simpleclient/res/ozw_logo.ico b/qt-simpleclient/res/ozw_logo.ico
similarity index 100%
rename from simpleclient/res/ozw_logo.ico
rename to qt-simpleclient/res/ozw_logo.ico
diff --git a/simpleclient/simpleclient.qrc b/qt-simpleclient/simpleclient.qrc
similarity index 100%
rename from simpleclient/simpleclient.qrc
rename to qt-simpleclient/simpleclient.qrc
diff --git a/simpleclient/startup.cpp b/qt-simpleclient/startup.cpp
similarity index 100%
rename from simpleclient/startup.cpp
rename to qt-simpleclient/startup.cpp
diff --git a/simpleclient/startup.h b/qt-simpleclient/startup.h
similarity index 100%
rename from simpleclient/startup.h
rename to qt-simpleclient/startup.h
diff --git a/simpleclient/startup.ui b/qt-simpleclient/startup.ui
similarity index 100%
rename from simpleclient/startup.ui
rename to qt-simpleclient/startup.ui