diff --git a/server/Makefile b/server/Makefile
index 9edcfd68..ff9c4b22 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -6,7 +6,7 @@ CC      = /usr/bin/g++
 CFLAGS  = -std=c++0x -Wall -Wno-unused-function -O3 -pthread -DVERSION=\"$(VERSION)\" -I..
 LDFLAGS = -lrt -lboost_system -lboost_program_options -lvorbis -lvorbisenc -logg -lFLAC -lavahi-client -lavahi-common
 
-OBJ = snapServer.o config.o controlServer.o controlSession.o streamServer.o jsonrpc.o encoder/encoderFactory.o encoder/flacEncoder.o encoder/pcmEncoder.o encoder/oggEncoder.o clientSession.o publishAvahi.o pipeReader.o ../common/log.o ../message/pcmChunk.o ../message/sampleFormat.o
+OBJ = snapServer.o config.o controlServer.o controlSession.o streamServer.o json/jsonrpc.o encoder/encoderFactory.o encoder/flacEncoder.o encoder/pcmEncoder.o encoder/oggEncoder.o clientSession.o publishAvahi.o pipeReader.o ../common/log.o ../message/pcmChunk.o ../message/sampleFormat.o
 BIN = snapserver
 
 all:	$(TARGET)
diff --git a/server/config.h b/server/config.h
index cb8e0816..df556c5e 100644
--- a/server/config.h
+++ b/server/config.h
@@ -23,7 +23,7 @@
 #include <memory>
 #include <vector>
 #include <sys/time.h>
-#include "json.hpp"
+#include "json/json.hpp"
 
 using json = nlohmann::json;
 
diff --git a/server/controlServer.cpp b/server/controlServer.cpp
index 1509474f..0b23092e 100644
--- a/server/controlServer.cpp
+++ b/server/controlServer.cpp
@@ -25,7 +25,7 @@
 #include "common/log.h"
 #include "common/utils.h"
 #include "common/snapException.h"
-#include "jsonrpc.h"
+#include "json/jsonrpc.h"
 #include "config.h"
 #include <iostream>
 
diff --git a/server/json.hpp b/server/json/json.hpp
similarity index 100%
rename from server/json.hpp
rename to server/json/json.hpp
diff --git a/server/jsonrpc.cpp b/server/json/jsonrpc.cpp
similarity index 100%
rename from server/jsonrpc.cpp
rename to server/json/jsonrpc.cpp
diff --git a/server/jsonrpc.h b/server/json/jsonrpc.h
similarity index 100%
rename from server/jsonrpc.h
rename to server/json/jsonrpc.h
diff --git a/server/snapserver.json b/server/json/snapserver.json
similarity index 100%
rename from server/snapserver.json
rename to server/json/snapserver.json
diff --git a/server/streamServer.cpp b/server/streamServer.cpp
index c023a57e..cf8708af 100644
--- a/server/streamServer.cpp
+++ b/server/streamServer.cpp
@@ -16,7 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "jsonrpc.h"
+#include "json/jsonrpc.h"
 #include "streamServer.h"
 #include "message/time.h"
 #include "message/ack.h"