diff --git a/JSON/Comments.tmPreferences b/JSON/Comments.tmPreferences
new file mode 100644
index 0000000000..dd46f14e7a
--- /dev/null
+++ b/JSON/Comments.tmPreferences
@@ -0,0 +1,33 @@
+
+
+
+ name
+ Comments
+ scope
+ source.json
+ settings
+
+ shellVariables
+
+
+ name
+ TM_COMMENT_START
+ value
+ //
+
+
+ name
+ TM_COMMENT_START_2
+ value
+ /*
+
+
+ name
+ TM_COMMENT_END_2
+ value
+ */
+
+
+
+
+
diff --git a/JavaScript/JSON Indent.tmPreferences b/JSON/Indentation Rules.tmPreferences
similarity index 100%
rename from JavaScript/JSON Indent.tmPreferences
rename to JSON/Indentation Rules.tmPreferences
diff --git a/JavaScript/JSON.sublime-syntax b/JSON/JSON.sublime-syntax
similarity index 100%
rename from JavaScript/JSON.sublime-syntax
rename to JSON/JSON.sublime-syntax
diff --git a/JavaScript/tests/syntax_test_json.json b/JSON/syntax_test_json.json
similarity index 97%
rename from JavaScript/tests/syntax_test_json.json
rename to JSON/syntax_test_json.json
index 2ce4180c77..715100b10e 100644
--- a/JavaScript/tests/syntax_test_json.json
+++ b/JSON/syntax_test_json.json
@@ -1,4 +1,4 @@
-// SYNTAX TEST "Packages/JavaScript/JSON.sublime-syntax"
+// SYNTAX TEST "Packages/JSON/JSON.sublime-syntax"
{
// <- meta.mapping.json punctuation.section.mapping.begin.json
diff --git a/JavaScript/Comments.tmPreferences b/JavaScript/Comments.tmPreferences
index f16fa66e31..d24c0f708c 100644
--- a/JavaScript/Comments.tmPreferences
+++ b/JavaScript/Comments.tmPreferences
@@ -4,7 +4,7 @@
name
Comments
scope
- source.js, source.json
+ source.js
settings
shellVariables