diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d41fcbe..20b3e014 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,9 +100,9 @@ if (BUILD_PYTHON)
     endif ()
 endif()
 
-include_directories(common/ frontend/json ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS})
+include_directories(common/ json/ ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS})
 aux_source_directory(common/ COMMON_SRC_FILES)
-aux_source_directory(frontend/json/ JSON_PARSER_FILES)
+aux_source_directory(json/ JSON_PARSER_FILES)
 set(COMMON_FILES ${COMMON_SRC_FILES} ${JSON_PARSER_FILES})
 set(CMAKE_BUILD_TYPE Release)
 
diff --git a/frontend/json/jsonparse.cc b/json/jsonparse.cc
similarity index 100%
rename from frontend/json/jsonparse.cc
rename to json/jsonparse.cc
diff --git a/frontend/json/jsonparse.h b/json/jsonparse.h
similarity index 100%
rename from frontend/json/jsonparse.h
rename to json/jsonparse.h