diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1962a4b5..aa6af8f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -300,23 +300,23 @@ list (
     json/pointer.hpp
     json/schema.cpp
     json/schema.hpp
-    json/schema/fwd.hpp
-    json/schema/base.cpp
-    json/schema/base.hpp
-    json/schema/combine.cpp
-    json/schema/combine.hpp
-    json/schema/enum.cpp
-    json/schema/enum.hpp
-    json/schema/except.hpp
-    json/schema/introspection.hpp
-    json/schema/length.cpp
-    json/schema/length.hpp
-    json/schema/inequality.cpp
-    json/schema/inequality.hpp
-    json/schema/properties.cpp
-    json/schema/properties.hpp
-    json/schema/type.cpp
-    json/schema/type.hpp
+    json/constraint/fwd.hpp
+    json/constraint/base.cpp
+    json/constraint/base.hpp
+    json/constraint/combine.cpp
+    json/constraint/combine.hpp
+    json/constraint/enum.cpp
+    json/constraint/enum.hpp
+    json/constraint/except.hpp
+    json/constraint/introspection.hpp
+    json/constraint/length.cpp
+    json/constraint/length.hpp
+    json/constraint/inequality.cpp
+    json/constraint/inequality.hpp
+    json/constraint/properties.cpp
+    json/constraint/properties.hpp
+    json/constraint/type.cpp
+    json/constraint/type.hpp
     json/tree.cpp
     json/tree.hpp
     json2/fwd.hpp
diff --git a/json/schema/base.cpp b/json/constraint/base.cpp
similarity index 100%
rename from json/schema/base.cpp
rename to json/constraint/base.cpp
diff --git a/json/schema/base.hpp b/json/constraint/base.hpp
similarity index 100%
rename from json/schema/base.hpp
rename to json/constraint/base.hpp
diff --git a/json/schema/combine.cpp b/json/constraint/combine.cpp
similarity index 100%
rename from json/schema/combine.cpp
rename to json/constraint/combine.cpp
diff --git a/json/schema/combine.hpp b/json/constraint/combine.hpp
similarity index 100%
rename from json/schema/combine.hpp
rename to json/constraint/combine.hpp
diff --git a/json/schema/enum.cpp b/json/constraint/enum.cpp
similarity index 100%
rename from json/schema/enum.cpp
rename to json/constraint/enum.cpp
diff --git a/json/schema/enum.hpp b/json/constraint/enum.hpp
similarity index 100%
rename from json/schema/enum.hpp
rename to json/constraint/enum.hpp
diff --git a/json/schema/except.hpp b/json/constraint/except.hpp
similarity index 100%
rename from json/schema/except.hpp
rename to json/constraint/except.hpp
diff --git a/json/schema/fwd.hpp b/json/constraint/fwd.hpp
similarity index 100%
rename from json/schema/fwd.hpp
rename to json/constraint/fwd.hpp
diff --git a/json/schema/inequality.cpp b/json/constraint/inequality.cpp
similarity index 100%
rename from json/schema/inequality.cpp
rename to json/constraint/inequality.cpp
diff --git a/json/schema/inequality.hpp b/json/constraint/inequality.hpp
similarity index 100%
rename from json/schema/inequality.hpp
rename to json/constraint/inequality.hpp
diff --git a/json/schema/introspection.hpp b/json/constraint/introspection.hpp
similarity index 100%
rename from json/schema/introspection.hpp
rename to json/constraint/introspection.hpp
diff --git a/json/schema/length.cpp b/json/constraint/length.cpp
similarity index 100%
rename from json/schema/length.cpp
rename to json/constraint/length.cpp
diff --git a/json/schema/length.hpp b/json/constraint/length.hpp
similarity index 100%
rename from json/schema/length.hpp
rename to json/constraint/length.hpp
diff --git a/json/schema/properties.cpp b/json/constraint/properties.cpp
similarity index 100%
rename from json/schema/properties.cpp
rename to json/constraint/properties.cpp
diff --git a/json/schema/properties.hpp b/json/constraint/properties.hpp
similarity index 100%
rename from json/schema/properties.hpp
rename to json/constraint/properties.hpp
diff --git a/json/schema/type.cpp b/json/constraint/type.cpp
similarity index 100%
rename from json/schema/type.cpp
rename to json/constraint/type.cpp
diff --git a/json/schema/type.hpp b/json/constraint/type.hpp
similarity index 100%
rename from json/schema/type.hpp
rename to json/constraint/type.hpp
diff --git a/json/schema.cpp b/json/schema.cpp
index b65bb7f2..56285d2b 100644
--- a/json/schema.cpp
+++ b/json/schema.cpp
@@ -541,8 +541,8 @@ json::schema::validate (json::tree::node &data,
 
 
 ///////////////////////////////////////////////////////////////////////////////
-#include "schema/except.hpp"
-#include "schema/base.hpp"
+#include "constraint/except.hpp"
+#include "constraint/base.hpp"
 
 #include "../io.hpp"
 #include "../view.hpp"
diff --git a/json/schema.hpp b/json/schema.hpp
index b0d524ac..270c276b 100644
--- a/json/schema.hpp
+++ b/json/schema.hpp
@@ -18,7 +18,7 @@
 #define __UTIL_JSON_SCHEMA_HPP
 
 #include "fwd.hpp"
-#include "schema/combine.hpp"
+#include "constraint/combine.hpp"
 
 #include <experimental/filesystem>
 
diff --git a/tools/json-schema.cpp b/tools/json-schema.cpp
index 4db7e158..6357d1d7 100644
--- a/tools/json-schema.cpp
+++ b/tools/json-schema.cpp
@@ -19,7 +19,7 @@
 #include "json/schema.hpp"
 #include "json/tree.hpp"
 
-#include "json/schema/except.hpp"
+#include "json/constraint/except.hpp"
 
 #include "io.hpp"