diff --git a/core/src/main/java/org/springframework/security/event/authentication/AuthenticationSwitchUserEvent.java b/web/src/main/java/org/springframework/security/web/authentication/switchuser/AuthenticationSwitchUserEvent.java
similarity index 91%
rename from core/src/main/java/org/springframework/security/event/authentication/AuthenticationSwitchUserEvent.java
rename to web/src/main/java/org/springframework/security/web/authentication/switchuser/AuthenticationSwitchUserEvent.java
index 60dd3a0e83..1334fe8618 100644
--- a/core/src/main/java/org/springframework/security/event/authentication/AuthenticationSwitchUserEvent.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/switchuser/AuthenticationSwitchUserEvent.java
@@ -13,10 +13,11 @@
  * limitations under the License.
  */
 
-package org.springframework.security.event.authentication;
+package org.springframework.security.web.authentication.switchuser;
 
 import org.springframework.security.Authentication;
 
+import org.springframework.security.event.authentication.AbstractAuthenticationEvent;
 import org.springframework.security.userdetails.UserDetails;
 
 
@@ -33,7 +34,7 @@ public class AuthenticationSwitchUserEvent extends AbstractAuthenticationEvent {
 
     //~ Constructors ===================================================================================================
 
-/**
+    /**
      * Switch user context event constructor
      *
      * @param authentication The current <code>Authentication</code> object
diff --git a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserProcessingFilter.java
index aaf69c874f..f55db28190 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserProcessingFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserProcessingFilter.java
@@ -42,7 +42,6 @@ import org.springframework.security.GrantedAuthority;
 import org.springframework.security.LockedException;
 import org.springframework.security.SpringSecurityMessageSource;
 import org.springframework.security.context.SecurityContextHolder;
-import org.springframework.security.event.authentication.AuthenticationSwitchUserEvent;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 import org.springframework.security.userdetails.UserDetails;
 import org.springframework.security.userdetails.UserDetailsChecker;