diff --git a/program/Build/RaspberryCloud.v12.suo b/program/Build/RaspberryCloud.v12.suo
index c2be689bb2e0fc064d45f6722d5bbba67c3fae0e..1fc07fc50cb7da83bffb2b2daceb8ffa41c44cb8 100644
Binary files a/program/Build/RaspberryCloud.v12.suo and b/program/Build/RaspberryCloud.v12.suo differ
diff --git a/program/Source/app/Application.cpp b/program/Source/app/Application.cpp
index 0bcd8f93cecfee788a9543b73c402d2fc701d226..de2b03a23c7234fb88d40cd001285236fe8b2f1e 100644
--- a/program/Source/app/Application.cpp
+++ b/program/Source/app/Application.cpp
@@ -1,9 +1,9 @@
 #include <string.h>
-#include "logger/logger.h"
+#include "../logger/logger.h"
 #include "Application.h"
-#include "cloud/LocalCloudAdapter.h"
-#include "cloud/DropboxAdapter.h"
-#include "cloud/FTPAdapter.h"
+#include "../cloud/LocalCloudAdapter.h"
+#include "../cloud/DropboxAdapter.h"
+#include "../cloud/FTPAdapter.h"
 
 using namespace std;
 
diff --git a/program/Source/app/Application.h b/program/Source/app/Application.h
index 890cdc142882a91d8018e4adee83e7db06f07fc2..5ae3bd9676c26021cb0734a6cd13f9f5c72a45d0 100644
--- a/program/Source/app/Application.h
+++ b/program/Source/app/Application.h
@@ -1,12 +1,12 @@
 #ifndef _APPLICATION_H
 #define _APPLICATION_H
 
-#include "cloud\CloudManager.h"
-#include "cloud\CloudAccessLayer.h"
-#include "dataAccess\CloudFileSystem.h"
-#include "cloud\CloudManager.h"
+#include "../cloud/CloudManager.h"
+#include "../cloud/CloudAccessLayer.h"
+#include "../dataAccess/CloudFileSystem.h"
+#include "../cloud/CloudManager.h"
 #include "UI.h"
-#include "networking\HomeNetworkCommunications.h"
+#include "../networking/HomeNetworkCommunications.h"
 
 /**
  * Application class 
diff --git a/program/Source/app/UI.cpp b/program/Source/app/UI.cpp
index f3535bd4a21049289df210c95a5407ce3604f242..05007064f13bdf6343e7f9bdd4289ccfbbf20582 100644
--- a/program/Source/app/UI.cpp
+++ b/program/Source/app/UI.cpp
@@ -1,9 +1,9 @@
 #include "UI.h"
-#include "logger\logger.h"
-#include "dataAccess\CloudFileSystem.h"
-#include "dataAccess\ComputeOnPi.h"
-#include "dataAccess\ComputeOnClient.h"
-#include "app\Application.h"
+#include "../logger/logger.h"
+#include "../dataAccess/CloudFileSystem.h"
+#include "../dataAccess/ComputeOnPi.h"
+#include "../dataAccess/ComputeOnClient.h"
+#include "../app/Application.h"
 
 using namespace app;
 
diff --git a/program/Source/app/UI.h b/program/Source/app/UI.h
index 3ff5edf39b4be62b06c5e987561d7301fd378ecc..4a2e0f662ac6845517fad7d3c2a79a1640976986 100644
--- a/program/Source/app/UI.h
+++ b/program/Source/app/UI.h
@@ -3,7 +3,7 @@
 
 #include <string>
 #include <list>
-#include "fileModel\FileDescriptor.h"
+#include "../fileModel/FileDescriptor.h"
 
 class Application;
 
diff --git a/program/Source/cloud/CloudAccessLayer.cpp b/program/Source/cloud/CloudAccessLayer.cpp
index 96a55f9863349bc5049884154a745fbbd3b472d3..934e1f4d5badf507e27fcc79b56a2a277916dc99 100644
--- a/program/Source/cloud/CloudAccessLayer.cpp
+++ b/program/Source/cloud/CloudAccessLayer.cpp
@@ -1,6 +1,6 @@
 #include "CloudAccessLayer.h"
-#include "logger\Logger.h"
-#include "app\Application.h"
+#include "../logger/Logger.h"
+#include "../app/Application.h"
 #include "CloudException.h"
 
 /**
diff --git a/program/Source/cloud/CloudAccessLayer.h b/program/Source/cloud/CloudAccessLayer.h
index 468b60514f8b00d3c817d56e3622ff90b7d98c54..141ee7b02068c1253a2b8f6671fb884061f8d607 100644
--- a/program/Source/cloud/CloudAccessLayer.h
+++ b/program/Source/cloud/CloudAccessLayer.h
@@ -1,8 +1,8 @@
 #ifndef _CLOUDACCESSLAYER_H
 #define _CLOUDACCESSLAYER_H
 
-#include "fileModel/FileDescriptor.h"
-#include "fileModel/LockFile.h"
+#include "../fileModel/FileDescriptor.h"
+#include "../fileModel/LockFile.h"
 
 class Application;
 
diff --git a/program/Source/cloud/CloudAdapter.cpp b/program/Source/cloud/CloudAdapter.cpp
index cf2ea4d1025939c88879a29ce0eef1fa43f98705..aae6e96a768d9f4d0d82a8c825a8fb92d49de36f 100644
--- a/program/Source/cloud/CloudAdapter.cpp
+++ b/program/Source/cloud/CloudAdapter.cpp
@@ -1,5 +1,5 @@
 #include "CloudAdapter.h"
-#include "logger\Logger.h"
+#include "../logger/Logger.h"
 
 /**
  * CloudAdapter implementation
diff --git a/program/Source/cloud/CloudAdapter.h b/program/Source/cloud/CloudAdapter.h
index 81f255a628e0a5779e98379dab2fb76b16a589fe..47e9405c22b6a193dd06090243ab670f2ec00ec3 100644
--- a/program/Source/cloud/CloudAdapter.h
+++ b/program/Source/cloud/CloudAdapter.h
@@ -1,8 +1,8 @@
 #ifndef _CLOUDADAPTER_H
 #define _CLOUDADAPTER_H
 #include <string>
-#include "fileModel\CloudFile.h"
-#include "fileModel\Fragment.h"
+#include "../fileModel/CloudFile.h"
+#include "../fileModel/Fragment.h"
 #include <boost/smart_ptr/shared_ptr.hpp>
 
 using namespace std;
diff --git a/program/Source/cloud/CloudManager.cpp b/program/Source/cloud/CloudManager.cpp
index bd9bc4facf3046b08d6487ef2154d95e042bac1b..9088d0ed16c5b25cbe5c185281f46e4ad0b72b7a 100644
--- a/program/Source/cloud/CloudManager.cpp
+++ b/program/Source/cloud/CloudManager.cpp
@@ -1,5 +1,5 @@
 #include "CloudManager.h"
-#include "logger\Logger.h"
+#include "../logger/Logger.h"
 /**
  * CloudManager implementation
  */
diff --git a/program/Source/cloud/DropboxAdapter.cpp b/program/Source/cloud/DropboxAdapter.cpp
index 85e19d297b5d970bafb3f33a9c3efcac2c436080..453ef0a3a6a13a6454a76129849f169542f9fef6 100644
--- a/program/Source/cloud/DropboxAdapter.cpp
+++ b/program/Source/cloud/DropboxAdapter.cpp
@@ -1,5 +1,5 @@
 #include "DropboxAdapter.h"
-#include "logger\\Logger.h"
+#include "../logger/\Logger.h"
 #include <fstream>
 #include "Poco/Net/FTPClientSession.h"
 #include "Poco/Net/HTTPSClientSession.h"
diff --git a/program/Source/cloud/DropboxAdapter.h b/program/Source/cloud/DropboxAdapter.h
index 5df489bc68acbb2f8f1b4e458524a4de76ace6a3..6fb1df5ab71ed1c25f18033e1606fdb65ed3c67d 100644
--- a/program/Source/cloud/DropboxAdapter.h
+++ b/program/Source/cloud/DropboxAdapter.h
@@ -2,9 +2,9 @@
 #define _DROPBOXADAPTER_H
 
 #include <string>
-#include "fileModel\CloudFile.h"
-#include "cloud\CloudAdapter.h"
-#include "fileModel\Fragment.h"
+#include "../fileModel/CloudFile.h"
+#include "../cloud/CloudAdapter.h"
+#include "../fileModel/Fragment.h"
 #include "Poco/Net/HTTPRequest.h"
 #include <Poco/Net/Context.h>
 #include <filesystem>
diff --git a/program/Source/cloud/ExampleCloudAdapter.cpp b/program/Source/cloud/ExampleCloudAdapter.cpp
index f46716f2d31170a922364c946cb838dac0c35156..0640f69a3c41b7a71569b65a63acb905ff921e58 100644
--- a/program/Source/cloud/ExampleCloudAdapter.cpp
+++ b/program/Source/cloud/ExampleCloudAdapter.cpp
@@ -1,5 +1,5 @@
 #include "ExampleCloudAdapter.h"
-#include "logger\Logger.h"
+#include "../logger/Logger.h"
 
 /**
 * ExampleCloudAdapter implementation
diff --git a/program/Source/cloud/ExampleCloudAdapter.h b/program/Source/cloud/ExampleCloudAdapter.h
index 56477ce66a68585ad82d34d07b69411cf01d5b75..9e01d3ffa12d9f2a7228fda82f3bdd1b4040bcf0 100644
--- a/program/Source/cloud/ExampleCloudAdapter.h
+++ b/program/Source/cloud/ExampleCloudAdapter.h
@@ -2,9 +2,9 @@
 #define _EXAMPLECLOUDADAPTER_H
 
 #include <string>
-#include "fileModel\CloudFile.h"
-#include "cloud\CloudAdapter.h"
-#include "fileModel\Fragment.h"
+#include "../fileModel/CloudFile.h"
+#include "../cloud/CloudAdapter.h"
+#include "../fileModel/Fragment.h"
 
 using namespace std;
 
diff --git a/program/Source/cloud/FTPAdapter.cpp b/program/Source/cloud/FTPAdapter.cpp
index f623410933ef9d09690147f0fea7e7d3890a09e1..ada592364e27470a4875813a910a1d5bfd405622 100644
--- a/program/Source/cloud/FTPAdapter.cpp
+++ b/program/Source/cloud/FTPAdapter.cpp
@@ -1,5 +1,5 @@
 #include "FTPAdapter.h"
-#include "logger\\Logger.h"
+#include "../logger/\Logger.h"
 #include <fstream>
 #include "Poco/Net/FTPClientSession.h"
 #include "Poco/Net/NetException.h"
@@ -13,7 +13,7 @@
 using namespace Poco::Net;
 using namespace Poco;
 
-const string FTPAdapter::fragFolder = "C:\\Users\\krisz\\raspberrycloud\\skeleton\\Program\\temp\\";
+const string FTPAdapter::fragFolder = "C:\\Users\\krisz\\raspberry../cloud/\skeleton\\Program\\temp\\";
 const string FTPAdapter::USERNAME = "b18_16883957";
 const string FTPAdapter::PASSWORD = "lolwutdoge";
 const string FTPAdapter::HOST = "ftp.byethost18.com";
diff --git a/program/Source/cloud/FTPAdapter.h b/program/Source/cloud/FTPAdapter.h
index a251f2e8610a7da087666ae15f4efcfdf6c7e54c..4f4d797f6b38f1d10f8a77d38ba5923462501715 100644
--- a/program/Source/cloud/FTPAdapter.h
+++ b/program/Source/cloud/FTPAdapter.h
@@ -2,9 +2,9 @@
 #define _FTPADAPTER_H
 
 #include <string>
-#include "fileModel\CloudFile.h"
-#include "cloud\CloudAdapter.h"
-#include "fileModel\Fragment.h"
+#include "../fileModel/CloudFile.h"
+#include "../cloud/CloudAdapter.h"
+#include "../fileModel/Fragment.h"
 
 /**
 * DropboxAdapter class
diff --git a/program/Source/cloud/LocalCloudAdapter.cpp b/program/Source/cloud/LocalCloudAdapter.cpp
index a98d9d372853c674acbacb3bbedcbfda38882cb3..bf62d595a779346f6796257be2bf58ac0a2c3afb 100644
--- a/program/Source/cloud/LocalCloudAdapter.cpp
+++ b/program/Source/cloud/LocalCloudAdapter.cpp
@@ -1,5 +1,5 @@
 #include "LocalCloudAdapter.h"
-#include "logger\\Logger.h"
+#include "../logger/Logger.h"
 #include <fstream>
 
 //#include <boost/filesystem.hpp>
diff --git a/program/Source/cloud/LocalCloudAdapter.h b/program/Source/cloud/LocalCloudAdapter.h
index 95a663f9aba78b044fc61878228391d812216f1b..5feb10ed60e38f2e55407c408c460367560e0f8e 100644
--- a/program/Source/cloud/LocalCloudAdapter.h
+++ b/program/Source/cloud/LocalCloudAdapter.h
@@ -2,9 +2,9 @@
 #define _LocalCLOUDADAPTER_H
 
 #include <string>
-#include "fileModel\CloudFile.h"
-#include "cloud\CloudAdapter.h"
-#include "fileModel\Fragment.h"
+#include "../fileModel/CloudFile.h"
+#include "../cloud/CloudAdapter.h"
+#include "../fileModel/Fragment.h"
 
 using namespace std;
 
diff --git a/program/Source/dataAccess/CloudFileList.h b/program/Source/dataAccess/CloudFileList.h
index f7abae79414f8103c8f3590402899e0fb0dc5e5c..f1f28e80efb09012fb963f4136df00fb1d20feb4 100644
--- a/program/Source/dataAccess/CloudFileList.h
+++ b/program/Source/dataAccess/CloudFileList.h
@@ -1,7 +1,7 @@
 #ifndef _CLOUDFILELIST_H
 #define _CLOUDFILELIST_H
 
-#include "fileModel\FileDescriptor.h"
+#include "../fileModel/FileDescriptor.h"
 #include <string>
 #include <fstream>
 #include <list>
diff --git a/program/Source/dataAccess/CloudFileSystem.cpp b/program/Source/dataAccess/CloudFileSystem.cpp
index ff700e2b48f6e5f5c584a427114fce2107af14ee..80be67f09cfd5422400e6e5c3673b0a57aeb12fd 100644
--- a/program/Source/dataAccess/CloudFileSystem.cpp
+++ b/program/Source/dataAccess/CloudFileSystem.cpp
@@ -1,4 +1,4 @@
-#include "app\Application.h"
+#include "../app/Application.h"
 #include "ComputeOnPi.h"
 #include "ComputeOnClient.h"
 
diff --git a/program/Source/dataAccess/CloudFileSystem.h b/program/Source/dataAccess/CloudFileSystem.h
index d8b567c71a1550687da1a75926cd1787955a4872..7317a17f70c7edd11d4b6e7ba271b437da74da66 100644
--- a/program/Source/dataAccess/CloudFileSystem.h
+++ b/program/Source/dataAccess/CloudFileSystem.h
@@ -6,13 +6,13 @@
 #include <fstream>
 #include "ConcreteCache.h"
 #include "CloudFileSystem.h"
-#include "logger\Logger.h"
-#include "cloud\CloudAccessLayer.h"
-#include "fileModel/FileDescriptor.h"
+#include "../logger/Logger.h"
+#include "../cloud/CloudAccessLayer.h"
+#include "../fileModel/FileDescriptor.h"
 #include "HomeNetworkBehaviour.h"
 #include "Distributor.h"
-#include "cloud\CloudAccessLayer.h"
-#include "networking\HomeNetworkCommunications.h"
+#include "../cloud/CloudAccessLayer.h"
+#include "../networking/HomeNetworkCommunications.h"
 #include "Cache.h"
 #include "CloudFileList.h"
 using namespace std;
diff --git a/program/Source/dataAccess/ComputeOnClient.cpp b/program/Source/dataAccess/ComputeOnClient.cpp
index 48af852906ea0d83bfa52b41787c29cff532aeee..2f3a8168f02863dfefffbe639f288286f0b0bdbe 100644
--- a/program/Source/dataAccess/ComputeOnClient.cpp
+++ b/program/Source/dataAccess/ComputeOnClient.cpp
@@ -1,9 +1,9 @@
 #include "ComputeOnClient.h"
-#include "logger\Logger.h"
+#include "../logger/Logger.h"
 #include "Decoder.h"
 #include "Encoder.h"
 #include "Distributor.h"
-#include "cloud\CloudAccessLayer.h"
+#include "../cloud/CloudAccessLayer.h"
 #include "Cache.h"
 
 using namespace fileModel;
diff --git a/program/Source/dataAccess/ComputeOnClient.h b/program/Source/dataAccess/ComputeOnClient.h
index 6b8c3ee677ff3edd06dd9b7780c1d80f7b72b209..db4182339bd3d2a73152af3aa066d94d9619d653 100644
--- a/program/Source/dataAccess/ComputeOnClient.h
+++ b/program/Source/dataAccess/ComputeOnClient.h
@@ -3,7 +3,7 @@
 
 #include <string>
 #include "HomeNetworkBehaviour.h"
-#include "fileModel/FileDescriptor.h"
+#include "../fileModel/FileDescriptor.h"
 #include "CloudFileSystem.h"
 using namespace std;
 
diff --git a/program/Source/dataAccess/ComputeOnPi.h b/program/Source/dataAccess/ComputeOnPi.h
index 8dc8c28d447c581b640664e95c38f8426f1b9846..5e7e01e7982935da258d63901d1b623b02ad3121 100644
--- a/program/Source/dataAccess/ComputeOnPi.h
+++ b/program/Source/dataAccess/ComputeOnPi.h
@@ -3,9 +3,9 @@
 
 #include <string>
 #include "HomeNetworkBehaviour.h"
-#include "fileModel/FileDescriptor.h"
+#include "../fileModel/FileDescriptor.h"
 #include "CloudFileSystem.h"
-#include "networking\HomeNetworkCommunications.h"
+#include "../networking/HomeNetworkCommunications.h"
 using namespace std;
 
 /**
diff --git a/program/Source/dataAccess/ConcreteCache.cpp b/program/Source/dataAccess/ConcreteCache.cpp
index 8264142404e847f730c1772c3884d15931a30d02..145ab5fda94f19ba615d278dc99794e647e8ce51 100644
--- a/program/Source/dataAccess/ConcreteCache.cpp
+++ b/program/Source/dataAccess/ConcreteCache.cpp
@@ -1,5 +1,5 @@
 #include "ConcreteCache.h"
-#include "logger\Logger.h"
+#include "../logger/Logger.h"
 
 /**
  * ConcreteCache implementation
diff --git a/program/Source/dataAccess/Decoder.cpp b/program/Source/dataAccess/Decoder.cpp
index 5db5b6de2f1d9a9aba21e9ee59bb8bfbb248d0f5..b2884ddb8baabbc3d253be116dfe3d782004e6b0 100644
--- a/program/Source/dataAccess/Decoder.cpp
+++ b/program/Source/dataAccess/Decoder.cpp
@@ -1,6 +1,6 @@
 #include "Decoder.h"
-#include "logger\Logger.h"
-#include "cloud\CloudException.h"
+#include "../logger/Logger.h"
+#include "../cloud/CloudException.h"
 #include "Encoder.h"
 #include <string>
 #include <fstream>
diff --git a/program/Source/dataAccess/Decoder.h b/program/Source/dataAccess/Decoder.h
index d488b6c91dccdbb876240342343a047d25cb17c7..016cd1d102f2a79ce99dbb2fa6b7d50e6e549e27 100644
--- a/program/Source/dataAccess/Decoder.h
+++ b/program/Source/dataAccess/Decoder.h
@@ -1,7 +1,7 @@
 #ifndef _DECODER_H
 #define _DECODER_H
 #include <string>
-#include "fileModel/FileDescriptor.h"
+#include "../fileModel/FileDescriptor.h"
 
 /**
  * Decoder class
diff --git a/program/Source/dataAccess/Distributor.cpp b/program/Source/dataAccess/Distributor.cpp
index 10549041c228b4dead7d0dceb06d53f2f1cefe3d..622f7c93a990b5008d03bfd01e4665bc5acd4e2a 100644
--- a/program/Source/dataAccess/Distributor.cpp
+++ b/program/Source/dataAccess/Distributor.cpp
@@ -1,6 +1,6 @@
 #include "Distributor.h"
-#include "logger\Logger.h"
-#include "cloud\CloudException.h"
+#include "../logger/Logger.h"
+#include "../cloud/CloudException.h"
 
 /**
  * Distributor implementation
diff --git a/program/Source/dataAccess/Distributor.h b/program/Source/dataAccess/Distributor.h
index 2bc5ffbf99a1bb4b900f13545b3426678f4a421f..9ee707841f2dd1678041465b1efcc96b2ffdd611 100644
--- a/program/Source/dataAccess/Distributor.h
+++ b/program/Source/dataAccess/Distributor.h
@@ -6,8 +6,8 @@
 #ifndef _DISTRIBUTOR_H
 #define _DISTRIBUTOR_H
 
-#include "fileModel/FileDescriptor.h"
-#include "cloud\CloudManager.h"
+#include "../fileModel/FileDescriptor.h"
+#include "../cloud/CloudManager.h"
 
 /**
  * Distributor class
diff --git a/program/Source/dataAccess/Encoder.cpp b/program/Source/dataAccess/Encoder.cpp
index fe633d036107e36ba01151ce4e0641031eb2e5f0..9ce1bc9c5ec50a3a2d3e9f331062ee3aef5f9837 100644
--- a/program/Source/dataAccess/Encoder.cpp
+++ b/program/Source/dataAccess/Encoder.cpp
@@ -1,6 +1,6 @@
 #include "Encoder.h"
-#include "logger\Logger.h"
-#include "cloud\CloudException.h"
+#include "../logger/Logger.h"
+#include "../cloud/CloudException.h"
 #include  <fstream>
 
 #include <kodo/object/file_encoder.hpp>
diff --git a/program/Source/dataAccess/Encoder.h b/program/Source/dataAccess/Encoder.h
index ec5641152664e54568557c1b6247a3cd173c5458..7b6a56101ae20a8a68eaa6fd6df2e464846d03f1 100644
--- a/program/Source/dataAccess/Encoder.h
+++ b/program/Source/dataAccess/Encoder.h
@@ -1,7 +1,7 @@
 #ifndef _ENCODER_H
 #define _ENCODER_H
 
-#include "fileModel/FileDescriptor.h"
+#include "../fileModel/FileDescriptor.h"
 #include <memory>
 
 /**
diff --git a/program/Source/dataAccess/HomeNetworkBehaviour.h b/program/Source/dataAccess/HomeNetworkBehaviour.h
index a63a93ea860eb4bd644b4ee0bc5bd90872e474dd..d4a86fd4849ca06a45e30839808efcbf3e5f9a5e 100644
--- a/program/Source/dataAccess/HomeNetworkBehaviour.h
+++ b/program/Source/dataAccess/HomeNetworkBehaviour.h
@@ -2,7 +2,7 @@
 #define _HOMENETWORKBEHAVIOUR_H
 
 #include <string>
-#include "fileModel/FileDescriptor.h"
+#include "../fileModel/FileDescriptor.h"
 using namespace std;
 
 /**
diff --git a/program/Source/fileModel/CloudFile.cpp b/program/Source/fileModel/CloudFile.cpp
index 4a276f6bb60b3942b1381174eba17332ded9fb85..01bc52bc5b50789b53e3fb0c3139843c199617f4 100644
--- a/program/Source/fileModel/CloudFile.cpp
+++ b/program/Source/fileModel/CloudFile.cpp
@@ -1,5 +1,5 @@
 #include "CloudFile.h"
-#include "logger\Logger.h"
+#include "../logger/Logger.h"
 
 /**
  * CloudFile implementation
diff --git a/program/Source/fileModel/FileDescriptor.cpp b/program/Source/fileModel/FileDescriptor.cpp
index 8a698c42e57707716147a7cccd969132728460a1..380fcda0f82ec5551c080ea3d12cd9508b7ade29 100644
--- a/program/Source/fileModel/FileDescriptor.cpp
+++ b/program/Source/fileModel/FileDescriptor.cpp
@@ -1,5 +1,5 @@
 #include "FileDescriptor.h"
-#include "logger\Logger.h"
+#include "../logger/Logger.h"
 
 /**
  * FileDescriptor implementation
diff --git a/program/Source/fileModel/Fragment.cpp b/program/Source/fileModel/Fragment.cpp
index 25a9ea642c18a8d22916df204678f079a21e0dbb..f1320630391c86a342063a0ae3272769bc1edf03 100644
--- a/program/Source/fileModel/Fragment.cpp
+++ b/program/Source/fileModel/Fragment.cpp
@@ -1,5 +1,5 @@
 #include "Fragment.h"
-#include "logger\Logger.h"
+#include "../logger/Logger.h"
 
 /**
  * Fragment implementation
diff --git a/program/Source/fileModel/LockFile.cpp b/program/Source/fileModel/LockFile.cpp
index af26492764116c57d53cefbb908d4ee4b43883b1..5b78151560caf14daedde1be5c816a7793e1f83f 100644
--- a/program/Source/fileModel/LockFile.cpp
+++ b/program/Source/fileModel/LockFile.cpp
@@ -1,5 +1,5 @@
 #include "LockFile.h"
-#include "logger\Logger.h"
+#include "../logger/Logger.h"
 
 using namespace fileModel;
 
diff --git a/program/Source/logger/Logger.cpp b/program/Source/logger/Logger.cpp
index 0f6c5697d669e0b7261ad1ef66711c55e1a615b5..c62c701284f240a4929f8cb5fc8f9d16af6f615f 100644
--- a/program/Source/logger/Logger.cpp
+++ b/program/Source/logger/Logger.cpp
@@ -1,4 +1,4 @@
-#include "logger/Logger.h"
+#include "../logger/Logger.h"
 
 const std::string Logger::_in(">>");
 const std::string Logger::_out("<<");
diff --git a/program/Source/networking/ConcreteEncryption.cpp b/program/Source/networking/ConcreteEncryption.cpp
index be1776270276a20b57e937a96815d4b1a3a29235..44340dd0976a0eb3c5cb0147d4a2a34999dcf43e 100644
--- a/program/Source/networking/ConcreteEncryption.cpp
+++ b/program/Source/networking/ConcreteEncryption.cpp
@@ -1,4 +1,4 @@
-#include "logger\Logger.h"
+#include "../logger/Logger.h"
 #include "ConcreteEncryption.h"
 
 /**
diff --git a/program/Source/networking/FileServerConnection.cpp b/program/Source/networking/FileServerConnection.cpp
index 0296b141babec840886f4ab3d2d8c8d060ad61d3..d28206c186b5c8fb36f8a5049dd1b4b314cc46ca 100644
--- a/program/Source/networking/FileServerConnection.cpp
+++ b/program/Source/networking/FileServerConnection.cpp
@@ -1,11 +1,11 @@
 #include "FileServerConnection.h"
 #include <fstream>
 #include "NetworkHelperMethods.h"
-#include <dataAccess/CloudFileSystem.h>
+#include "../dataAccess/CloudFileSystem.h"
 
 using namespace std;
 
-const std::string FileServerConnection::dataFolder = "C:\\Users\\krisz\\raspberrycloud\\skeleton\\Program\\data\\";
+const string FileServerConnection::dataFolder = "C:\\Users\\krisz\\raspberrycloud\\skeleton\\Program\\dataClient\\";
 
 void FileServerConnection::run()
 {
diff --git a/program/Source/networking/HomeNetworkCommunications.cpp b/program/Source/networking/HomeNetworkCommunications.cpp
index fda709258cb3bd1c464f55c12781a275656b0c1c..0a0136300ad69204ccd89343d94cc05690f73154 100644
--- a/program/Source/networking/HomeNetworkCommunications.cpp
+++ b/program/Source/networking/HomeNetworkCommunications.cpp
@@ -1,4 +1,4 @@
-#include "logger\Logger.h"
+#include "../logger/Logger.h"
 #include "HomeNetworkCommunications.h"
 #include "FileServerConnection.h"
 #include "NetworkHelperMethods.h"
@@ -19,6 +19,7 @@ using namespace Poco::Net;
 const string HomeNetworkCommunications::dataFolder = "C:\\Users\\krisz\\raspberrycloud\\skeleton\\Program\\dataClient\\";
 
 HomeNetworkCommunications::HomeNetworkCommunications() :
+	piAvaliable(false),
 	tcpServer(nullptr),
 	udpServerThread(nullptr),
 	udpServer(nullptr)
@@ -132,7 +133,7 @@ void HomeNetworkCommunications::refresh()
 		piAddress = getServerIP();
 		piAvaliable = true;
 	}
-	catch (TimeoutException& e)
+	catch (TimeoutException&)
 	{
 		piAddress = IPAddress();
 		piAvaliable = false;