diff --git a/changelog.html b/changelog.html
index 5f04e8d061b64da7d027c9667bcd09ae62817775..e9b4059bd093dc0bf070ee9686e7df00b8e89af4 100644
--- a/changelog.html
+++ b/changelog.html
@@ -55,6 +55,9 @@ Upcoming changes</a>
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class=rfe>
+    Allow build directories and workspace directories in $JENKINS_HOME to be placed elsewhere.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-8446">issue 8446</a>)
   <li class=rfe>
     Mac installer update: set file permissions to be more in line with Mac conventions.
     (<a href="https://github.com/jenkinsci/jenkins/pull/188">pull request 188</a>)
diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java
index ffd1fbba1821c1cbf1468c24adc624e93c8f6807..cefcac4d5a0ba0ff28bd9b55a5e55bb660ae7c2c 100644
--- a/core/src/main/java/hudson/model/Job.java
+++ b/core/src/main/java/hudson/model/Job.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License
  * 
- * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Martin Eigenbrodt, Matthew R. Harrah, Red Hat, Inc., Stephen Connolly, Tom Huybrechts
+ * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Martin Eigenbrodt, Matthew R. Harrah, Red Hat, Inc., Stephen Connolly, Tom Huybrechts, CloudBees, Inc.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,19 +23,15 @@
  */
 package hudson.model;
 
-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
-import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
-
 import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
-import hudson.EnvVars;
+import hudson.Extension;
 import hudson.ExtensionPoint;
 import hudson.PermalinkList;
-import hudson.Extension;
 import hudson.cli.declarative.CLIResolver;
 import hudson.model.Descriptor.FormException;
-import hudson.model.PermalinkProjectAction.Permalink;
-import hudson.model.Fingerprint.RangeSet;
 import hudson.model.Fingerprint.Range;
+import hudson.model.Fingerprint.RangeSet;
+import hudson.model.PermalinkProjectAction.Permalink;
 import hudson.search.QuickSilver;
 import hudson.search.SearchIndex;
 import hudson.search.SearchIndexBuilder;
@@ -49,40 +45,18 @@ import hudson.util.ColorPalette;
 import hudson.util.CopyOnWriteList;
 import hudson.util.DataSetBuilder;
 import hudson.util.DescribableList;
+import hudson.util.Graph;
 import hudson.util.IOException2;
 import hudson.util.RunList;
 import hudson.util.ShiftedCategoryAxis;
 import hudson.util.StackedAreaRenderer2;
 import hudson.util.TextFile;
-import hudson.util.Graph;
 import hudson.widgets.HistoryWidget;
-import hudson.widgets.Widget;
 import hudson.widgets.HistoryWidget.Adapter;
-
-import java.awt.Color;
-import java.awt.Paint;
-import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.PrintWriter;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.LinkedList;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.servlet.ServletException;
-
+import hudson.widgets.Widget;
 import jenkins.model.Jenkins;
-import net.sf.json.JSONObject;
 import net.sf.json.JSONException;
-
+import net.sf.json.JSONObject;
 import org.jfree.chart.ChartFactory;
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.axis.CategoryAxis;
@@ -94,12 +68,29 @@ import org.jfree.chart.renderer.category.StackedAreaRenderer;
 import org.jfree.data.category.CategoryDataset;
 import org.jfree.ui.RectangleInsets;
 import org.jvnet.localizer.Localizable;
+import org.kohsuke.args4j.Argument;
+import org.kohsuke.args4j.CmdLineException;
 import org.kohsuke.stapler.StaplerOverridable;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 import org.kohsuke.stapler.export.Exported;
-import org.kohsuke.args4j.Argument;
-import org.kohsuke.args4j.CmdLineException;
+
+import javax.servlet.ServletException;
+import java.awt.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedMap;
+
+import static javax.servlet.http.HttpServletResponse.*;
 
 /**
  * A job is an runnable entity under the monitoring of Hudson.
@@ -639,32 +630,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
      * @see RunMap
      */
     protected File getBuildDir() {
-        // check JNDI for the home directory first
-        try {
-            InitialContext iniCtxt = new InitialContext();
-            Context env = (Context) iniCtxt.lookup("java:comp/env");
-            String value = (String) env.lookup("JENKINS_BUILDS");
-            if(value!=null && value.trim().length()>0)
-                return new File(value.trim());
-            // look at one more place. See issue #1314 
-            value = (String) iniCtxt.lookup("JENKINS_BUILDS");
-            if(value!=null && value.trim().length()>0)
-                return new File(value.trim() + "/" + getSearchName());
-        } catch (NamingException e) {
-            // ignore
-        }
-
-        // finally check the system property
-        String sysProp = System.getProperty("JENKINS_BUILDS");
-        if(sysProp!=null)
-            return new File(sysProp.trim() + "/" + getSearchName());
-
-        // look at the env var next
-        String env = EnvVars.masterEnvVars.get("JENKINS_BUILDS");
-        if(env!=null)
-            return new File(env.trim() + "/" + getSearchName()).getAbsoluteFile();
-
-        return new File(getRootDir(), "builds");
+        return Jenkins.getInstance().getBuildDirFor(this);
     }
 
     /**
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index b447945bdd41dada3ea1b952ea4390610a3386d1..f1612353ad78a76b8048ec24cbe578ec89206f3d 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -26,11 +26,11 @@
 package jenkins.model;
 
 import antlr.ANTLRException;
+import com.google.common.collect.ImmutableMap;
 import com.thoughtworks.xstream.XStream;
 import hudson.BulkChange;
 import hudson.DNSMultiCast;
 import hudson.DescriptorExtensionList;
-import hudson.EnvVars;
 import hudson.Extension;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
@@ -176,9 +176,6 @@ import org.kohsuke.stapler.jelly.JellyRequestDispatcher;
 import org.xml.sax.InputSource;
 
 import javax.crypto.SecretKey;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
@@ -310,9 +307,20 @@ public class Jenkins extends AbstractCIBase implements ModifiableItemGroup<TopLe
     private volatile SecurityRealm securityRealm = SecurityRealm.NO_AUTHENTICATION;
 
     /**
-     * Root directory for the workspaces.
+     * Root directory for the workspaces. This value will be variable-expanded against
+     * job name and JENKINS_HOME.
+     *
+     * @see #getWorkspaceFor(TopLevelItem)
+     */
+    private String workspaceDir = "${ITEM_ROOTDIR}/"+WORKSPACE_DIRNAME;
+
+    /**
+     * Root directory for the workspaces. This value will be variable-expanded against
+     * job name and JENKINS_HOME.
+     *
+     * @see #getBuildDirFor(Job)
      */
-    private String configuredWorkspaceRoot = null;
+    private String buildsDir = "${ITEM_ROOTDIR}/builds";
 
     /**
      * Message displayed in the top page.
@@ -1696,52 +1704,27 @@ public class Jenkins extends AbstractCIBase implements ModifiableItemGroup<TopLe
         return root;
     }
 
-    private String getConfiguredWorkspaceRoot() {
-        if (configuredWorkspaceRoot == null) {
-            try {
-                InitialContext iniCtxt = new InitialContext();
-                Context env = (Context) iniCtxt.lookup("java:comp/env");
-                String value = (String) env.lookup("JENKINS_WORKSPACES");
-                if(value!=null && value.trim().length()>0) {
-                    configuredWorkspaceRoot = value.trim();
-                    return configuredWorkspaceRoot;
-                }
-                // look at one more place. See issue #1314 
-                value = (String) iniCtxt.lookup("JENKINS_WORKSPACES");
-                if(value!=null && value.trim().length()>0) {
-                    configuredWorkspaceRoot = value.trim();
-                    return configuredWorkspaceRoot;
-                }
-            } catch (NamingException e) {
-                // ignore
-            }
+    public FilePath getWorkspaceFor(TopLevelItem item) {
+        return new FilePath(expandVariablesForDirectory(workspaceDir, item));
+    }
 
-            // finally check the system property
-            String sysProp = System.getProperty("JENKINS_WORKSPACES");
-            if(sysProp!=null) {
-                configuredWorkspaceRoot = sysProp.trim();
-                return configuredWorkspaceRoot;
-            }
-            
-            // look at the env var next
-            String env = EnvVars.masterEnvVars.get("JENKINS_WORKSPACES");
-            if(env!=null) {
-                configuredWorkspaceRoot = env.trim();
-                return configuredWorkspaceRoot;
-            }
-            
-            //not set
-            configuredWorkspaceRoot = "";
-        }
-        return configuredWorkspaceRoot;
+    public File getBuildDirFor(Job job) {
+        return expandVariablesForDirectory(buildsDir, job);
     }
 
-    public FilePath getWorkspaceFor(TopLevelItem item) {
-        if(getConfiguredWorkspaceRoot().equals("")) {
-            return new FilePath(new File(item.getRootDir(), WORKSPACE_DIRNAME));
-        } else {
-            return new FilePath(new File(getConfiguredWorkspaceRoot() + "/" + item.getName(), WORKSPACE_DIRNAME));
-        }
+    private File expandVariablesForDirectory(String base, Item item) {
+        return new File(Util.replaceMacro(base, ImmutableMap.of(
+                "JENKINS_HOME", getRootDir().getPath(),
+                "ITEM_ROOTDIR", item.getRootDir().getPath(),
+                "ITEM_FULLNAME", item.getFullName())));
+    }
+    
+    public String getRawWorkspaceDir() {
+        return workspaceDir;
+    }
+
+    public String getRawBuildsDir() {
+        return buildsDir;
     }
 
     public FilePath getRootPath() {
@@ -2379,6 +2362,9 @@ public class Jenkins extends AbstractCIBase implements ModifiableItemGroup<TopLe
 
             JSONObject json = req.getSubmittedForm();
 
+            workspaceDir = json.getString("rawWorkspaceDir");
+            buildsDir = json.getString("rawBuildsDir");
+
             // keep using 'useSecurity' field as the main configuration setting
             // until we get the new security implementation working
             // useSecurity = null;
diff --git a/core/src/main/resources/hudson/model/Hudson/_api.jelly b/core/src/main/resources/jenkins/model/Jenkins/_api.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_api.jelly
rename to core/src/main/resources/jenkins/model/Jenkins/_api.jelly
diff --git a/core/src/main/resources/hudson/model/Hudson/_cli.jelly b/core/src/main/resources/jenkins/model/Jenkins/_cli.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_cli.jelly
rename to core/src/main/resources/jenkins/model/Jenkins/_cli.jelly
diff --git a/core/src/main/resources/hudson/model/Hudson/_cli.properties b/core/src/main/resources/jenkins/model/Jenkins/_cli.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_cli.properties
rename to core/src/main/resources/jenkins/model/Jenkins/_cli.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/_cli_da.properties b/core/src/main/resources/jenkins/model/Jenkins/_cli_da.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_cli_da.properties
rename to core/src/main/resources/jenkins/model/Jenkins/_cli_da.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/_cli_de.properties b/core/src/main/resources/jenkins/model/Jenkins/_cli_de.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_cli_de.properties
rename to core/src/main/resources/jenkins/model/Jenkins/_cli_de.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/_cli_es.properties b/core/src/main/resources/jenkins/model/Jenkins/_cli_es.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_cli_es.properties
rename to core/src/main/resources/jenkins/model/Jenkins/_cli_es.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/_cli_fr.properties b/core/src/main/resources/jenkins/model/Jenkins/_cli_fr.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_cli_fr.properties
rename to core/src/main/resources/jenkins/model/Jenkins/_cli_fr.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/_cli_ja.properties b/core/src/main/resources/jenkins/model/Jenkins/_cli_ja.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_cli_ja.properties
rename to core/src/main/resources/jenkins/model/Jenkins/_cli_ja.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/_cli_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/_cli_pt_BR.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_cli_pt_BR.properties
rename to core/src/main/resources/jenkins/model/Jenkins/_cli_pt_BR.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/_cli_zh_CN.properties b/core/src/main/resources/jenkins/model/Jenkins/_cli_zh_CN.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_cli_zh_CN.properties
rename to core/src/main/resources/jenkins/model/Jenkins/_cli_zh_CN.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/_cli_zh_TW.properties b/core/src/main/resources/jenkins/model/Jenkins/_cli_zh_TW.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_cli_zh_TW.properties
rename to core/src/main/resources/jenkins/model/Jenkins/_cli_zh_TW.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/_restart.jelly b/core/src/main/resources/jenkins/model/Jenkins/_restart.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_restart.jelly
rename to core/src/main/resources/jenkins/model/Jenkins/_restart.jelly
diff --git a/core/src/main/resources/hudson/model/Hudson/_restart_da.properties b/core/src/main/resources/jenkins/model/Jenkins/_restart_da.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_restart_da.properties
rename to core/src/main/resources/jenkins/model/Jenkins/_restart_da.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/_restart_de.properties b/core/src/main/resources/jenkins/model/Jenkins/_restart_de.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_restart_de.properties
rename to core/src/main/resources/jenkins/model/Jenkins/_restart_de.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/_restart_es.properties b/core/src/main/resources/jenkins/model/Jenkins/_restart_es.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_restart_es.properties
rename to core/src/main/resources/jenkins/model/Jenkins/_restart_es.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/_restart_fr.properties b/core/src/main/resources/jenkins/model/Jenkins/_restart_fr.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_restart_fr.properties
rename to core/src/main/resources/jenkins/model/Jenkins/_restart_fr.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/_restart_ja.properties b/core/src/main/resources/jenkins/model/Jenkins/_restart_ja.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_restart_ja.properties
rename to core/src/main/resources/jenkins/model/Jenkins/_restart_ja.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/_restart_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/_restart_pt_BR.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_restart_pt_BR.properties
rename to core/src/main/resources/jenkins/model/Jenkins/_restart_pt_BR.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/_safeRestart.jelly b/core/src/main/resources/jenkins/model/Jenkins/_safeRestart.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_safeRestart.jelly
rename to core/src/main/resources/jenkins/model/Jenkins/_safeRestart.jelly
diff --git a/core/src/main/resources/hudson/model/Hudson/_safeRestart_da.properties b/core/src/main/resources/jenkins/model/Jenkins/_safeRestart_da.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_safeRestart_da.properties
rename to core/src/main/resources/jenkins/model/Jenkins/_safeRestart_da.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/_safeRestart_de.properties b/core/src/main/resources/jenkins/model/Jenkins/_safeRestart_de.properties
similarity index 93%
rename from core/src/main/resources/hudson/model/Hudson/_safeRestart_de.properties
rename to core/src/main/resources/jenkins/model/Jenkins/_safeRestart_de.properties
index e13ff92001ca1dbfab4a721337317520fdd474f4..332918610e0ddaa89dce57306d57c0f3c37c14fb 100644
--- a/core/src/main/resources/hudson/model/Hudson/_safeRestart_de.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/_safeRestart_de.properties
@@ -1,26 +1,26 @@
-#  The MIT License
-# 
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Seiji Sogabe, Simon Wiest
-# 
-#  Permission is hereby granted, free of charge, to any person obtaining a copy
-#  of this software and associated documentation files (the "Software"), to deal
-#  in the Software without restriction, including without limitation the rights
-#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-#  copies of the Software, and to permit persons to whom the Software is
-#  furnished to do so, subject to the following conditions:
-# 
-#  The above copyright notice and this permission notice shall be included in
-#  all copies or substantial portions of the Software.
-# 
-#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-#  THE SOFTWARE.
-
-Are\ you\ sure\ about\ restarting\ Jenkins?\ Jenkins\ will\ restart\ once\ all\ running\ jobs\ are\ finished.=\
-  Möchten Sie Jenkins wirklich neu starten? Jenkins wird neu starten, \
-  sobald alle laufenden Jobs abgeschlossen wurden.
-Yes=Ja
+#  The MIT License
+# 
+# Copyright (c) 2004-2009, Sun Microsystems, Inc., Seiji Sogabe, Simon Wiest
+# 
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+# 
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+# 
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+
+Are\ you\ sure\ about\ restarting\ Jenkins?\ Jenkins\ will\ restart\ once\ all\ running\ jobs\ are\ finished.=\
+  M�chten Sie Jenkins wirklich neu starten? Jenkins wird neu starten, \
+  sobald alle laufenden Jobs abgeschlossen wurden.
+Yes=Ja
diff --git a/core/src/main/resources/hudson/model/Hudson/_safeRestart_es.properties b/core/src/main/resources/jenkins/model/Jenkins/_safeRestart_es.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_safeRestart_es.properties
rename to core/src/main/resources/jenkins/model/Jenkins/_safeRestart_es.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/_safeRestart_fr.properties b/core/src/main/resources/jenkins/model/Jenkins/_safeRestart_fr.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_safeRestart_fr.properties
rename to core/src/main/resources/jenkins/model/Jenkins/_safeRestart_fr.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/_safeRestart_ja.properties b/core/src/main/resources/jenkins/model/Jenkins/_safeRestart_ja.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_safeRestart_ja.properties
rename to core/src/main/resources/jenkins/model/Jenkins/_safeRestart_ja.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/_safeRestart_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/_safeRestart_pt_BR.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_safeRestart_pt_BR.properties
rename to core/src/main/resources/jenkins/model/Jenkins/_safeRestart_pt_BR.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/_script.jelly b/core/src/main/resources/jenkins/model/Jenkins/_script.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_script.jelly
rename to core/src/main/resources/jenkins/model/Jenkins/_script.jelly
diff --git a/core/src/main/resources/hudson/model/Hudson/_scriptText.jelly b/core/src/main/resources/jenkins/model/Jenkins/_scriptText.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/_scriptText.jelly
rename to core/src/main/resources/jenkins/model/Jenkins/_scriptText.jelly
diff --git a/core/src/main/resources/hudson/model/Hudson/accessDenied.jelly b/core/src/main/resources/jenkins/model/Jenkins/accessDenied.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/accessDenied.jelly
rename to core/src/main/resources/jenkins/model/Jenkins/accessDenied.jelly
diff --git a/core/src/main/resources/hudson/model/Hudson/accessDenied_da.properties b/core/src/main/resources/jenkins/model/Jenkins/accessDenied_da.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/accessDenied_da.properties
rename to core/src/main/resources/jenkins/model/Jenkins/accessDenied_da.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/accessDenied_de.properties b/core/src/main/resources/jenkins/model/Jenkins/accessDenied_de.properties
similarity index 97%
rename from core/src/main/resources/hudson/model/Hudson/accessDenied_de.properties
rename to core/src/main/resources/jenkins/model/Jenkins/accessDenied_de.properties
index 1a9eabd7e7536f1a04e79a29ae9a88ab6eac8619..8a7b31af2b985153d39f76af8449a4f58d1bf307 100644
--- a/core/src/main/resources/hudson/model/Hudson/accessDenied_de.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/accessDenied_de.properties
@@ -1,27 +1,27 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, Simon Wiest
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Jenkins\ Login=Jenkins Anmeldung
-Access\ Denied=Zugriff verweigert
-User=Benutzer
-Password=Kennwort
-login=Anmelden
+# The MIT License
+#
+# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, Simon Wiest
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Jenkins\ Login=Jenkins Anmeldung
+Access\ Denied=Zugriff verweigert
+User=Benutzer
+Password=Kennwort
+login=Anmelden
diff --git a/core/src/main/resources/hudson/model/Hudson/accessDenied_es.properties b/core/src/main/resources/jenkins/model/Jenkins/accessDenied_es.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/accessDenied_es.properties
rename to core/src/main/resources/jenkins/model/Jenkins/accessDenied_es.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/accessDenied_ja.properties b/core/src/main/resources/jenkins/model/Jenkins/accessDenied_ja.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/accessDenied_ja.properties
rename to core/src/main/resources/jenkins/model/Jenkins/accessDenied_ja.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/accessDenied_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/accessDenied_pt_BR.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/accessDenied_pt_BR.properties
rename to core/src/main/resources/jenkins/model/Jenkins/accessDenied_pt_BR.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/configure.jelly b/core/src/main/resources/jenkins/model/Jenkins/configure.jelly
similarity index 97%
rename from core/src/main/resources/hudson/model/Hudson/configure.jelly
rename to core/src/main/resources/jenkins/model/Jenkins/configure.jelly
index 67ecd850ac8937a17bd2eb727de420af7b9fa146..20706a4a85915a2a2ec0656212e463e6617b9eb8 100644
--- a/core/src/main/resources/hudson/model/Hudson/configure.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/configure.jelly
@@ -38,6 +38,14 @@ THE SOFTWARE.
       <f:entry title="${%Home directory}" help="/help/system-config/homeDirectory.html">
         ${it.rootDir}
       </f:entry>
+      <f:advanced>
+        <f:entry field="rawWorkspaceDir" title="${%Workspace Root Directory}">
+          <f:textbox/>
+        </f:entry>
+        <f:entry field="rawBuildsDir" title="${%Build Record Root Directory}">
+          <f:textbox/>
+        </f:entry>
+      </f:advanced>
       <f:entry title="${%System Message}" help="/help/system-config/systemMessage.html">
         <f:textarea name="system_message" value="${it.systemMessage}"
                     codemirror-mode="htmlmixed" codemirror-config="mode:'text/html'" />
diff --git a/core/src/main/resources/hudson/model/Hudson/configure.properties b/core/src/main/resources/jenkins/model/Jenkins/configure.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/configure.properties
rename to core/src/main/resources/jenkins/model/Jenkins/configure.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/configureExecutors.jelly b/core/src/main/resources/jenkins/model/Jenkins/configureExecutors.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/configureExecutors.jelly
rename to core/src/main/resources/jenkins/model/Jenkins/configureExecutors.jelly
diff --git a/core/src/main/resources/hudson/model/Hudson/configure_da.properties b/core/src/main/resources/jenkins/model/Jenkins/configure_da.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/configure_da.properties
rename to core/src/main/resources/jenkins/model/Jenkins/configure_da.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/configure_de.properties b/core/src/main/resources/jenkins/model/Jenkins/configure_de.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/configure_de.properties
rename to core/src/main/resources/jenkins/model/Jenkins/configure_de.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/configure_es.properties b/core/src/main/resources/jenkins/model/Jenkins/configure_es.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/configure_es.properties
rename to core/src/main/resources/jenkins/model/Jenkins/configure_es.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/configure_fi.properties b/core/src/main/resources/jenkins/model/Jenkins/configure_fi.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/configure_fi.properties
rename to core/src/main/resources/jenkins/model/Jenkins/configure_fi.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/configure_fr.properties b/core/src/main/resources/jenkins/model/Jenkins/configure_fr.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/configure_fr.properties
rename to core/src/main/resources/jenkins/model/Jenkins/configure_fr.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/configure_hu.properties b/core/src/main/resources/jenkins/model/Jenkins/configure_hu.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/configure_hu.properties
rename to core/src/main/resources/jenkins/model/Jenkins/configure_hu.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/configure_ja.properties b/core/src/main/resources/jenkins/model/Jenkins/configure_ja.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/configure_ja.properties
rename to core/src/main/resources/jenkins/model/Jenkins/configure_ja.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/configure_nl.properties b/core/src/main/resources/jenkins/model/Jenkins/configure_nl.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/configure_nl.properties
rename to core/src/main/resources/jenkins/model/Jenkins/configure_nl.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/configure_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/configure_pt_BR.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/configure_pt_BR.properties
rename to core/src/main/resources/jenkins/model/Jenkins/configure_pt_BR.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/configure_ru.properties b/core/src/main/resources/jenkins/model/Jenkins/configure_ru.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/configure_ru.properties
rename to core/src/main/resources/jenkins/model/Jenkins/configure_ru.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/configure_sv_SE.properties b/core/src/main/resources/jenkins/model/Jenkins/configure_sv_SE.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/configure_sv_SE.properties
rename to core/src/main/resources/jenkins/model/Jenkins/configure_sv_SE.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/configure_tr.properties b/core/src/main/resources/jenkins/model/Jenkins/configure_tr.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/configure_tr.properties
rename to core/src/main/resources/jenkins/model/Jenkins/configure_tr.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/configure_zh_CN.properties b/core/src/main/resources/jenkins/model/Jenkins/configure_zh_CN.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/configure_zh_CN.properties
rename to core/src/main/resources/jenkins/model/Jenkins/configure_zh_CN.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/configure_zh_TW.properties b/core/src/main/resources/jenkins/model/Jenkins/configure_zh_TW.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/configure_zh_TW.properties
rename to core/src/main/resources/jenkins/model/Jenkins/configure_zh_TW.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/downgrade.jelly b/core/src/main/resources/jenkins/model/Jenkins/downgrade.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/downgrade.jelly
rename to core/src/main/resources/jenkins/model/Jenkins/downgrade.jelly
diff --git a/core/src/main/resources/hudson/model/Hudson/downgrade.properties b/core/src/main/resources/jenkins/model/Jenkins/downgrade.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/downgrade.properties
rename to core/src/main/resources/jenkins/model/Jenkins/downgrade.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/downgrade_da.properties b/core/src/main/resources/jenkins/model/Jenkins/downgrade_da.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/downgrade_da.properties
rename to core/src/main/resources/jenkins/model/Jenkins/downgrade_da.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/downgrade_de.properties b/core/src/main/resources/jenkins/model/Jenkins/downgrade_de.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/downgrade_de.properties
rename to core/src/main/resources/jenkins/model/Jenkins/downgrade_de.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/downgrade_es.properties b/core/src/main/resources/jenkins/model/Jenkins/downgrade_es.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/downgrade_es.properties
rename to core/src/main/resources/jenkins/model/Jenkins/downgrade_es.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/downgrade_ja.properties b/core/src/main/resources/jenkins/model/Jenkins/downgrade_ja.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/downgrade_ja.properties
rename to core/src/main/resources/jenkins/model/Jenkins/downgrade_ja.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/fingerprintCheck.jelly b/core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/fingerprintCheck.jelly
rename to core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck.jelly
diff --git a/core/src/main/resources/hudson/model/Hudson/fingerprintCheck.properties b/core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/fingerprintCheck.properties
rename to core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/fingerprintCheck_da.properties b/core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck_da.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/fingerprintCheck_da.properties
rename to core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck_da.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/fingerprintCheck_de.properties b/core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck_de.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/fingerprintCheck_de.properties
rename to core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck_de.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/fingerprintCheck_es.properties b/core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck_es.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/fingerprintCheck_es.properties
rename to core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck_es.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/fingerprintCheck_fr.properties b/core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck_fr.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/fingerprintCheck_fr.properties
rename to core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck_fr.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/fingerprintCheck_hu.properties b/core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck_hu.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/fingerprintCheck_hu.properties
rename to core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck_hu.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/fingerprintCheck_it.properties b/core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck_it.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/fingerprintCheck_it.properties
rename to core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck_it.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/fingerprintCheck_ja.properties b/core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck_ja.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/fingerprintCheck_ja.properties
rename to core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck_ja.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/fingerprintCheck_nl.properties b/core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck_nl.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/fingerprintCheck_nl.properties
rename to core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck_nl.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/fingerprintCheck_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck_pt_BR.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/fingerprintCheck_pt_BR.properties
rename to core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck_pt_BR.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/fingerprintCheck_ru.properties b/core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck_ru.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/fingerprintCheck_ru.properties
rename to core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck_ru.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/fingerprintCheck_tr.properties b/core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck_tr.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/fingerprintCheck_tr.properties
rename to core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck_tr.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/help-markupFormatter.html b/core/src/main/resources/jenkins/model/Jenkins/help-markupFormatter.html
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/help-markupFormatter.html
rename to core/src/main/resources/jenkins/model/Jenkins/help-markupFormatter.html
diff --git a/core/src/main/resources/hudson/model/Hudson/help-markupFormatter_ja.html b/core/src/main/resources/jenkins/model/Jenkins/help-markupFormatter_ja.html
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/help-markupFormatter_ja.html
rename to core/src/main/resources/jenkins/model/Jenkins/help-markupFormatter_ja.html
diff --git a/core/src/main/resources/jenkins/model/Jenkins/help-rawBuildsDir.html b/core/src/main/resources/jenkins/model/Jenkins/help-rawBuildsDir.html
new file mode 100644
index 0000000000000000000000000000000000000000..1004faddfd29c0ebb5a7fc620e65227e47d003da
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/Jenkins/help-rawBuildsDir.html
@@ -0,0 +1,15 @@
+<div>
+    Specify where Jenkins would store records of the past builds.
+    This value can include the following variables.
+
+    <ul>
+        <li><tt>${JENKINS_HOME}</tt> &mdash; Jenkins home directory
+        <li><tt>${ITEM_ROOTDIR}</tt> &mdash; Root directory of a job for which the workspace is allocated.
+        <li><tt>${ITEM_FULLNAME}</tt> &mdash; '/'-separated job name, like "foo/bar".
+    </ul>
+
+    <p>
+    Changing this value allows you to put build records on a bigger but slow disk,
+    while keeping JENKINS_HOME on highly available backed up drive, for example.
+    Default value is <tt>${ITEM_ROOTDIR}/builds</tt>.
+</div>
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/model/Jenkins/help-rawWorkspaceDir.html b/core/src/main/resources/jenkins/model/Jenkins/help-rawWorkspaceDir.html
new file mode 100644
index 0000000000000000000000000000000000000000..edcda3c7c000e389e166f842de2aa10aeb1f367e
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/Jenkins/help-rawWorkspaceDir.html
@@ -0,0 +1,14 @@
+<div>
+    Specify where Jenkins would store job workspaces on the master node.
+    This value can include the following variables.
+
+    <ul>
+        <li><tt>${JENKINS_HOME}</tt> &mdash; Jenkins home directory
+        <li><tt>${ITEM_ROOTDIR}</tt> &mdash; Root directory of a job for which the workspace is allocated.
+        <li><tt>${ITEM_FULLNAME}</tt> &mdash; '/'-separated job name, like "foo/bar".
+    </ul>
+
+    <p>
+    Changing this value allows you to put workspaces on SSD, SCSI, or even ram disks.
+    Default value is <tt>${ITEM_ROOTDIR}/workspace</tt>.
+</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/Hudson/legend.jelly b/core/src/main/resources/jenkins/model/Jenkins/legend.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/legend.jelly
rename to core/src/main/resources/jenkins/model/Jenkins/legend.jelly
diff --git a/core/src/main/resources/hudson/model/Hudson/legend.properties b/core/src/main/resources/jenkins/model/Jenkins/legend.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/legend.properties
rename to core/src/main/resources/jenkins/model/Jenkins/legend.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/legend_da.properties b/core/src/main/resources/jenkins/model/Jenkins/legend_da.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/legend_da.properties
rename to core/src/main/resources/jenkins/model/Jenkins/legend_da.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/legend_de.properties b/core/src/main/resources/jenkins/model/Jenkins/legend_de.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/legend_de.properties
rename to core/src/main/resources/jenkins/model/Jenkins/legend_de.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/legend_es.properties b/core/src/main/resources/jenkins/model/Jenkins/legend_es.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/legend_es.properties
rename to core/src/main/resources/jenkins/model/Jenkins/legend_es.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/legend_fr.properties b/core/src/main/resources/jenkins/model/Jenkins/legend_fr.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/legend_fr.properties
rename to core/src/main/resources/jenkins/model/Jenkins/legend_fr.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/legend_ja.properties b/core/src/main/resources/jenkins/model/Jenkins/legend_ja.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/legend_ja.properties
rename to core/src/main/resources/jenkins/model/Jenkins/legend_ja.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/legend_ko.properties b/core/src/main/resources/jenkins/model/Jenkins/legend_ko.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/legend_ko.properties
rename to core/src/main/resources/jenkins/model/Jenkins/legend_ko.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/legend_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/legend_pt_BR.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/legend_pt_BR.properties
rename to core/src/main/resources/jenkins/model/Jenkins/legend_pt_BR.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/legend_zh_TW.properties b/core/src/main/resources/jenkins/model/Jenkins/legend_zh_TW.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/legend_zh_TW.properties
rename to core/src/main/resources/jenkins/model/Jenkins/legend_zh_TW.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/load-statistics.jelly b/core/src/main/resources/jenkins/model/Jenkins/load-statistics.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/load-statistics.jelly
rename to core/src/main/resources/jenkins/model/Jenkins/load-statistics.jelly
diff --git a/core/src/main/resources/hudson/model/Hudson/load-statistics_ja.properties b/core/src/main/resources/jenkins/model/Jenkins/load-statistics_ja.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/load-statistics_ja.properties
rename to core/src/main/resources/jenkins/model/Jenkins/load-statistics_ja.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/login.jelly b/core/src/main/resources/jenkins/model/Jenkins/login.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/login.jelly
rename to core/src/main/resources/jenkins/model/Jenkins/login.jelly
diff --git a/core/src/main/resources/hudson/model/Hudson/login.properties b/core/src/main/resources/jenkins/model/Jenkins/login.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/login.properties
rename to core/src/main/resources/jenkins/model/Jenkins/login.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/loginError.jelly b/core/src/main/resources/jenkins/model/Jenkins/loginError.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/loginError.jelly
rename to core/src/main/resources/jenkins/model/Jenkins/loginError.jelly
diff --git a/core/src/main/resources/hudson/model/Hudson/loginError_da.properties b/core/src/main/resources/jenkins/model/Jenkins/loginError_da.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/loginError_da.properties
rename to core/src/main/resources/jenkins/model/Jenkins/loginError_da.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/loginError_de.properties b/core/src/main/resources/jenkins/model/Jenkins/loginError_de.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/loginError_de.properties
rename to core/src/main/resources/jenkins/model/Jenkins/loginError_de.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/loginError_es.properties b/core/src/main/resources/jenkins/model/Jenkins/loginError_es.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/loginError_es.properties
rename to core/src/main/resources/jenkins/model/Jenkins/loginError_es.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/loginError_fr.properties b/core/src/main/resources/jenkins/model/Jenkins/loginError_fr.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/loginError_fr.properties
rename to core/src/main/resources/jenkins/model/Jenkins/loginError_fr.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/loginError_ja.properties b/core/src/main/resources/jenkins/model/Jenkins/loginError_ja.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/loginError_ja.properties
rename to core/src/main/resources/jenkins/model/Jenkins/loginError_ja.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/loginError_ko.properties b/core/src/main/resources/jenkins/model/Jenkins/loginError_ko.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/loginError_ko.properties
rename to core/src/main/resources/jenkins/model/Jenkins/loginError_ko.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/loginError_nl.properties b/core/src/main/resources/jenkins/model/Jenkins/loginError_nl.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/loginError_nl.properties
rename to core/src/main/resources/jenkins/model/Jenkins/loginError_nl.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/loginError_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/loginError_pt_BR.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/loginError_pt_BR.properties
rename to core/src/main/resources/jenkins/model/Jenkins/loginError_pt_BR.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/loginError_ru.properties b/core/src/main/resources/jenkins/model/Jenkins/loginError_ru.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/loginError_ru.properties
rename to core/src/main/resources/jenkins/model/Jenkins/loginError_ru.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/loginError_tr.properties b/core/src/main/resources/jenkins/model/Jenkins/loginError_tr.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/loginError_tr.properties
rename to core/src/main/resources/jenkins/model/Jenkins/loginError_tr.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/login_da.properties b/core/src/main/resources/jenkins/model/Jenkins/login_da.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/login_da.properties
rename to core/src/main/resources/jenkins/model/Jenkins/login_da.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/login_de.properties b/core/src/main/resources/jenkins/model/Jenkins/login_de.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/login_de.properties
rename to core/src/main/resources/jenkins/model/Jenkins/login_de.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/login_es.properties b/core/src/main/resources/jenkins/model/Jenkins/login_es.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/login_es.properties
rename to core/src/main/resources/jenkins/model/Jenkins/login_es.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/login_fr.properties b/core/src/main/resources/jenkins/model/Jenkins/login_fr.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/login_fr.properties
rename to core/src/main/resources/jenkins/model/Jenkins/login_fr.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/login_ja.properties b/core/src/main/resources/jenkins/model/Jenkins/login_ja.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/login_ja.properties
rename to core/src/main/resources/jenkins/model/Jenkins/login_ja.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/login_ko.properties b/core/src/main/resources/jenkins/model/Jenkins/login_ko.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/login_ko.properties
rename to core/src/main/resources/jenkins/model/Jenkins/login_ko.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/login_nl.properties b/core/src/main/resources/jenkins/model/Jenkins/login_nl.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/login_nl.properties
rename to core/src/main/resources/jenkins/model/Jenkins/login_nl.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/login_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/login_pt_BR.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/login_pt_BR.properties
rename to core/src/main/resources/jenkins/model/Jenkins/login_pt_BR.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/login_ru.properties b/core/src/main/resources/jenkins/model/Jenkins/login_ru.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/login_ru.properties
rename to core/src/main/resources/jenkins/model/Jenkins/login_ru.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/login_sv_SE.properties b/core/src/main/resources/jenkins/model/Jenkins/login_sv_SE.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/login_sv_SE.properties
rename to core/src/main/resources/jenkins/model/Jenkins/login_sv_SE.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/login_tr.properties b/core/src/main/resources/jenkins/model/Jenkins/login_tr.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/login_tr.properties
rename to core/src/main/resources/jenkins/model/Jenkins/login_tr.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/login_zh_TW.properties b/core/src/main/resources/jenkins/model/Jenkins/login_zh_TW.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/login_zh_TW.properties
rename to core/src/main/resources/jenkins/model/Jenkins/login_zh_TW.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/manag_.groovy b/core/src/main/resources/jenkins/model/Jenkins/manag_.groovy
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/manag_.groovy
rename to core/src/main/resources/jenkins/model/Jenkins/manag_.groovy
diff --git a/core/src/main/resources/hudson/model/Hudson/manage.jelly b/core/src/main/resources/jenkins/model/Jenkins/manage.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/manage.jelly
rename to core/src/main/resources/jenkins/model/Jenkins/manage.jelly
diff --git a/core/src/main/resources/hudson/model/Hudson/manage.properties b/core/src/main/resources/jenkins/model/Jenkins/manage.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/manage.properties
rename to core/src/main/resources/jenkins/model/Jenkins/manage.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/manage_da.properties b/core/src/main/resources/jenkins/model/Jenkins/manage_da.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/manage_da.properties
rename to core/src/main/resources/jenkins/model/Jenkins/manage_da.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/manage_de.properties b/core/src/main/resources/jenkins/model/Jenkins/manage_de.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/manage_de.properties
rename to core/src/main/resources/jenkins/model/Jenkins/manage_de.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/manage_el.properties b/core/src/main/resources/jenkins/model/Jenkins/manage_el.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/manage_el.properties
rename to core/src/main/resources/jenkins/model/Jenkins/manage_el.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/manage_es.properties b/core/src/main/resources/jenkins/model/Jenkins/manage_es.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/manage_es.properties
rename to core/src/main/resources/jenkins/model/Jenkins/manage_es.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/manage_fi.properties b/core/src/main/resources/jenkins/model/Jenkins/manage_fi.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/manage_fi.properties
rename to core/src/main/resources/jenkins/model/Jenkins/manage_fi.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/manage_fr.properties b/core/src/main/resources/jenkins/model/Jenkins/manage_fr.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/manage_fr.properties
rename to core/src/main/resources/jenkins/model/Jenkins/manage_fr.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/manage_it.properties b/core/src/main/resources/jenkins/model/Jenkins/manage_it.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/manage_it.properties
rename to core/src/main/resources/jenkins/model/Jenkins/manage_it.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/manage_ja.properties b/core/src/main/resources/jenkins/model/Jenkins/manage_ja.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/manage_ja.properties
rename to core/src/main/resources/jenkins/model/Jenkins/manage_ja.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/manage_ko.properties b/core/src/main/resources/jenkins/model/Jenkins/manage_ko.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/manage_ko.properties
rename to core/src/main/resources/jenkins/model/Jenkins/manage_ko.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/manage_nb_NO.properties b/core/src/main/resources/jenkins/model/Jenkins/manage_nb_NO.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/manage_nb_NO.properties
rename to core/src/main/resources/jenkins/model/Jenkins/manage_nb_NO.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/manage_nl.properties b/core/src/main/resources/jenkins/model/Jenkins/manage_nl.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/manage_nl.properties
rename to core/src/main/resources/jenkins/model/Jenkins/manage_nl.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/manage_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/manage_pt_BR.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/manage_pt_BR.properties
rename to core/src/main/resources/jenkins/model/Jenkins/manage_pt_BR.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/manage_ru.properties b/core/src/main/resources/jenkins/model/Jenkins/manage_ru.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/manage_ru.properties
rename to core/src/main/resources/jenkins/model/Jenkins/manage_ru.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/manage_sv_SE.properties b/core/src/main/resources/jenkins/model/Jenkins/manage_sv_SE.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/manage_sv_SE.properties
rename to core/src/main/resources/jenkins/model/Jenkins/manage_sv_SE.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/manage_tr.properties b/core/src/main/resources/jenkins/model/Jenkins/manage_tr.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/manage_tr.properties
rename to core/src/main/resources/jenkins/model/Jenkins/manage_tr.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/manage_uk.properties b/core/src/main/resources/jenkins/model/Jenkins/manage_uk.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/manage_uk.properties
rename to core/src/main/resources/jenkins/model/Jenkins/manage_uk.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/manage_zh_CN.properties b/core/src/main/resources/jenkins/model/Jenkins/manage_zh_CN.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/manage_zh_CN.properties
rename to core/src/main/resources/jenkins/model/Jenkins/manage_zh_CN.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/manage_zh_TW.properties b/core/src/main/resources/jenkins/model/Jenkins/manage_zh_TW.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/manage_zh_TW.properties
rename to core/src/main/resources/jenkins/model/Jenkins/manage_zh_TW.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/newView.jelly b/core/src/main/resources/jenkins/model/Jenkins/newView.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/newView.jelly
rename to core/src/main/resources/jenkins/model/Jenkins/newView.jelly
diff --git a/core/src/main/resources/hudson/model/Hudson/newView_da.properties b/core/src/main/resources/jenkins/model/Jenkins/newView_da.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/newView_da.properties
rename to core/src/main/resources/jenkins/model/Jenkins/newView_da.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/newView_de.properties b/core/src/main/resources/jenkins/model/Jenkins/newView_de.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/newView_de.properties
rename to core/src/main/resources/jenkins/model/Jenkins/newView_de.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/newView_es.properties b/core/src/main/resources/jenkins/model/Jenkins/newView_es.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/newView_es.properties
rename to core/src/main/resources/jenkins/model/Jenkins/newView_es.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/newView_fr.properties b/core/src/main/resources/jenkins/model/Jenkins/newView_fr.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/newView_fr.properties
rename to core/src/main/resources/jenkins/model/Jenkins/newView_fr.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/newView_ja.properties b/core/src/main/resources/jenkins/model/Jenkins/newView_ja.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/newView_ja.properties
rename to core/src/main/resources/jenkins/model/Jenkins/newView_ja.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/newView_ko.properties b/core/src/main/resources/jenkins/model/Jenkins/newView_ko.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/newView_ko.properties
rename to core/src/main/resources/jenkins/model/Jenkins/newView_ko.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/newView_nl.properties b/core/src/main/resources/jenkins/model/Jenkins/newView_nl.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/newView_nl.properties
rename to core/src/main/resources/jenkins/model/Jenkins/newView_nl.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/newView_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/newView_pt_BR.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/newView_pt_BR.properties
rename to core/src/main/resources/jenkins/model/Jenkins/newView_pt_BR.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/newView_ru.properties b/core/src/main/resources/jenkins/model/Jenkins/newView_ru.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/newView_ru.properties
rename to core/src/main/resources/jenkins/model/Jenkins/newView_ru.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/newView_sv_SE.properties b/core/src/main/resources/jenkins/model/Jenkins/newView_sv_SE.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/newView_sv_SE.properties
rename to core/src/main/resources/jenkins/model/Jenkins/newView_sv_SE.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/newView_tr.properties b/core/src/main/resources/jenkins/model/Jenkins/newView_tr.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/newView_tr.properties
rename to core/src/main/resources/jenkins/model/Jenkins/newView_tr.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/noPrincipal.jelly b/core/src/main/resources/jenkins/model/Jenkins/noPrincipal.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/noPrincipal.jelly
rename to core/src/main/resources/jenkins/model/Jenkins/noPrincipal.jelly
diff --git a/core/src/main/resources/hudson/model/Hudson/noPrincipal.properties b/core/src/main/resources/jenkins/model/Jenkins/noPrincipal.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/noPrincipal.properties
rename to core/src/main/resources/jenkins/model/Jenkins/noPrincipal.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/noPrincipal_da.properties b/core/src/main/resources/jenkins/model/Jenkins/noPrincipal_da.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/noPrincipal_da.properties
rename to core/src/main/resources/jenkins/model/Jenkins/noPrincipal_da.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/noPrincipal_de.properties b/core/src/main/resources/jenkins/model/Jenkins/noPrincipal_de.properties
similarity index 82%
rename from core/src/main/resources/hudson/model/Hudson/noPrincipal_de.properties
rename to core/src/main/resources/jenkins/model/Jenkins/noPrincipal_de.properties
index a5a7620e62abb4734c5f2ca3ffa754d9f9d068b4..8fe307f114d7e65ff2eeca238f80a44f51f7ee67 100644
--- a/core/src/main/resources/hudson/model/Hudson/noPrincipal_de.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/noPrincipal_de.properties
@@ -1,26 +1,26 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, Simon Wiest
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-blurb=\
-  Der Web-Container scheint nicht für Benutzerauthentifizierung konfiguriert \
-  worden zu sein. Prüfen Sie die Dokumentation des Containers und/oder die Mailingliste \
-  für Jenkins Anwender <tt>jenkins-users@googlegroups.com</tt>
+# The MIT License
+#
+# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, Simon Wiest
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+blurb=\
+  Der Web-Container scheint nicht f�r Benutzerauthentifizierung konfiguriert \
+  worden zu sein. Pr�fen Sie die Dokumentation des Containers und/oder die Mailingliste \
+  f�r Jenkins Anwender <tt>jenkins-users@googlegroups.com</tt>
diff --git a/core/src/main/resources/hudson/model/Hudson/noPrincipal_es.properties b/core/src/main/resources/jenkins/model/Jenkins/noPrincipal_es.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/noPrincipal_es.properties
rename to core/src/main/resources/jenkins/model/Jenkins/noPrincipal_es.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/noPrincipal_ja.properties b/core/src/main/resources/jenkins/model/Jenkins/noPrincipal_ja.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/noPrincipal_ja.properties
rename to core/src/main/resources/jenkins/model/Jenkins/noPrincipal_ja.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/noPrincipal_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/noPrincipal_pt_BR.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/noPrincipal_pt_BR.properties
rename to core/src/main/resources/jenkins/model/Jenkins/noPrincipal_pt_BR.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/opensearch.xml.jelly b/core/src/main/resources/jenkins/model/Jenkins/opensearch.xml.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/opensearch.xml.jelly
rename to core/src/main/resources/jenkins/model/Jenkins/opensearch.xml.jelly
diff --git a/core/src/main/resources/hudson/model/Hudson/projectRelationship-help.jelly b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/projectRelationship-help.jelly
rename to core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help.jelly
diff --git a/core/src/main/resources/hudson/model/Hudson/projectRelationship-help.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/projectRelationship-help.properties
rename to core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/projectRelationship-help_da.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_da.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/projectRelationship-help_da.properties
rename to core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_da.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/projectRelationship-help_de.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_de.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/projectRelationship-help_de.properties
rename to core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_de.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/projectRelationship-help_es.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_es.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/projectRelationship-help_es.properties
rename to core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_es.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/projectRelationship-help_fr.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_fr.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/projectRelationship-help_fr.properties
rename to core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_fr.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/projectRelationship-help_ja.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_ja.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/projectRelationship-help_ja.properties
rename to core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_ja.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/projectRelationship-help_nl.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_nl.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/projectRelationship-help_nl.properties
rename to core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_nl.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/projectRelationship-help_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_pt_BR.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/projectRelationship-help_pt_BR.properties
rename to core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_pt_BR.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/projectRelationship-help_ru.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_ru.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/projectRelationship-help_ru.properties
rename to core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_ru.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/projectRelationship-help_tr.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_tr.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/projectRelationship-help_tr.properties
rename to core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_tr.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/projectRelationship.jelly b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/projectRelationship.jelly
rename to core/src/main/resources/jenkins/model/Jenkins/projectRelationship.jelly
diff --git a/core/src/main/resources/hudson/model/Hudson/projectRelationship_da.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_da.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/projectRelationship_da.properties
rename to core/src/main/resources/jenkins/model/Jenkins/projectRelationship_da.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/projectRelationship_de.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_de.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/projectRelationship_de.properties
rename to core/src/main/resources/jenkins/model/Jenkins/projectRelationship_de.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/projectRelationship_es.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_es.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/projectRelationship_es.properties
rename to core/src/main/resources/jenkins/model/Jenkins/projectRelationship_es.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/projectRelationship_fr.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_fr.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/projectRelationship_fr.properties
rename to core/src/main/resources/jenkins/model/Jenkins/projectRelationship_fr.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/projectRelationship_it.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_it.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/projectRelationship_it.properties
rename to core/src/main/resources/jenkins/model/Jenkins/projectRelationship_it.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/projectRelationship_ja.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_ja.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/projectRelationship_ja.properties
rename to core/src/main/resources/jenkins/model/Jenkins/projectRelationship_ja.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/projectRelationship_nl.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_nl.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/projectRelationship_nl.properties
rename to core/src/main/resources/jenkins/model/Jenkins/projectRelationship_nl.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/projectRelationship_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_pt_BR.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/projectRelationship_pt_BR.properties
rename to core/src/main/resources/jenkins/model/Jenkins/projectRelationship_pt_BR.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/projectRelationship_ru.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_ru.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/projectRelationship_ru.properties
rename to core/src/main/resources/jenkins/model/Jenkins/projectRelationship_ru.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/projectRelationship_sv_SE.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_sv_SE.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/projectRelationship_sv_SE.properties
rename to core/src/main/resources/jenkins/model/Jenkins/projectRelationship_sv_SE.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/projectRelationship_tr.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_tr.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/projectRelationship_tr.properties
rename to core/src/main/resources/jenkins/model/Jenkins/projectRelationship_tr.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/sidepanel.jelly b/core/src/main/resources/jenkins/model/Jenkins/sidepanel.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/sidepanel.jelly
rename to core/src/main/resources/jenkins/model/Jenkins/sidepanel.jelly
diff --git a/core/src/main/resources/hudson/model/Hudson/systemInfo.jelly b/core/src/main/resources/jenkins/model/Jenkins/systemInfo.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/systemInfo.jelly
rename to core/src/main/resources/jenkins/model/Jenkins/systemInfo.jelly
diff --git a/core/src/main/resources/hudson/model/Hudson/systemInfo_da.properties b/core/src/main/resources/jenkins/model/Jenkins/systemInfo_da.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/systemInfo_da.properties
rename to core/src/main/resources/jenkins/model/Jenkins/systemInfo_da.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/systemInfo_de.properties b/core/src/main/resources/jenkins/model/Jenkins/systemInfo_de.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/systemInfo_de.properties
rename to core/src/main/resources/jenkins/model/Jenkins/systemInfo_de.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/systemInfo_es.properties b/core/src/main/resources/jenkins/model/Jenkins/systemInfo_es.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/systemInfo_es.properties
rename to core/src/main/resources/jenkins/model/Jenkins/systemInfo_es.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/systemInfo_fr.properties b/core/src/main/resources/jenkins/model/Jenkins/systemInfo_fr.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/systemInfo_fr.properties
rename to core/src/main/resources/jenkins/model/Jenkins/systemInfo_fr.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/systemInfo_ja.properties b/core/src/main/resources/jenkins/model/Jenkins/systemInfo_ja.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/systemInfo_ja.properties
rename to core/src/main/resources/jenkins/model/Jenkins/systemInfo_ja.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/systemInfo_ko.properties b/core/src/main/resources/jenkins/model/Jenkins/systemInfo_ko.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/systemInfo_ko.properties
rename to core/src/main/resources/jenkins/model/Jenkins/systemInfo_ko.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/systemInfo_nl.properties b/core/src/main/resources/jenkins/model/Jenkins/systemInfo_nl.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/systemInfo_nl.properties
rename to core/src/main/resources/jenkins/model/Jenkins/systemInfo_nl.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/systemInfo_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/systemInfo_pt_BR.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/systemInfo_pt_BR.properties
rename to core/src/main/resources/jenkins/model/Jenkins/systemInfo_pt_BR.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/systemInfo_ru.properties b/core/src/main/resources/jenkins/model/Jenkins/systemInfo_ru.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/systemInfo_ru.properties
rename to core/src/main/resources/jenkins/model/Jenkins/systemInfo_ru.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/systemInfo_sv_SE.properties b/core/src/main/resources/jenkins/model/Jenkins/systemInfo_sv_SE.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/systemInfo_sv_SE.properties
rename to core/src/main/resources/jenkins/model/Jenkins/systemInfo_sv_SE.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/systemInfo_tr.properties b/core/src/main/resources/jenkins/model/Jenkins/systemInfo_tr.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/systemInfo_tr.properties
rename to core/src/main/resources/jenkins/model/Jenkins/systemInfo_tr.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/systemInfo_zh_CN.properties b/core/src/main/resources/jenkins/model/Jenkins/systemInfo_zh_CN.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/systemInfo_zh_CN.properties
rename to core/src/main/resources/jenkins/model/Jenkins/systemInfo_zh_CN.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/systemInfo_zh_TW.properties b/core/src/main/resources/jenkins/model/Jenkins/systemInfo_zh_TW.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/systemInfo_zh_TW.properties
rename to core/src/main/resources/jenkins/model/Jenkins/systemInfo_zh_TW.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/threadDump.jelly b/core/src/main/resources/jenkins/model/Jenkins/threadDump.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/threadDump.jelly
rename to core/src/main/resources/jenkins/model/Jenkins/threadDump.jelly
diff --git a/core/src/main/resources/hudson/model/Hudson/threadDump_da.properties b/core/src/main/resources/jenkins/model/Jenkins/threadDump_da.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/threadDump_da.properties
rename to core/src/main/resources/jenkins/model/Jenkins/threadDump_da.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/threadDump_de.properties b/core/src/main/resources/jenkins/model/Jenkins/threadDump_de.properties
similarity index 98%
rename from core/src/main/resources/hudson/model/Hudson/threadDump_de.properties
rename to core/src/main/resources/jenkins/model/Jenkins/threadDump_de.properties
index afd13093fec29425056428242d060549428e0506..e16543349961c22b2bac2a6db4ec03ea9a8aa8bb 100644
--- a/core/src/main/resources/hudson/model/Hudson/threadDump_de.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/threadDump_de.properties
@@ -1,24 +1,24 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Simon Wiest
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Thread\ dump=Thread Dump
-Thread\ Dump=Thread Dump
+# The MIT License
+#
+# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Simon Wiest
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Thread\ dump=Thread Dump
+Thread\ Dump=Thread Dump
diff --git a/core/src/main/resources/hudson/model/Hudson/threadDump_es.properties b/core/src/main/resources/jenkins/model/Jenkins/threadDump_es.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/threadDump_es.properties
rename to core/src/main/resources/jenkins/model/Jenkins/threadDump_es.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/threadDump_ja.properties b/core/src/main/resources/jenkins/model/Jenkins/threadDump_ja.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/threadDump_ja.properties
rename to core/src/main/resources/jenkins/model/Jenkins/threadDump_ja.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/threadDump_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/threadDump_pt_BR.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/threadDump_pt_BR.properties
rename to core/src/main/resources/jenkins/model/Jenkins/threadDump_pt_BR.properties
diff --git a/core/src/main/resources/hudson/model/Hudson/whoAmI.jelly b/core/src/main/resources/jenkins/model/Jenkins/whoAmI.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/Hudson/whoAmI.jelly
rename to core/src/main/resources/jenkins/model/Jenkins/whoAmI.jelly