diff --git a/core/src/main/java/hudson/security/AuthorizationStrategy.java b/core/src/main/java/hudson/security/AuthorizationStrategy.java
index da7d7348fd..22d21d72fc 100644
--- a/core/src/main/java/hudson/security/AuthorizationStrategy.java
+++ b/core/src/main/java/hudson/security/AuthorizationStrategy.java
@@ -39,7 +39,6 @@ import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
 
 import org.acegisecurity.Authentication;
-import org.acegisecurity.acls.sid.Sid;
 import org.kohsuke.stapler.StaplerRequest;
 
 /**
@@ -242,11 +241,6 @@ public abstract class AuthorizationStrategy extends AbstractDescribableImpl<Auth
             public @Nonnull AuthorizationStrategy newInstance(StaplerRequest req, JSONObject formData) throws FormException {
                 return UNSECURED;
             }
-
-            @Override
-            public String getHelpFile() {
-                return "/help/security/no-authorization.html";
-            }
         }
     }
 }
diff --git a/core/src/main/java/hudson/security/FullControlOnceLoggedInAuthorizationStrategy.java b/core/src/main/java/hudson/security/FullControlOnceLoggedInAuthorizationStrategy.java
index 59e163505a..c9808c4371 100644
--- a/core/src/main/java/hudson/security/FullControlOnceLoggedInAuthorizationStrategy.java
+++ b/core/src/main/java/hudson/security/FullControlOnceLoggedInAuthorizationStrategy.java
@@ -68,10 +68,5 @@ public class FullControlOnceLoggedInAuthorizationStrategy extends AuthorizationS
         public AuthorizationStrategy newInstance(StaplerRequest req, JSONObject formData) throws FormException {
             return new FullControlOnceLoggedInAuthorizationStrategy();
         }
-
-        @Override
-        public String getHelpFile() {
-            return "/help/security/full-control-once-logged-in.html";
-        }
     };
 }
diff --git a/core/src/main/java/hudson/security/LegacyAuthorizationStrategy.java b/core/src/main/java/hudson/security/LegacyAuthorizationStrategy.java
index 16c75d15ae..f9a50993f1 100644
--- a/core/src/main/java/hudson/security/LegacyAuthorizationStrategy.java
+++ b/core/src/main/java/hudson/security/LegacyAuthorizationStrategy.java
@@ -57,10 +57,6 @@ public final class LegacyAuthorizationStrategy extends AuthorizationStrategy {
             return Messages.LegacyAuthorizationStrategy_DisplayName();
         }
 
-        public String getHelpFile() {
-            return "/help/security/legacy-auth-strategy.html";
-        }
-
         public LegacyAuthorizationStrategy newInstance(StaplerRequest req, JSONObject formData) throws FormException {
             return new LegacyAuthorizationStrategy();
         }
diff --git a/core/src/main/java/hudson/security/LegacySecurityRealm.java b/core/src/main/java/hudson/security/LegacySecurityRealm.java
index f96104625e..1ce175185e 100644
--- a/core/src/main/java/hudson/security/LegacySecurityRealm.java
+++ b/core/src/main/java/hudson/security/LegacySecurityRealm.java
@@ -97,9 +97,5 @@ public final class LegacySecurityRealm extends SecurityRealm implements Authenti
         public String getDisplayName() {
             return Messages.LegacySecurityRealm_Displayname();
         }
-
-        public String getHelpFile() {
-            return "/help/security/container-realm.html";
-        }
     };
 }
diff --git a/war/src/main/webapp/help/security/no-authorization.html b/core/src/main/resources/hudson/security/AuthorizationStrategy/Unsecured/help.html
similarity index 100%
rename from war/src/main/webapp/help/security/no-authorization.html
rename to core/src/main/resources/hudson/security/AuthorizationStrategy/Unsecured/help.html
diff --git a/war/src/main/webapp/help/security/no-authorization_de.html b/core/src/main/resources/hudson/security/AuthorizationStrategy/Unsecured/help_de.html
similarity index 100%
rename from war/src/main/webapp/help/security/no-authorization_de.html
rename to core/src/main/resources/hudson/security/AuthorizationStrategy/Unsecured/help_de.html
diff --git a/war/src/main/webapp/help/security/no-authorization_fr.html b/core/src/main/resources/hudson/security/AuthorizationStrategy/Unsecured/help_fr.html
similarity index 100%
rename from war/src/main/webapp/help/security/no-authorization_fr.html
rename to core/src/main/resources/hudson/security/AuthorizationStrategy/Unsecured/help_fr.html
diff --git a/war/src/main/webapp/help/security/no-authorization_ja.html b/core/src/main/resources/hudson/security/AuthorizationStrategy/Unsecured/help_ja.html
similarity index 100%
rename from war/src/main/webapp/help/security/no-authorization_ja.html
rename to core/src/main/resources/hudson/security/AuthorizationStrategy/Unsecured/help_ja.html
diff --git a/war/src/main/webapp/help/security/no-authorization_pt_BR.html b/core/src/main/resources/hudson/security/AuthorizationStrategy/Unsecured/help_pt_BR.html
similarity index 100%
rename from war/src/main/webapp/help/security/no-authorization_pt_BR.html
rename to core/src/main/resources/hudson/security/AuthorizationStrategy/Unsecured/help_pt_BR.html
diff --git a/war/src/main/webapp/help/security/no-authorization_ru.html b/core/src/main/resources/hudson/security/AuthorizationStrategy/Unsecured/help_ru.html
similarity index 100%
rename from war/src/main/webapp/help/security/no-authorization_ru.html
rename to core/src/main/resources/hudson/security/AuthorizationStrategy/Unsecured/help_ru.html
diff --git a/war/src/main/webapp/help/security/no-authorization_tr.html b/core/src/main/resources/hudson/security/AuthorizationStrategy/Unsecured/help_tr.html
similarity index 100%
rename from war/src/main/webapp/help/security/no-authorization_tr.html
rename to core/src/main/resources/hudson/security/AuthorizationStrategy/Unsecured/help_tr.html
diff --git a/war/src/main/webapp/help/security/no-authorization_zh_CN.html b/core/src/main/resources/hudson/security/AuthorizationStrategy/Unsecured/help_zh_CN.html
similarity index 100%
rename from war/src/main/webapp/help/security/no-authorization_zh_CN.html
rename to core/src/main/resources/hudson/security/AuthorizationStrategy/Unsecured/help_zh_CN.html
diff --git a/war/src/main/webapp/help/security/no-authorization_zh_TW.html b/core/src/main/resources/hudson/security/AuthorizationStrategy/Unsecured/help_zh_TW.html
similarity index 100%
rename from war/src/main/webapp/help/security/no-authorization_zh_TW.html
rename to core/src/main/resources/hudson/security/AuthorizationStrategy/Unsecured/help_zh_TW.html
diff --git a/war/src/main/webapp/help/security/full-control-once-logged-in.html b/core/src/main/resources/hudson/security/FullControlOnceLoggedInAuthorizationStrategy/help.html
similarity index 100%
rename from war/src/main/webapp/help/security/full-control-once-logged-in.html
rename to core/src/main/resources/hudson/security/FullControlOnceLoggedInAuthorizationStrategy/help.html
diff --git a/war/src/main/webapp/help/security/full-control-once-logged-in_de.html b/core/src/main/resources/hudson/security/FullControlOnceLoggedInAuthorizationStrategy/help_de.html
similarity index 100%
rename from war/src/main/webapp/help/security/full-control-once-logged-in_de.html
rename to core/src/main/resources/hudson/security/FullControlOnceLoggedInAuthorizationStrategy/help_de.html
diff --git a/war/src/main/webapp/help/security/full-control-once-logged-in_fr.html b/core/src/main/resources/hudson/security/FullControlOnceLoggedInAuthorizationStrategy/help_fr.html
similarity index 100%
rename from war/src/main/webapp/help/security/full-control-once-logged-in_fr.html
rename to core/src/main/resources/hudson/security/FullControlOnceLoggedInAuthorizationStrategy/help_fr.html
diff --git a/war/src/main/webapp/help/security/full-control-once-logged-in_ja.html b/core/src/main/resources/hudson/security/FullControlOnceLoggedInAuthorizationStrategy/help_ja.html
similarity index 100%
rename from war/src/main/webapp/help/security/full-control-once-logged-in_ja.html
rename to core/src/main/resources/hudson/security/FullControlOnceLoggedInAuthorizationStrategy/help_ja.html
diff --git a/war/src/main/webapp/help/security/full-control-once-logged-in_pt_BR.html b/core/src/main/resources/hudson/security/FullControlOnceLoggedInAuthorizationStrategy/help_pt_BR.html
similarity index 100%
rename from war/src/main/webapp/help/security/full-control-once-logged-in_pt_BR.html
rename to core/src/main/resources/hudson/security/FullControlOnceLoggedInAuthorizationStrategy/help_pt_BR.html
diff --git a/war/src/main/webapp/help/security/full-control-once-logged-in_ru.html b/core/src/main/resources/hudson/security/FullControlOnceLoggedInAuthorizationStrategy/help_ru.html
similarity index 100%
rename from war/src/main/webapp/help/security/full-control-once-logged-in_ru.html
rename to core/src/main/resources/hudson/security/FullControlOnceLoggedInAuthorizationStrategy/help_ru.html
diff --git a/war/src/main/webapp/help/security/full-control-once-logged-in_tr.html b/core/src/main/resources/hudson/security/FullControlOnceLoggedInAuthorizationStrategy/help_tr.html
similarity index 100%
rename from war/src/main/webapp/help/security/full-control-once-logged-in_tr.html
rename to core/src/main/resources/hudson/security/FullControlOnceLoggedInAuthorizationStrategy/help_tr.html
diff --git a/war/src/main/webapp/help/security/full-control-once-logged-in_zh_CN.html b/core/src/main/resources/hudson/security/FullControlOnceLoggedInAuthorizationStrategy/help_zh_CN.html
similarity index 100%
rename from war/src/main/webapp/help/security/full-control-once-logged-in_zh_CN.html
rename to core/src/main/resources/hudson/security/FullControlOnceLoggedInAuthorizationStrategy/help_zh_CN.html
diff --git a/war/src/main/webapp/help/security/full-control-once-logged-in_zh_TW.html b/core/src/main/resources/hudson/security/FullControlOnceLoggedInAuthorizationStrategy/help_zh_TW.html
similarity index 100%
rename from war/src/main/webapp/help/security/full-control-once-logged-in_zh_TW.html
rename to core/src/main/resources/hudson/security/FullControlOnceLoggedInAuthorizationStrategy/help_zh_TW.html
diff --git a/war/src/main/webapp/help/security/legacy-auth-strategy.html b/core/src/main/resources/hudson/security/LegacyAuthorizationStrategy/help.html
similarity index 100%
rename from war/src/main/webapp/help/security/legacy-auth-strategy.html
rename to core/src/main/resources/hudson/security/LegacyAuthorizationStrategy/help.html
diff --git a/war/src/main/webapp/help/security/legacy-auth-strategy_de.html b/core/src/main/resources/hudson/security/LegacyAuthorizationStrategy/help_de.html
similarity index 100%
rename from war/src/main/webapp/help/security/legacy-auth-strategy_de.html
rename to core/src/main/resources/hudson/security/LegacyAuthorizationStrategy/help_de.html
diff --git a/war/src/main/webapp/help/security/legacy-auth-strategy_fr.html b/core/src/main/resources/hudson/security/LegacyAuthorizationStrategy/help_fr.html
similarity index 100%
rename from war/src/main/webapp/help/security/legacy-auth-strategy_fr.html
rename to core/src/main/resources/hudson/security/LegacyAuthorizationStrategy/help_fr.html
diff --git a/war/src/main/webapp/help/security/legacy-auth-strategy_ja.html b/core/src/main/resources/hudson/security/LegacyAuthorizationStrategy/help_ja.html
similarity index 100%
rename from war/src/main/webapp/help/security/legacy-auth-strategy_ja.html
rename to core/src/main/resources/hudson/security/LegacyAuthorizationStrategy/help_ja.html
diff --git a/war/src/main/webapp/help/security/legacy-auth-strategy_pt_BR.html b/core/src/main/resources/hudson/security/LegacyAuthorizationStrategy/help_pt_BR.html
similarity index 100%
rename from war/src/main/webapp/help/security/legacy-auth-strategy_pt_BR.html
rename to core/src/main/resources/hudson/security/LegacyAuthorizationStrategy/help_pt_BR.html
diff --git a/war/src/main/webapp/help/security/legacy-auth-strategy_ru.html b/core/src/main/resources/hudson/security/LegacyAuthorizationStrategy/help_ru.html
similarity index 100%
rename from war/src/main/webapp/help/security/legacy-auth-strategy_ru.html
rename to core/src/main/resources/hudson/security/LegacyAuthorizationStrategy/help_ru.html
diff --git a/war/src/main/webapp/help/security/legacy-auth-strategy_tr.html b/core/src/main/resources/hudson/security/LegacyAuthorizationStrategy/help_tr.html
similarity index 100%
rename from war/src/main/webapp/help/security/legacy-auth-strategy_tr.html
rename to core/src/main/resources/hudson/security/LegacyAuthorizationStrategy/help_tr.html
diff --git a/war/src/main/webapp/help/security/legacy-auth-strategy_zh_CN.html b/core/src/main/resources/hudson/security/LegacyAuthorizationStrategy/help_zh_CN.html
similarity index 100%
rename from war/src/main/webapp/help/security/legacy-auth-strategy_zh_CN.html
rename to core/src/main/resources/hudson/security/LegacyAuthorizationStrategy/help_zh_CN.html
diff --git a/war/src/main/webapp/help/security/legacy-auth-strategy_zh_TW.html b/core/src/main/resources/hudson/security/LegacyAuthorizationStrategy/help_zh_TW.html
similarity index 100%
rename from war/src/main/webapp/help/security/legacy-auth-strategy_zh_TW.html
rename to core/src/main/resources/hudson/security/LegacyAuthorizationStrategy/help_zh_TW.html
diff --git a/war/src/main/webapp/help/security/container-realm.html b/core/src/main/resources/hudson/security/LegacySecurityRealm/help.html
similarity index 100%
rename from war/src/main/webapp/help/security/container-realm.html
rename to core/src/main/resources/hudson/security/LegacySecurityRealm/help.html
diff --git a/war/src/main/webapp/help/security/container-realm_de.html b/core/src/main/resources/hudson/security/LegacySecurityRealm/help_de.html
similarity index 100%
rename from war/src/main/webapp/help/security/container-realm_de.html
rename to core/src/main/resources/hudson/security/LegacySecurityRealm/help_de.html
diff --git a/war/src/main/webapp/help/security/container-realm_fr.html b/core/src/main/resources/hudson/security/LegacySecurityRealm/help_fr.html
similarity index 100%
rename from war/src/main/webapp/help/security/container-realm_fr.html
rename to core/src/main/resources/hudson/security/LegacySecurityRealm/help_fr.html
diff --git a/war/src/main/webapp/help/security/container-realm_ja.html b/core/src/main/resources/hudson/security/LegacySecurityRealm/help_ja.html
similarity index 100%
rename from war/src/main/webapp/help/security/container-realm_ja.html
rename to core/src/main/resources/hudson/security/LegacySecurityRealm/help_ja.html
diff --git a/war/src/main/webapp/help/security/container-realm_pt_BR.html b/core/src/main/resources/hudson/security/LegacySecurityRealm/help_pt_BR.html
similarity index 100%
rename from war/src/main/webapp/help/security/container-realm_pt_BR.html
rename to core/src/main/resources/hudson/security/LegacySecurityRealm/help_pt_BR.html
diff --git a/war/src/main/webapp/help/security/container-realm_ru.html b/core/src/main/resources/hudson/security/LegacySecurityRealm/help_ru.html
similarity index 100%
rename from war/src/main/webapp/help/security/container-realm_ru.html
rename to core/src/main/resources/hudson/security/LegacySecurityRealm/help_ru.html
diff --git a/war/src/main/webapp/help/security/container-realm_tr.html b/core/src/main/resources/hudson/security/LegacySecurityRealm/help_tr.html
similarity index 100%
rename from war/src/main/webapp/help/security/container-realm_tr.html
rename to core/src/main/resources/hudson/security/LegacySecurityRealm/help_tr.html
diff --git a/war/src/main/webapp/help/security/container-realm_zh_CN.html b/core/src/main/resources/hudson/security/LegacySecurityRealm/help_zh_CN.html
similarity index 100%
rename from war/src/main/webapp/help/security/container-realm_zh_CN.html
rename to core/src/main/resources/hudson/security/LegacySecurityRealm/help_zh_CN.html
diff --git a/war/src/main/webapp/help/security/container-realm_zh_TW.html b/core/src/main/resources/hudson/security/LegacySecurityRealm/help_zh_TW.html
similarity index 100%
rename from war/src/main/webapp/help/security/container-realm_zh_TW.html
rename to core/src/main/resources/hudson/security/LegacySecurityRealm/help_zh_TW.html