Index: .arclint
===================================================================
--- .arclint
+++ .arclint
@@ -2,7 +2,7 @@
   "linters": {
     "format": {
       "include": "(include/polly/.+\\.h$|lib/.+\\.cpp$)",
-      "exclude": "(lib/JSON/.*)",
+      "exclude": "(lib/External/JSON/.*)",
       "type": "script-and-regex",
       "script-and-regex.script": "sh -c './utils/check_format.sh \"$0\" 2> /dev/null || true'",
       "script-and-regex.regex": "/^(OK:(?P<ignore>.+)|Error:) (?P<message>.+)$/m"
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -161,7 +161,7 @@
 include_directories(
   BEFORE
   ${CMAKE_CURRENT_SOURCE_DIR}/include
-  ${CMAKE_CURRENT_SOURCE_DIR}/lib/JSON/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/JSON/include
   ${CMAKE_CURRENT_BINARY_DIR}/lib/External/isl/include
   ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/isl/include
   ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/pet/include
@@ -203,9 +203,8 @@
 
 # Add target to check formatting of polly files
 file( GLOB_RECURSE files *.h lib/*.cpp lib/*.c tools/*.cpp tools/*.c tools/*.h unittests/*.cpp)
-file( GLOB_RECURSE jsonfiles lib/JSON/*.h lib/JSON/*.cpp)
-file( GLOB_RECURSE external lib/External/*.h lib/External/*.c)
-list( REMOVE_ITEM files ${jsonfiles} ${external})
+file( GLOB_RECURSE external lib/External/*.h lib/External/*.c lib/External/*.cpp)
+list( REMOVE_ITEM files ${external})
 
 set(check_format_depends)
 set(update_format_depends)
Index: LICENSE.txt
===================================================================
--- LICENSE.txt
+++ LICENSE.txt
@@ -55,7 +55,7 @@
 
 Program             Directory
 -------             ---------
-jsoncpp             lib/JSON
+jsoncpp             lib/External/JSON
 
 
 
Index: lib/CMakeLists.txt
===================================================================
--- lib/CMakeLists.txt
+++ lib/CMakeLists.txt
@@ -1,9 +1,9 @@
 set(LLVM_NO_RTTI 1)
 
 set(POLLY_JSON_FILES
-    JSON/json_reader.cpp
-    JSON/json_value.cpp
-    JSON/json_writer.cpp
+    External/JSON/json_reader.cpp
+    External/JSON/json_value.cpp
+    External/JSON/json_writer.cpp
 )
 
 set(ISL_CODEGEN_FILES