diff --git a/core/src/main/java/jenkins/security/s2m/AdminCallableWhitelist.java b/core/src/main/java/jenkins/security/s2m/AdminCallableWhitelist.java
index 7c57360834..a6bc100d31 100644
--- a/core/src/main/java/jenkins/security/s2m/AdminCallableWhitelist.java
+++ b/core/src/main/java/jenkins/security/s2m/AdminCallableWhitelist.java
@@ -2,7 +2,6 @@ package jenkins.security.s2m;
 
 import hudson.Extension;
 import hudson.remoting.Callable;
-import jenkins.security.CallableWhitelist;
 import org.jenkinsci.remoting.Role;
 import org.jenkinsci.remoting.RoleSensitive;
 
diff --git a/core/src/main/java/jenkins/security/CallableDirectionChecker.java b/core/src/main/java/jenkins/security/s2m/CallableDirectionChecker.java
similarity index 97%
rename from core/src/main/java/jenkins/security/CallableDirectionChecker.java
rename to core/src/main/java/jenkins/security/s2m/CallableDirectionChecker.java
index d8910f9c65..706d17c0be 100644
--- a/core/src/main/java/jenkins/security/CallableDirectionChecker.java
+++ b/core/src/main/java/jenkins/security/s2m/CallableDirectionChecker.java
@@ -1,8 +1,10 @@
-package jenkins.security;
+package jenkins.security.s2m;
 
 import hudson.Extension;
 import hudson.remoting.Callable;
 import hudson.remoting.ChannelBuilder;
+import jenkins.security.ChannelConfigurator;
+import jenkins.security.Roles;
 import org.jenkinsci.remoting.Role;
 import org.jenkinsci.remoting.RoleChecker;
 import org.jenkinsci.remoting.RoleSensitive;
diff --git a/core/src/main/java/jenkins/security/CallableWhitelist.java b/core/src/main/java/jenkins/security/s2m/CallableWhitelist.java
similarity index 96%
rename from core/src/main/java/jenkins/security/CallableWhitelist.java
rename to core/src/main/java/jenkins/security/s2m/CallableWhitelist.java
index 7d69d7f886..50023a0cd0 100644
--- a/core/src/main/java/jenkins/security/CallableWhitelist.java
+++ b/core/src/main/java/jenkins/security/s2m/CallableWhitelist.java
@@ -1,10 +1,11 @@
-package jenkins.security;
+package jenkins.security.s2m;
 
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.remoting.Callable;
 import hudson.remoting.ChannelBuilder;
 import jenkins.model.Jenkins;
+import jenkins.security.ChannelConfigurator;
 import org.jenkinsci.remoting.Role;
 import org.jenkinsci.remoting.RoleChecker;
 import org.jenkinsci.remoting.RoleSensitive;
diff --git a/core/src/main/java/jenkins/security/DefaultFilePathFilter.java b/core/src/main/java/jenkins/security/s2m/DefaultFilePathFilter.java
similarity index 97%
rename from core/src/main/java/jenkins/security/DefaultFilePathFilter.java
rename to core/src/main/java/jenkins/security/s2m/DefaultFilePathFilter.java
index 69f85b74e0..563d19269e 100644
--- a/core/src/main/java/jenkins/security/DefaultFilePathFilter.java
+++ b/core/src/main/java/jenkins/security/s2m/DefaultFilePathFilter.java
@@ -22,12 +22,12 @@
  * THE SOFTWARE.
  */
 
-package jenkins.security;
+package jenkins.security.s2m;
 
 import hudson.Extension;
 import hudson.remoting.ChannelBuilder;
 import jenkins.ReflectiveFilePathFilter;
-import jenkins.security.s2m.AdminFilePathFilter;
+import jenkins.security.ChannelConfigurator;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.DoNotUse;
 
diff --git a/test/src/test/java/jenkins/security/DefaultFilePathFilterTest.java b/test/src/test/java/jenkins/security/DefaultFilePathFilterTest.java
index 0b1a40b680..83ce1b15c1 100644
--- a/test/src/test/java/jenkins/security/DefaultFilePathFilterTest.java
+++ b/test/src/test/java/jenkins/security/DefaultFilePathFilterTest.java
@@ -30,9 +30,8 @@ import hudson.remoting.Callable;
 import java.io.File;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.util.Collection;
 
-import org.jenkinsci.remoting.Role;
+import jenkins.security.s2m.DefaultFilePathFilter;
 import org.jenkinsci.remoting.RoleChecker;
 import org.junit.Test;
 import static org.junit.Assert.*;