diff --git a/client.pro b/client.pro
index af8d105b7..fb6ec2edd 100644
--- a/client.pro
+++ b/client.pro
@@ -18,6 +18,8 @@ WITH_SAMPLES = ON
 
 #WITH_DRIVER_XPLANE = ON
 
+#WITH_UNITTESTS = ON
+
 
 equals(WITH_BLACKMISC, ON) {
     SUBDIRS += src/blackmisc
@@ -36,27 +38,29 @@ equals(WITH_BLACKBOX, ON) {
 }
 
 equals(WITH_DRIVER_FSX, ON) {
-    SUBDIRS += src/driver/fsx
+    SUBDIRS += src/driver/fsx/driver_fsx.pro
 }
 
 equals(WITH_DRIVER_FS9, ON) {
-    SUBDIRS += src/driver/fs9
+    SUBDIRS += src/driver/fs9/driver_fs9.pro
 }
 
 equals(WITH_DRIVER_XPLANE, ON) {
-    SUBDIRS += src/driver/xplane
+    SUBDIRS += src/driver/xplane/driver_xplane.pro
 }
 
 equals(WITH_SAMPLES, ON) {
-    SUBDIRS += samples/com_client
-	SUBDIRS += samples/com_server
-	SUBDIRS += samples/config
-	SUBDIRS += samples/Geodetic2Ecef
-	SUBDIRS += samples/interpolator
-	SUBDIRS += samples/Logging
+    SUBDIRS += samples/com_client/sample_com_client.pro
+    SUBDIRS += samples/com_server/sample_com_server.pro
+    SUBDIRS += samples/config/sample_config.pro
+    SUBDIRS += samples/geodetic2ecef/sample_geodetic2ecef.pro
+    SUBDIRS += samples/interpolator/sample_interpolator.pro
+    SUBDIRS += samples/logging/sample_logging.pro
 }
 
-SUBDIRS +=
+equals(WITH_UNITTESTS, ON) {
+    SUBDIRS +=
+}
 
 
 
diff --git a/samples/Geodetic2Ecef/Geodetic2Ecef.pro b/samples/Geodetic2Ecef/sample_geodetic2ecef.pro
similarity index 100%
rename from samples/Geodetic2Ecef/Geodetic2Ecef.pro
rename to samples/Geodetic2Ecef/sample_geodetic2ecef.pro
diff --git a/samples/Logging/Logging.pro b/samples/Logging/sample_logging.pro
similarity index 100%
rename from samples/Logging/Logging.pro
rename to samples/Logging/sample_logging.pro
diff --git a/samples/com_client/com_client.pro b/samples/com_client/sample_com_client.pro
similarity index 100%
rename from samples/com_client/com_client.pro
rename to samples/com_client/sample_com_client.pro
diff --git a/samples/com_server/com_server.pro b/samples/com_server/sample_com_server.pro
similarity index 100%
rename from samples/com_server/com_server.pro
rename to samples/com_server/sample_com_server.pro
diff --git a/samples/config/config.pro b/samples/config/sample_config.pro
similarity index 100%
rename from samples/config/config.pro
rename to samples/config/sample_config.pro
diff --git a/samples/interpolator/interpolator.pro b/samples/interpolator/sample_interpolator.pro
similarity index 100%
rename from samples/interpolator/interpolator.pro
rename to samples/interpolator/sample_interpolator.pro
diff --git a/src/driver/fs9/fs9.pro b/src/driver/fs9/driver_fs9.pro
similarity index 100%
rename from src/driver/fs9/fs9.pro
rename to src/driver/fs9/driver_fs9.pro
diff --git a/src/driver/fsx/fsx.pro b/src/driver/fsx/driver_fsx.pro
similarity index 100%
rename from src/driver/fsx/fsx.pro
rename to src/driver/fsx/driver_fsx.pro
diff --git a/src/driver/xplane/xplane.pro b/src/driver/xplane/driver_xplane.pro
similarity index 100%
rename from src/driver/xplane/xplane.pro
rename to src/driver/xplane/driver_xplane.pro
diff --git a/tests/tests b/tests/tests
new file mode 100644
index 000000000..e69de29bb