diff --git a/Makefile.am b/Makefile.am
index 620a84a..d27a471 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,7 +59,7 @@ video/Videocontroller/PacketSender.h \
 video/VideoFEC.h \
 video/VideoRenderer.h \
 video/ScreamCongestionController.h \
-json11.hpp \
+tools/json11.hpp \
 tools/utils.h
 
 if TARGET_OS_OSX
diff --git a/Makefile.in b/Makefile.in
index afa3bcf..6231a75 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1439,8 +1439,8 @@ am__libtgvoip_la_SOURCES_DIST = TgVoip.cpp VoIPController.cpp \
 	audio/Resampler.h os/posix/NetworkSocketPosix.h \
 	video/VideoSource.h video/Videocontroller/PacketSender.h \
 	video/VideoFEC.h video/VideoRenderer.h \
-	video/ScreamCongestionController.h json11.hpp tools/utils.h \
-	os/darwin/AudioInputAudioUnit.h \
+	video/ScreamCongestionController.h tools/json11.hpp \
+	tools/utils.h os/darwin/AudioInputAudioUnit.h \
 	os/darwin/AudioOutputAudioUnit.h os/darwin/AudioUnitIO.h \
 	os/darwin/AudioInputAudioUnitOSX.h \
 	os/darwin/AudioOutputAudioUnitOSX.h os/darwin/DarwinSpecific.h \
@@ -2187,8 +2187,8 @@ am__nobase_tgvoipinclude_HEADERS_DIST = TgVoip.h VoIPController.h \
 	audio/Resampler.h os/posix/NetworkSocketPosix.h \
 	video/VideoSource.h video/Videocontroller/PacketSender.h \
 	video/VideoFEC.h video/VideoRenderer.h \
-	video/ScreamCongestionController.h json11.hpp tools/utils.h \
-	os/darwin/AudioInputAudioUnit.h \
+	video/ScreamCongestionController.h tools/json11.hpp \
+	tools/utils.h os/darwin/AudioInputAudioUnit.h \
 	os/darwin/AudioOutputAudioUnit.h os/darwin/AudioUnitIO.h \
 	os/darwin/AudioInputAudioUnitOSX.h \
 	os/darwin/AudioOutputAudioUnitOSX.h os/darwin/DarwinSpecific.h \
@@ -2403,8 +2403,8 @@ TGVOIP_HDRS = TgVoip.h VoIPController.h tools/Buffers.h \
 	audio/Resampler.h os/posix/NetworkSocketPosix.h \
 	video/VideoSource.h video/Videocontroller/PacketSender.h \
 	video/VideoFEC.h video/VideoRenderer.h \
-	video/ScreamCongestionController.h json11.hpp tools/utils.h \
-	$(am__append_2) $(am__append_5) $(am__append_7) \
+	video/ScreamCongestionController.h tools/json11.hpp \
+	tools/utils.h $(am__append_2) $(am__append_5) $(am__append_7) \
 	$(am__append_17)
 libtgvoip_la_SOURCES = $(SRC) $(TGVOIP_HDRS)
 tgvoipincludedir = $(includedir)/tgvoip
diff --git a/VoIPController.cpp b/VoIPController.cpp
index 064b005..f60a024 100644
--- a/VoIPController.cpp
+++ b/VoIPController.cpp
@@ -19,9 +19,9 @@
 #include "controller/audio/OpusDecoder.h"
 #include "VoIPServerConfig.h"
 #include "controller/PrivateDefines.h"
-#include "json11.hpp"
+#include "tools/json11.hpp"
 #include "controller/PacketSender.h"
-#include "video/Videocontroller/PacketSender.h"
+#include "video/VideoPacketSender.h"
 #include <assert.h>
 #include <time.h>
 #include <math.h>
diff --git a/VoIPServerConfig.h b/VoIPServerConfig.h
index 98fd1cb..135e183 100644
--- a/VoIPServerConfig.h
+++ b/VoIPServerConfig.h
@@ -11,7 +11,7 @@
 #include <string>
 #include <stdint.h>
 #include "tools/threading.h"
-#include "json11.hpp"
+#include "tools/json11.hpp"
 
 namespace tgvoip
 {
diff --git a/libtgvoip.UWP.vcxproj b/libtgvoip.UWP.vcxproj
index 0ef41d1..4cd004f 100644
--- a/libtgvoip.UWP.vcxproj
+++ b/libtgvoip.UWP.vcxproj
@@ -244,7 +244,7 @@
     <ClInclude Include="controller/net/CongestionControl.h" />
     <ClInclude Include="controller/audio/EchoCanceller.h" />
     <ClInclude Include="controller/net/JitterBuffer.h" />
-    <ClInclude Include="json11.hpp" />
+    <ClInclude Include="tools/json11.hpp" />
     <ClInclude Include="tools/logging.h" />
     <ClInclude Include="controller/MediaStreamItf.h" />
     <ClInclude Include="tools/MessageThread.h" />
diff --git a/libtgvoip.UWP.vcxproj.filters b/libtgvoip.UWP.vcxproj.filters
index 5682add..517fc4b 100644
--- a/libtgvoip.UWP.vcxproj.filters
+++ b/libtgvoip.UWP.vcxproj.filters
@@ -1917,7 +1917,7 @@
     <ClInclude Include="webrtc_dsp\modules\third_party\fft\fft.h">
       <Filter>webrtc_dsp</Filter>
     </ClInclude>
-    <ClInclude Include="json11.hpp" />
+    <ClInclude Include="tools/json11.hpp" />
     <ClInclude Include="video\ScreamCongestionController.h">
       <Filter>video</Filter>
     </ClInclude>
diff --git a/libtgvoip.gyp b/libtgvoip.gyp
index 155cbfe..555d2ef 100644
--- a/libtgvoip.gyp
+++ b/libtgvoip.gyp
@@ -79,7 +79,7 @@
           '<(tgvoip_src_loc)/video/VideoFEC.cpp',
           '<(tgvoip_src_loc)/video/VideoFEC.h',
           '<(tgvoip_src_loc)/tools/json11.cpp',
-          '<(tgvoip_src_loc)/json11.hpp',
+          '<(tgvoip_src_loc)/tools/json11.hpp',
 
           # Windows
           '<(tgvoip_src_loc)/os/windows/NetworkSocketWinsock.cpp',
diff --git a/tools/json11.cpp b/tools/json11.cpp
index 812e610..83363da 100755
--- a/tools/json11.cpp
+++ b/tools/json11.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.
  */
 
-#include "json11.hpp"
+#include "tools/json11.hpp"
 #include <cassert>
 #include <cmath>
 #include <cstdlib>
@@ -750,7 +750,7 @@ Json Json::parse(const string &in, string &err, JsonParse strategy) {
     return result;
 }
 
-// Documented in json11.hpp
+// Documented in tools/json11.hpp
 vector<Json> Json::parse_multi(const string &in,
                                std::string::size_type &parser_stop_pos,
                                string &err,
diff --git a/video/VideoPacketSender.cpp b/video/VideoPacketSender.cpp
index 8e1f4e1..a973807 100644
--- a/video/VideoPacketSender.cpp
+++ b/video/VideoPacketSender.cpp
@@ -3,7 +3,7 @@
 //
 
 #include <algorithm>
-#include "Videocontroller/PacketSender.h"
+#include "VideoPacketSender.h"
 #include "VideoFEC.h"
 #include "../tools/logging.h"
 #include "../controller/PrivateDefines.h"