diff --git a/i18n-sample/.gitignore b/i18n-sample/.gitignore
index f4be32ab..5c8f6865 100644
--- a/i18n-sample/.gitignore
+++ b/i18n-sample/.gitignore
@@ -1,3 +1,4 @@
 out
 node_modules
-package.nls.*.json
\ No newline at end of file
+// These files will be generated from the i18n folder
+*nls.*.json
diff --git a/i18n-sample/gulpfile.js b/i18n-sample/gulpfile.js
index a5589452..aa3096bd 100644
--- a/i18n-sample/gulpfile.js
+++ b/i18n-sample/gulpfile.js
@@ -90,4 +90,4 @@ gulp.task('vsce:publish', function() {
 
 gulp.task('vsce:package', function() {
 	return vsce.createVSIX();
-});
\ No newline at end of file
+});
diff --git a/i18n-sample/i18n-sample-0.0.1.vsix b/i18n-sample/i18n-sample-0.0.1.vsix
deleted file mode 100644
index b4345ef8..00000000
Binary files a/i18n-sample/i18n-sample-0.0.1.vsix and /dev/null differ
diff --git a/i18n-sample/package.nls.ja.json b/i18n-sample/i18n/jpn/package.i18n.json
similarity index 100%
rename from i18n-sample/package.nls.ja.json
rename to i18n-sample/i18n/jpn/package.i18n.json
diff --git a/i18n-sample/src/command/sayBye.nls.ja.json b/i18n-sample/src/command/sayBye.nls.ja.json
deleted file mode 100644
index 491dfe9d..00000000
--- a/i18n-sample/src/command/sayBye.nls.ja.json
+++ /dev/null
@@ -1 +0,0 @@
-["さようなら"]
diff --git a/i18n-sample/src/command/sayBye.nls.json b/i18n-sample/src/command/sayBye.nls.json
deleted file mode 100644
index 05365ab3..00000000
--- a/i18n-sample/src/command/sayBye.nls.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "messages": ["Bye"],
-  "keys": ["sayBye.text"]
-}
diff --git a/i18n-sample/src/extension.nls.ja.json b/i18n-sample/src/extension.nls.ja.json
deleted file mode 100644
index 5206d922..00000000
--- a/i18n-sample/src/extension.nls.ja.json
+++ /dev/null
@@ -1 +0,0 @@
-["こんにちは"]
diff --git a/i18n-sample/src/extension.nls.json b/i18n-sample/src/extension.nls.json
deleted file mode 100644
index 419c5cc8..00000000
--- a/i18n-sample/src/extension.nls.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "messages": ["Hello"],
-  "keys": ["sayHello.text"]
-}