diff --git a/json/History.txt b/History.txt
similarity index 100%
rename from json/History.txt
rename to History.txt
diff --git a/json/License.txt b/License.txt
similarity index 100%
rename from json/License.txt
rename to License.txt
diff --git a/json/Readme.txt b/Readme.txt
similarity index 100%
rename from json/Readme.txt
rename to Readme.txt
diff --git a/json/json_file_reader.e b/library/extras/file/json_file_reader.e
similarity index 100%
rename from json/json_file_reader.e
rename to library/extras/file/json_file_reader.e
diff --git a/json/visitor/json_visitor.e b/library/extras/visitor/json_visitor.e
similarity index 100%
rename from json/visitor/json_visitor.e
rename to library/extras/visitor/json_visitor.e
diff --git a/json/visitor/print_json_visitor.e b/library/extras/visitor/print_json_visitor.e
similarity index 100%
rename from json/visitor/print_json_visitor.e
rename to library/extras/visitor/print_json_visitor.e
diff --git a/json/json-safe.ecf b/library/json-safe.ecf
similarity index 100%
rename from json/json-safe.ecf
rename to library/json-safe.ecf
diff --git a/json/json.ecf b/library/json.ecf
similarity index 100%
rename from json/json.ecf
rename to library/json.ecf
diff --git a/json/json.rc b/library/json.rc
similarity index 100%
rename from json/json.rc
rename to library/json.rc
diff --git a/json/json_array.e b/library/kernel/json_array.e
similarity index 100%
rename from json/json_array.e
rename to library/kernel/json_array.e
diff --git a/json/json_boolean.e b/library/kernel/json_boolean.e
similarity index 100%
rename from json/json_boolean.e
rename to library/kernel/json_boolean.e
diff --git a/json/json_null.e b/library/kernel/json_null.e
similarity index 100%
rename from json/json_null.e
rename to library/kernel/json_null.e
diff --git a/json/json_number.e b/library/kernel/json_number.e
similarity index 100%
rename from json/json_number.e
rename to library/kernel/json_number.e
diff --git a/json/json_object.e b/library/kernel/json_object.e
similarity index 100%
rename from json/json_object.e
rename to library/kernel/json_object.e
diff --git a/json/json_string.e b/library/kernel/json_string.e
similarity index 100%
rename from json/json_string.e
rename to library/kernel/json_string.e
diff --git a/json/json_value.e b/library/kernel/json_value.e
similarity index 100%
rename from json/json_value.e
rename to library/kernel/json_value.e
diff --git a/json/scanner/json_parser.e b/library/kernel/scanner/json_parser.e
similarity index 100%
rename from json/scanner/json_parser.e
rename to library/kernel/scanner/json_parser.e
diff --git a/json/scanner/json_reader.e b/library/kernel/scanner/json_reader.e
similarity index 100%
rename from json/scanner/json_reader.e
rename to library/kernel/scanner/json_reader.e
diff --git a/json/scanner/json_tokens.e b/library/kernel/scanner/json_tokens.e
similarity index 100%
rename from json/scanner/json_tokens.e
rename to library/kernel/scanner/json_tokens.e