diff --git a/data-access/servlet/Makefile b/data-access/servlet/Makefile
index 5ea8d97ad4f0d81915695556997d57ad783e44f0..7e0712fb6463e1211a7cc5c1376ed8f976b5363f 100644
--- a/data-access/servlet/Makefile
+++ b/data-access/servlet/Makefile
@@ -10,7 +10,7 @@ INSTALL_DIR ?= target/webapp
 AUTH_DIR    := ../../auth
 #===============================================================================
 # all sources
-SRC_DIR = src/main/java/:src/main/java/common:src/main/java/cutout:src/main/java/cutout/json-rpc:src/main/java/common/vo:src/main/java/common/vo/soda:src/main/java/resolver:src/main/java/webapi:src/main/java/webapi/output:$(AUTH_DIR)/src/main/java
+SRC_DIR = src/main/java/:src/main/java/common:src/main/java/cutout:src/main/java/cutout/json:src/main/java/common/vo:src/main/java/common/vo/soda:src/main/java/resolver:src/main/java/webapi:src/main/java/webapi/output:$(AUTH_DIR)/src/main/java
 VOSI     = src/main/java/vosi/VlkbServletFile.java
 #IA2CONVFILTER = $(AUTH_DIR)/src/main/java/IA2TokenConvFilter.java
 AUTHFILTERS  = $(wildcard $(AUTH_DIR)/src/main/java/*Filter.java) $(AUTH_DIR)/src/main/java/AuthPolicy.java
diff --git a/data-access/servlet/src/main/java/cutout/json-rpc/RpcOverAmqp.java b/data-access/servlet/src/main/java/cutout/RpcOverAmqp.java
similarity index 100%
rename from data-access/servlet/src/main/java/cutout/json-rpc/RpcOverAmqp.java
rename to data-access/servlet/src/main/java/cutout/RpcOverAmqp.java
diff --git a/data-access/servlet/src/main/java/cutout/json-rpc/JdlMCutout.java b/data-access/servlet/src/main/java/cutout/json/JdlMCutout.java
similarity index 100%
rename from data-access/servlet/src/main/java/cutout/json-rpc/JdlMCutout.java
rename to data-access/servlet/src/main/java/cutout/json/JdlMCutout.java
diff --git a/data-access/servlet/src/main/java/cutout/json-rpc/JsonDecoder.java b/data-access/servlet/src/main/java/cutout/json/JsonDecoder.java
similarity index 100%
rename from data-access/servlet/src/main/java/cutout/json-rpc/JsonDecoder.java
rename to data-access/servlet/src/main/java/cutout/json/JsonDecoder.java
diff --git a/data-access/servlet/src/main/java/cutout/json-rpc/JsonEncoder.java b/data-access/servlet/src/main/java/cutout/json/JsonEncoder.java
similarity index 100%
rename from data-access/servlet/src/main/java/cutout/json-rpc/JsonEncoder.java
rename to data-access/servlet/src/main/java/cutout/json/JsonEncoder.java
diff --git a/data-access/servlet/src/main/java/cutout/json-rpc/JsonEncoderMerge.java b/data-access/servlet/src/main/java/cutout/json/JsonEncoderMerge.java
similarity index 100%
rename from data-access/servlet/src/main/java/cutout/json-rpc/JsonEncoderMerge.java
rename to data-access/servlet/src/main/java/cutout/json/JsonEncoderMerge.java