diff --git a/src-intl/ja/security/bulletin/2015-08-01.jd b/src-intl/ja_ALL/security/bulletin/2015-08-01.jd
similarity index 100%
rename from src-intl/ja/security/bulletin/2015-08-01.jd
rename to src-intl/ja_ALL/security/bulletin/2015-08-01.jd
diff --git a/src-intl/ja/security/bulletin/2015-09-01.jd b/src-intl/ja_ALL/security/bulletin/2015-09-01.jd
similarity index 100%
rename from src-intl/ja/security/bulletin/2015-09-01.jd
rename to src-intl/ja_ALL/security/bulletin/2015-09-01.jd
diff --git a/src-intl/ja/security/bulletin/2015-10-01.jd b/src-intl/ja_ALL/security/bulletin/2015-10-01.jd
similarity index 100%
rename from src-intl/ja/security/bulletin/2015-10-01.jd
rename to src-intl/ja_ALL/security/bulletin/2015-10-01.jd
diff --git a/src-intl/ja/security/bulletin/2015-11-01.jd b/src-intl/ja_ALL/security/bulletin/2015-11-01.jd
similarity index 100%
rename from src-intl/ja/security/bulletin/2015-11-01.jd
rename to src-intl/ja_ALL/security/bulletin/2015-11-01.jd
diff --git a/src-intl/ja/security/bulletin/2016-02-01.jd b/src-intl/ja_ALL/security/bulletin/2016-02-01.jd
similarity index 100%
rename from src-intl/ja/security/bulletin/2016-02-01.jd
rename to src-intl/ja_ALL/security/bulletin/2016-02-01.jd
diff --git a/src-intl/ja/security/bulletin/index.jd b/src-intl/ja_ALL/security/bulletin/index.jd
similarity index 100%
rename from src-intl/ja/security/bulletin/index.jd
rename to src-intl/ja_ALL/security/bulletin/index.jd
diff --git a/src-intl/ko/security/bulletin/2015-08-01.jd b/src-intl/ko_ALL/security/bulletin/2015-08-01.jd
similarity index 100%
rename from src-intl/ko/security/bulletin/2015-08-01.jd
rename to src-intl/ko_ALL/security/bulletin/2015-08-01.jd
diff --git a/src-intl/ko/security/bulletin/2015-09-01.jd b/src-intl/ko_ALL/security/bulletin/2015-09-01.jd
similarity index 100%
rename from src-intl/ko/security/bulletin/2015-09-01.jd
rename to src-intl/ko_ALL/security/bulletin/2015-09-01.jd
diff --git a/src-intl/ko/security/bulletin/2015-10-01.jd b/src-intl/ko_ALL/security/bulletin/2015-10-01.jd
similarity index 100%
rename from src-intl/ko/security/bulletin/2015-10-01.jd
rename to src-intl/ko_ALL/security/bulletin/2015-10-01.jd
diff --git a/src-intl/ko/security/bulletin/2015-11-01.jd b/src-intl/ko_ALL/security/bulletin/2015-11-01.jd
similarity index 100%
rename from src-intl/ko/security/bulletin/2015-11-01.jd
rename to src-intl/ko_ALL/security/bulletin/2015-11-01.jd
diff --git a/src-intl/ko/security/bulletin/2016-02-01.jd b/src-intl/ko_ALL/security/bulletin/2016-02-01.jd
similarity index 100%
rename from src-intl/ko/security/bulletin/2016-02-01.jd
rename to src-intl/ko_ALL/security/bulletin/2016-02-01.jd
diff --git a/src-intl/ko/security/bulletin/index.jd b/src-intl/ko_ALL/security/bulletin/index.jd
similarity index 100%
rename from src-intl/ko/security/bulletin/index.jd
rename to src-intl/ko_ALL/security/bulletin/index.jd
diff --git a/src-intl/ru/security/bulletin/2015-08-01.jd b/src-intl/ru_ALL/security/bulletin/2015-08-01.jd
similarity index 100%
rename from src-intl/ru/security/bulletin/2015-08-01.jd
rename to src-intl/ru_ALL/security/bulletin/2015-08-01.jd
diff --git a/src-intl/ru/security/bulletin/2015-09-01.jd b/src-intl/ru_ALL/security/bulletin/2015-09-01.jd
similarity index 100%
rename from src-intl/ru/security/bulletin/2015-09-01.jd
rename to src-intl/ru_ALL/security/bulletin/2015-09-01.jd
diff --git a/src-intl/ru/security/bulletin/2015-10-01.jd b/src-intl/ru_ALL/security/bulletin/2015-10-01.jd
similarity index 100%
rename from src-intl/ru/security/bulletin/2015-10-01.jd
rename to src-intl/ru_ALL/security/bulletin/2015-10-01.jd
diff --git a/src-intl/ru/security/bulletin/2015-11-01.jd b/src-intl/ru_ALL/security/bulletin/2015-11-01.jd
similarity index 100%
rename from src-intl/ru/security/bulletin/2015-11-01.jd
rename to src-intl/ru_ALL/security/bulletin/2015-11-01.jd
diff --git a/src-intl/ru/security/bulletin/2016-02-01.jd b/src-intl/ru_ALL/security/bulletin/2016-02-01.jd
similarity index 100%
rename from src-intl/ru/security/bulletin/2016-02-01.jd
rename to src-intl/ru_ALL/security/bulletin/2016-02-01.jd
diff --git a/src-intl/ru/security/bulletin/index.jd b/src-intl/ru_ALL/security/bulletin/index.jd
similarity index 100%
rename from src-intl/ru/security/bulletin/index.jd
rename to src-intl/ru_ALL/security/bulletin/index.jd
diff --git a/src-intl/zh-CN/security/bulletin/2015-08-01.jd b/src-intl/zh-CN_ALL/security/bulletin/2015-08-01.jd
similarity index 100%
rename from src-intl/zh-CN/security/bulletin/2015-08-01.jd
rename to src-intl/zh-CN_ALL/security/bulletin/2015-08-01.jd
diff --git a/src-intl/zh-CN/security/bulletin/2015-09-01.jd b/src-intl/zh-CN_ALL/security/bulletin/2015-09-01.jd
similarity index 100%
rename from src-intl/zh-CN/security/bulletin/2015-09-01.jd
rename to src-intl/zh-CN_ALL/security/bulletin/2015-09-01.jd
diff --git a/src-intl/zh-CN/security/bulletin/2015-10-01.jd b/src-intl/zh-CN_ALL/security/bulletin/2015-10-01.jd
similarity index 100%
rename from src-intl/zh-CN/security/bulletin/2015-10-01.jd
rename to src-intl/zh-CN_ALL/security/bulletin/2015-10-01.jd
diff --git a/src-intl/zh-CN/security/bulletin/2015-11-01.jd b/src-intl/zh-CN_ALL/security/bulletin/2015-11-01.jd
similarity index 100%
rename from src-intl/zh-CN/security/bulletin/2015-11-01.jd
rename to src-intl/zh-CN_ALL/security/bulletin/2015-11-01.jd
diff --git a/src-intl/zh-CN/security/bulletin/2016-02-01.jd b/src-intl/zh-CN_ALL/security/bulletin/2016-02-01.jd
similarity index 100%
rename from src-intl/zh-CN/security/bulletin/2016-02-01.jd
rename to src-intl/zh-CN_ALL/security/bulletin/2016-02-01.jd
diff --git a/src-intl/zh-CN/security/bulletin/index.jd b/src-intl/zh-CN_ALL/security/bulletin/index.jd
similarity index 100%
rename from src-intl/zh-CN/security/bulletin/index.jd
rename to src-intl/zh-CN_ALL/security/bulletin/index.jd
diff --git a/src-intl/zh-TW/security/bulletin/2015-08-01.jd b/src-intl/zh-TW_ALL/security/bulletin/2015-08-01.jd
similarity index 100%
rename from src-intl/zh-TW/security/bulletin/2015-08-01.jd
rename to src-intl/zh-TW_ALL/security/bulletin/2015-08-01.jd
diff --git a/src-intl/zh-TW/security/bulletin/2015-09-01.jd b/src-intl/zh-TW_ALL/security/bulletin/2015-09-01.jd
similarity index 100%
rename from src-intl/zh-TW/security/bulletin/2015-09-01.jd
rename to src-intl/zh-TW_ALL/security/bulletin/2015-09-01.jd
diff --git a/src-intl/zh-TW/security/bulletin/2015-10-01.jd b/src-intl/zh-TW_ALL/security/bulletin/2015-10-01.jd
similarity index 100%
rename from src-intl/zh-TW/security/bulletin/2015-10-01.jd
rename to src-intl/zh-TW_ALL/security/bulletin/2015-10-01.jd
diff --git a/src-intl/zh-TW/security/bulletin/2015-11-01.jd b/src-intl/zh-TW_ALL/security/bulletin/2015-11-01.jd
similarity index 100%
rename from src-intl/zh-TW/security/bulletin/2015-11-01.jd
rename to src-intl/zh-TW_ALL/security/bulletin/2015-11-01.jd
diff --git a/src-intl/zh-TW/security/bulletin/2016-01-01.jd b/src-intl/zh-TW_ALL/security/bulletin/2016-01-01.jd
similarity index 100%
rename from src-intl/zh-TW/security/bulletin/2016-01-01.jd
rename to src-intl/zh-TW_ALL/security/bulletin/2016-01-01.jd
diff --git a/src-intl/zh-TW/security/bulletin/2016-02-01.jd b/src-intl/zh-TW_ALL/security/bulletin/2016-02-01.jd
similarity index 100%
rename from src-intl/zh-TW/security/bulletin/2016-02-01.jd
rename to src-intl/zh-TW_ALL/security/bulletin/2016-02-01.jd
diff --git a/src-intl/zh-TW/security/bulletin/index.jd b/src-intl/zh-TW_ALL/security/bulletin/index.jd
similarity index 100%
rename from src-intl/zh-TW/security/bulletin/index.jd
rename to src-intl/zh-TW_ALL/security/bulletin/index.jd
diff --git a/src-intl/zh-TW/security/security_toc.cs b/src-intl/zh-TW_ALL/security/security_toc.cs
similarity index 100%
rename from src-intl/zh-TW/security/security_toc.cs
rename to src-intl/zh-TW_ALL/security/security_toc.cs
diff --git a/src/security/bulletin/index.jd b/src/security/bulletin/index.jd
index 854b0d1..a77472a 100644
--- a/src/security/bulletin/index.jd
+++ b/src/security/bulletin/index.jd
@@ -36,11 +36,11 @@
  <tr>
     <td><a href="2016-02-01.html">February 2016</a></td>
     <td>
-      <a href="{@docRoot}intl/ja/security/bulletin/2016-02-01.html">日本語</a>&nbsp;/
-      <a href="{@docRoot}intl/ko/security/bulletin/2016-02-01.html">한국어</a>&nbsp;/
-      <a href="{@docRoot}intl/ru/security/bulletin/2016-02-01.html">ru</a>&nbsp;/
-      <a href="{@docRoot}intl/zh-CN/security/bulletin/2016-02-01.html">中文&nbsp;(中国)</a>&nbsp;/
-      <a href="{@docRoot}intl/zh-TW/security/bulletin/2016-02-01.html">中文&nbsp;(台灣)</a>
+      <a href="{@docRoot}intl/ja_ALL/security/bulletin/2016-02-01.html">日本語</a>&nbsp;/
+      <a href="{@docRoot}intl/ko_ALL/security/bulletin/2016-02-01.html">한국어</a>&nbsp;/
+      <a href="{@docRoot}intl/ru_ALL/security/bulletin/2016-02-01.html">ru</a>&nbsp;/
+      <a href="{@docRoot}intl/zh-CN_ALL/security/bulletin/2016-02-01.html">中文&nbsp;(中国)</a>&nbsp;/
+      <a href="{@docRoot}intl/zh-TW_ALL/security/bulletin/2016-02-01.html">中文&nbsp;(台灣)</a>
     </td>
     <td>February 1, 2016</td>
     <td>February 1, 2016: [2016-02-01]</td>
@@ -60,11 +60,11 @@
 <tr>
     <td><a href="2015-11-01.html">November 2015</a></td>
     <td>
-      <a href="{@docRoot}intl/ja/security/bulletin/2015-11-01.html">日本語</a>&nbsp;/
-      <a href="{@docRoot}intl/ko/security/bulletin/2015-11-01.html">한국어</a>&nbsp;/
-      <a href="{@docRoot}intl/ru/security/bulletin/2015-11-01.html">ru</a>&nbsp;/
-      <a href="{@docRoot}intl/zh-CN/security/bulletin/2015-11-01.html">中文&nbsp;(中国)</a>&nbsp;/
-      <a href="{@docRoot}intl/zh-TW/security/bulletin/2015-11-01.html">中文&nbsp;(台灣)</a>
+      <a href="{@docRoot}intl/ja_ALL/security/bulletin/2015-11-01.html">日本語</a>&nbsp;/
+      <a href="{@docRoot}intl/ko_ALL/security/bulletin/2015-11-01.html">한국어</a>&nbsp;/
+      <a href="{@docRoot}intl/ru_ALL/security/bulletin/2015-11-01.html">ru</a>&nbsp;/
+      <a href="{@docRoot}intl/zh-CN_ALL/security/bulletin/2015-11-01.html">中文&nbsp;(中国)</a>&nbsp;/
+      <a href="{@docRoot}intl/zh-TW_ALL/security/bulletin/2015-11-01.html">中文&nbsp;(台灣)</a>
     </td>
     <td>November 2, 2015</td>
     <td>November 1, 2015: [2015-11-01]</td>
@@ -72,11 +72,11 @@
  <tr>
     <td><a href="2015-10-01.html">October 2015</a></td>
     <td>
-      <a href="{@docRoot}intl/ja/security/bulletin/2015-10-01.html">日本語</a>&nbsp;/
-      <a href="{@docRoot}intl/ko/security/bulletin/2015-10-01.html">한국어</a>&nbsp;/
-      <a href="{@docRoot}intl/ru/security/bulletin/2015-10-01.html">ru</a>&nbsp;/
-      <a href="{@docRoot}intl/zh-CN/security/bulletin/2015-10-01.html">中文&nbsp;(中国)</a>&nbsp;/
-      <a href="{@docRoot}intl/zh-TW/security/bulletin/2015-10-01.html">中文&nbsp;(台灣)</a>
+      <a href="{@docRoot}intl/ja_ALL/security/bulletin/2015-10-01.html">日本語</a>&nbsp;/
+      <a href="{@docRoot}intl/ko_ALL/security/bulletin/2015-10-01.html">한국어</a>&nbsp;/
+      <a href="{@docRoot}intl/ru_ALL/security/bulletin/2015-10-01.html">ru</a>&nbsp;/
+      <a href="{@docRoot}intl/zh-CN_ALL/security/bulletin/2015-10-01.html">中文&nbsp;(中国)</a>&nbsp;/
+      <a href="{@docRoot}intl/zh-TW_ALL/security/bulletin/2015-10-01.html">中文&nbsp;(台灣)</a>
     </td>
     <td>October 5, 2015</td>
     <td>October 1, 2015: [2015-10-01]</td>
@@ -84,11 +84,11 @@
  <tr>
     <td><a href="2015-09-01.html">September 2015</a></td>
     <td>
-      <a href="{@docRoot}intl/ja/security/bulletin/2015-09-01.html">日本語</a>&nbsp;/
-      <a href="{@docRoot}intl/ko/security/bulletin/2015-09-01.html">한국어</a>&nbsp;/
-      <a href="{@docRoot}intl/ru/security/bulletin/2015-09-01.html">ru</a>&nbsp;/
-      <a href="{@docRoot}intl/zh-CN/security/bulletin/2015-09-01.html">中文&nbsp;(中国)</a>&nbsp;/
-      <a href="{@docRoot}intl/zh-TW/security/bulletin/2015-09-01.html">中文&nbsp;(台灣)</a>
+      <a href="{@docRoot}intl/ja_ALL/security/bulletin/2015-09-01.html">日本語</a>&nbsp;/
+      <a href="{@docRoot}intl/ko_ALL/security/bulletin/2015-09-01.html">한국어</a>&nbsp;/
+      <a href="{@docRoot}intl/ru_ALL/security/bulletin/2015-09-01.html">ru</a>&nbsp;/
+      <a href="{@docRoot}intl/zh-CN_ALL/security/bulletin/2015-09-01.html">中文&nbsp;(中国)</a>&nbsp;/
+      <a href="{@docRoot}intl/zh-TW_ALL/security/bulletin/2015-09-01.html">中文&nbsp;(台灣)</a>
     </td>
     <td>September 9, 2015</td>
     <td>N/A</td>
@@ -96,11 +96,11 @@
  <tr>
     <td><a href="2015-08-01.html">August 2015</a></td>
     <td>
-      <a href="{@docRoot}intl/ja/security/bulletin/2015-08-01.html">日本語</a>&nbsp;/
-      <a href="{@docRoot}intl/ko/security/bulletin/2015-08-01.html">한국어</a>&nbsp;/
-      <a href="{@docRoot}intl/ru/security/bulletin/2015-08-01.html">ru</a>&nbsp;/
-      <a href="{@docRoot}intl/zh-CN/security/bulletin/2015-08-01.html">中文&nbsp;(中国)</a>&nbsp;/
-      <a href="{@docRoot}intl/zh-TW/security/bulletin/2015-08-01.html">中文&nbsp;(台灣)</a>
+      <a href="{@docRoot}intl/ja_ALL/security/bulletin/2015-08-01.html">日本語</a>&nbsp;/
+      <a href="{@docRoot}intl/ko_ALL/security/bulletin/2015-08-01.html">한국어</a>&nbsp;/
+      <a href="{@docRoot}intl/ru_ALL/security/bulletin/2015-08-01.html">ru</a>&nbsp;/
+      <a href="{@docRoot}intl/zh-CN_ALL/security/bulletin/2015-08-01.html">中文&nbsp;(中国)</a>&nbsp;/
+      <a href="{@docRoot}intl/zh-TW_ALL/security/bulletin/2015-08-01.html">中文&nbsp;(台灣)</a>
     </td>
     <td>August 13, 2015</td>
     <td>N/A</td>