diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7017b01..e8dc0ba0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,11 +17,18 @@ set(HEADERS
     src/common/config/CommonConfig.h
     src/common/config/ConfigLoader.h
     src/common/config/ConfigWatcher.h
+    src/common/Console.h
+    src/common/net/Client.h
+    src/common/net/Id.h
+    src/common/net/Pool.h
+    src/common/net/Storage.h
+    src/common/net/strategies/FailoverStrategy.h
+    src/common/net/strategies/SinglePoolStrategy.h
+    src/common/net/SubmitResult.h
     src/common/Platform.h
     src/common/utils/c_str.h
     src/common/utils/mm_malloc.h
     src/common/xmrig.h
-    src/Console.h
     src/core/Config.cpp
     src/core/ConfigLoader_platform.h
     src/core/Controller.h
@@ -42,17 +49,10 @@ set(HEADERS
     src/log/FileLog.h
     src/log/Log.h
     src/Mem.h
-    src/net/Client.h
-    src/net/Id.h
     src/net/Job.h
     src/net/JobResult.h
     src/net/Network.h
-    src/net/Pool.h
-    src/net/Storage.h
     src/net/strategies/DonateStrategy.h
-    src/net/strategies/FailoverStrategy.h
-    src/net/strategies/SinglePoolStrategy.h
-    src/net/SubmitResult.h
     src/Summary.h
     src/version.h
     src/workers/CpuThread.h
@@ -91,22 +91,22 @@ set(SOURCES
     src/common/config/CommonConfig.cpp
     src/common/config/ConfigLoader.cpp
     src/common/config/ConfigWatcher.cpp
+    src/common/Console.cpp
+    src/common/net/Client.cpp
+    src/common/net/Pool.cpp
+    src/common/net/strategies/FailoverStrategy.cpp
+    src/common/net/strategies/SinglePoolStrategy.cpp
+    src/common/net/SubmitResult.cpp
     src/common/Platform.cpp
-    src/Console.cpp
     src/core/Config.cpp
     src/core/Controller.cpp
     src/log/ConsoleLog.cpp
     src/log/FileLog.cpp
     src/log/Log.cpp
     src/Mem.cpp
-    src/net/Client.cpp
     src/net/Job.cpp
     src/net/Network.cpp
-    src/net/Pool.cpp
     src/net/strategies/DonateStrategy.cpp
-    src/net/strategies/FailoverStrategy.cpp
-    src/net/strategies/SinglePoolStrategy.cpp
-    src/net/SubmitResult.cpp
     src/Summary.cpp
     src/workers/CpuThread.cpp
     src/workers/Handle.cpp
diff --git a/src/App.cpp b/src/App.cpp
index 78d6b328..e7447634 100644
--- a/src/App.cpp
+++ b/src/App.cpp
@@ -28,8 +28,8 @@
 
 #include "api/Api.h"
 #include "App.h"
+#include "common/Console.h"
 #include "common/Platform.h"
-#include "Console.h"
 #include "core/Config.h"
 #include "core/Controller.h"
 #include "Cpu.h"
diff --git a/src/Summary.cpp b/src/Summary.cpp
index 32a0e4bb..12108d18 100644
--- a/src/Summary.cpp
+++ b/src/Summary.cpp
@@ -27,12 +27,12 @@
 #include <uv.h>
 
 
+#include "common/net/Pool.h"
 #include "core/Config.h"
 #include "core/Controller.h"
 #include "Cpu.h"
 #include "log/Log.h"
 #include "Mem.h"
-#include "net/Pool.h"
 #include "Summary.h"
 #include "version.h"
 
diff --git a/src/api/NetworkState.cpp b/src/api/NetworkState.cpp
index d3ffddd3..0ab80093 100644
--- a/src/api/NetworkState.cpp
+++ b/src/api/NetworkState.cpp
@@ -4,8 +4,8 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@
 
 
 #include "api/NetworkState.h"
-#include "net/SubmitResult.h"
+#include "common/net/SubmitResult.h"
 
 
 NetworkState::NetworkState() :
diff --git a/src/Console.cpp b/src/common/Console.cpp
similarity index 90%
rename from src/Console.cpp
rename to src/common/Console.cpp
index 3d95ada4..350fb139 100644
--- a/src/Console.cpp
+++ b/src/common/Console.cpp
@@ -4,8 +4,8 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
  */
 
 
-#include "Console.h"
+#include "common/Console.h"
 #include "interfaces/IConsoleListener.h"
 
 
diff --git a/src/Console.h b/src/common/Console.h
similarity index 88%
rename from src/Console.h
rename to src/common/Console.h
index bde95d7d..7f2e3cc9 100644
--- a/src/Console.h
+++ b/src/common/Console.h
@@ -4,8 +4,8 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/src/common/config/CommonConfig.cpp b/src/common/config/CommonConfig.cpp
index 22fd348d..7327b50c 100644
--- a/src/common/config/CommonConfig.cpp
+++ b/src/common/config/CommonConfig.cpp
@@ -32,7 +32,6 @@
 #include "common/config/CommonConfig.h"
 #include "donate.h"
 #include "log/Log.h"
-#include "net/Pool.h"
 #include "rapidjson/document.h"
 #include "rapidjson/filewritestream.h"
 #include "rapidjson/prettywriter.h"
diff --git a/src/common/config/CommonConfig.h b/src/common/config/CommonConfig.h
index 5a229269..015ba04e 100644
--- a/src/common/config/CommonConfig.h
+++ b/src/common/config/CommonConfig.h
@@ -28,10 +28,10 @@
 #include <vector>
 
 
+#include "common/net/Pool.h"
 #include "common/utils/c_str.h"
 #include "common/xmrig.h"
 #include "interfaces/IConfig.h"
-#include "net/Pool.h"
 
 
 namespace xmrig {
diff --git a/src/common/config/ConfigLoader.cpp b/src/common/config/ConfigLoader.cpp
index 47c6cdf9..cc92213f 100644
--- a/src/common/config/ConfigLoader.cpp
+++ b/src/common/config/ConfigLoader.cpp
@@ -34,12 +34,12 @@
 
 #include "common/config/ConfigLoader.h"
 #include "common/config/ConfigWatcher.h"
+#include "common/net/Pool.h"
 #include "common/Platform.h"
 #include "core/ConfigCreator.h"
 #include "core/ConfigLoader_platform.h"
 #include "interfaces/IConfig.h"
 #include "interfaces/IWatcherListener.h"
-#include "net/Pool.h"
 #include "rapidjson/document.h"
 #include "rapidjson/error/en.h"
 #include "rapidjson/filereadstream.h"
diff --git a/src/net/Client.cpp b/src/common/net/Client.cpp
similarity index 99%
rename from src/net/Client.cpp
rename to src/common/net/Client.cpp
index 436bcd1a..c335634b 100644
--- a/src/net/Client.cpp
+++ b/src/common/net/Client.cpp
@@ -29,9 +29,9 @@
 #include <utility>
 
 
+#include "common/net/Client.h"
 #include "interfaces/IClientListener.h"
 #include "log/Log.h"
-#include "net/Client.h"
 #include "rapidjson/document.h"
 #include "rapidjson/error/en.h"
 #include "rapidjson/stringbuffer.h"
diff --git a/src/net/Client.h b/src/common/net/Client.h
similarity index 97%
rename from src/net/Client.h
rename to src/common/net/Client.h
index 0692d38b..502fd4cc 100644
--- a/src/net/Client.h
+++ b/src/common/net/Client.h
@@ -30,11 +30,11 @@
 #include <vector>
 
 
-#include "net/Id.h"
+#include "common/net/Id.h"
+#include "common/net/Pool.h"
+#include "common/net/Storage.h"
+#include "common/net/SubmitResult.h"
 #include "net/Job.h"
-#include "net/Storage.h"
-#include "net/SubmitResult.h"
-#include "net/Pool.h"
 #include "rapidjson/fwd.h"
 
 
diff --git a/src/net/Id.h b/src/common/net/Id.h
similarity index 100%
rename from src/net/Id.h
rename to src/common/net/Id.h
diff --git a/src/net/Pool.cpp b/src/common/net/Pool.cpp
similarity index 99%
rename from src/net/Pool.cpp
rename to src/common/net/Pool.cpp
index 2e167ebd..ddf31031 100644
--- a/src/net/Pool.cpp
+++ b/src/common/net/Pool.cpp
@@ -28,7 +28,7 @@
 #include <stdio.h>
 
 
-#include "net/Pool.h"
+#include "common/net/Pool.h"
 
 
 #ifdef _MSC_VER
diff --git a/src/net/Pool.h b/src/common/net/Pool.h
similarity index 100%
rename from src/net/Pool.h
rename to src/common/net/Pool.h
diff --git a/src/net/Storage.h b/src/common/net/Storage.h
similarity index 100%
rename from src/net/Storage.h
rename to src/common/net/Storage.h
diff --git a/src/net/SubmitResult.cpp b/src/common/net/SubmitResult.cpp
similarity index 82%
rename from src/net/SubmitResult.cpp
rename to src/common/net/SubmitResult.cpp
index 2e81017c..251b2bf1 100644
--- a/src/net/SubmitResult.cpp
+++ b/src/common/net/SubmitResult.cpp
@@ -4,8 +4,8 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -25,10 +25,11 @@
 #include <uv.h>
 
 
-#include "net/SubmitResult.h"
+#include "common/net/SubmitResult.h"
 
 
-SubmitResult::SubmitResult(int64_t seq, uint32_t diff, uint64_t actualDiff) :
+SubmitResult::SubmitResult(int64_t seq, uint32_t diff, uint64_t actualDiff, int64_t reqId) :
+    reqId(reqId),
     seq(seq),
     diff(diff),
     actualDiff(actualDiff),
diff --git a/src/net/SubmitResult.h b/src/common/net/SubmitResult.h
similarity index 80%
rename from src/net/SubmitResult.h
rename to src/common/net/SubmitResult.h
index 8eddef89..e812cbf8 100644
--- a/src/net/SubmitResult.h
+++ b/src/common/net/SubmitResult.h
@@ -4,8 +4,8 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -31,11 +31,12 @@
 class SubmitResult
 {
 public:
-    inline SubmitResult() : seq(0), diff(0), actualDiff(0), elapsed(0), start(0) {}
-    SubmitResult(int64_t seq, uint32_t diff, uint64_t actualDiff);
+    inline SubmitResult() : reqId(0), seq(0), diff(0), actualDiff(0), elapsed(0), start(0) {}
+    SubmitResult(int64_t seq, uint32_t diff, uint64_t actualDiff, int64_t reqId = 0);
 
     void done();
 
+    int64_t reqId;
     int64_t seq;
     uint32_t diff;
     uint64_t actualDiff;
diff --git a/src/net/strategies/FailoverStrategy.cpp b/src/common/net/strategies/FailoverStrategy.cpp
similarity index 97%
rename from src/net/strategies/FailoverStrategy.cpp
rename to src/common/net/strategies/FailoverStrategy.cpp
index cef9da0c..58854498 100644
--- a/src/net/strategies/FailoverStrategy.cpp
+++ b/src/common/net/strategies/FailoverStrategy.cpp
@@ -22,10 +22,10 @@
  */
 
 
+#include "common/net/Client.h"
+#include "common/net/strategies/FailoverStrategy.h"
 #include "common/Platform.h"
 #include "interfaces/IStrategyListener.h"
-#include "net/Client.h"
-#include "net/strategies/FailoverStrategy.h"
 
 
 FailoverStrategy::FailoverStrategy(const std::vector<Pool> &urls, int retryPause, int retries, IStrategyListener *listener, bool quiet) :
diff --git a/src/net/strategies/FailoverStrategy.h b/src/common/net/strategies/FailoverStrategy.h
similarity index 98%
rename from src/net/strategies/FailoverStrategy.h
rename to src/common/net/strategies/FailoverStrategy.h
index a48496fb..f86b366a 100644
--- a/src/net/strategies/FailoverStrategy.h
+++ b/src/common/net/strategies/FailoverStrategy.h
@@ -28,9 +28,9 @@
 #include <vector>
 
 
+#include "common/net/Pool.h"
 #include "interfaces/IClientListener.h"
 #include "interfaces/IStrategy.h"
-#include "net/Pool.h"
 
 
 class Client;
diff --git a/src/net/strategies/SinglePoolStrategy.cpp b/src/common/net/strategies/SinglePoolStrategy.cpp
similarity index 96%
rename from src/net/strategies/SinglePoolStrategy.cpp
rename to src/common/net/strategies/SinglePoolStrategy.cpp
index c74a794b..50620ab2 100644
--- a/src/net/strategies/SinglePoolStrategy.cpp
+++ b/src/common/net/strategies/SinglePoolStrategy.cpp
@@ -22,10 +22,10 @@
  */
 
 
+#include "common/net/Client.h"
+#include "common/net/strategies/SinglePoolStrategy.h"
 #include "common/Platform.h"
 #include "interfaces/IStrategyListener.h"
-#include "net/Client.h"
-#include "net/strategies/SinglePoolStrategy.h"
 
 
 SinglePoolStrategy::SinglePoolStrategy(const Pool &pool, int retryPause, IStrategyListener *listener, bool quiet) :
diff --git a/src/net/strategies/SinglePoolStrategy.h b/src/common/net/strategies/SinglePoolStrategy.h
similarity index 100%
rename from src/net/strategies/SinglePoolStrategy.h
rename to src/common/net/strategies/SinglePoolStrategy.h
diff --git a/src/core/Config.cpp b/src/core/Config.cpp
index 4d48af29..33cd01e8 100644
--- a/src/core/Config.cpp
+++ b/src/core/Config.cpp
@@ -31,7 +31,6 @@
 #include "core/ConfigCreator.h"
 #include "Cpu.h"
 #include "crypto/CryptoNight_constants.h"
-#include "net/Pool.h"
 #include "rapidjson/document.h"
 #include "rapidjson/filewritestream.h"
 #include "rapidjson/prettywriter.h"
diff --git a/src/log/Log.cpp b/src/log/Log.cpp
index 131faa54..0e38634d 100644
--- a/src/log/Log.cpp
+++ b/src/log/Log.cpp
@@ -50,6 +50,8 @@ void Log::message(Log::Level level, const char* fmt, ...)
         va_end(copy);
     }
 
+    va_end(args);
+
     uv_mutex_unlock(&m_mutex);
 }
 
diff --git a/src/net/Job.h b/src/net/Job.h
index ee4728e3..e632a26d 100644
--- a/src/net/Job.h
+++ b/src/net/Job.h
@@ -30,8 +30,8 @@
 #include <stdint.h>
 
 
+#include "common/net/Id.h"
 #include "common/xmrig.h"
-#include "net/Id.h"
 
 
 class Job
diff --git a/src/net/Network.cpp b/src/net/Network.cpp
index 98ce7e8d..1fe02a35 100644
--- a/src/net/Network.cpp
+++ b/src/net/Network.cpp
@@ -31,16 +31,16 @@
 
 
 #include "api/Api.h"
+#include "common/net/Client.h"
+#include "common/net/strategies/FailoverStrategy.h"
+#include "common/net/strategies/SinglePoolStrategy.h"
+#include "common/net/SubmitResult.h"
+#include "core/Config.h"
+#include "core/Controller.h"
 #include "log/Log.h"
-#include "net/Client.h"
 #include "net/Network.h"
 #include "net/strategies/DonateStrategy.h"
-#include "net/strategies/FailoverStrategy.h"
-#include "net/strategies/SinglePoolStrategy.h"
-#include "net/SubmitResult.h"
 #include "workers/Workers.h"
-#include "core/Controller.h"
-#include "core/Config.h"
 
 
 Network::Network(xmrig::Controller *controller) :
diff --git a/src/net/strategies/DonateStrategy.cpp b/src/net/strategies/DonateStrategy.cpp
index 27beae33..3176ee52 100644
--- a/src/net/strategies/DonateStrategy.cpp
+++ b/src/net/strategies/DonateStrategy.cpp
@@ -22,13 +22,13 @@
  */
 
 
+#include "common/net/Client.h"
+#include "common/net/strategies/FailoverStrategy.h"
 #include "common/Platform.h"
 #include "common/xmrig.h"
 #include "interfaces/IStrategyListener.h"
-#include "net/Client.h"
 #include "net/Job.h"
 #include "net/strategies/DonateStrategy.h"
-#include "net/strategies/FailoverStrategy.h"
 
 
 extern "C"
diff --git a/src/net/strategies/DonateStrategy.h b/src/net/strategies/DonateStrategy.h
index cad360b1..edb15c8f 100644
--- a/src/net/strategies/DonateStrategy.h
+++ b/src/net/strategies/DonateStrategy.h
@@ -29,10 +29,10 @@
 #include <vector>
 
 
+#include "common/net/Pool.h"
 #include "interfaces/IClientListener.h"
 #include "interfaces/IStrategy.h"
 #include "interfaces/IStrategyListener.h"
-#include "net/Pool.h"
 
 
 class Client;
diff --git a/src/workers/CpuThread.cpp b/src/workers/CpuThread.cpp
index 3632e193..be24b2d5 100644
--- a/src/workers/CpuThread.cpp
+++ b/src/workers/CpuThread.cpp
@@ -24,7 +24,7 @@
 #include <assert.h>
 
 
-#include "net/Pool.h"
+#include "common/net/Pool.h"
 #include "rapidjson/document.h"
 #include "workers/CpuThread.h"