diff --git a/spring-security-basic-auth/README.md b/spring-security-basic-auth/README.md
index 8aa299f8cc..ebb404063f 100644
--- a/spring-security-basic-auth/README.md
+++ b/spring-security-basic-auth/README.md
@@ -7,7 +7,6 @@ The "Learn Spring Security" Classes: http://github.learnspringsecurity.com
 
 ### Relevant Article: 
 - [Spring Security Basic Authentication](http://www.baeldung.com/spring-security-basic-authentication)
-- [Writing a Custom Filter in Spring Security](http://www.baeldung.com/spring-security-custom-filter)
 
 
 ### Notes
diff --git a/spring-security-basic-auth/src/main/resources/webSecurityConfig.xml b/spring-security-basic-auth/src/main/resources/webSecurityConfig.xml
index f6d15980ae..b0d483768b 100644
--- a/spring-security-basic-auth/src/main/resources/webSecurityConfig.xml
+++ b/spring-security-basic-auth/src/main/resources/webSecurityConfig.xml
@@ -11,8 +11,6 @@
         <intercept-url pattern="/**" access="isAuthenticated()"/>
 
         <http-basic entry-point-ref="myBasicAuthenticationEntryPoint"/>
-
-        <custom-filter after="BASIC_AUTH_FILTER" ref="myFilter" />
     </http>
 
     <authentication-manager>
@@ -22,7 +20,4 @@
             </user-service>
         </authentication-provider>
     </authentication-manager>
-
-    <beans:bean id="myFilter" class="org.baeldung.security.filter.CustomFilter"/>
-
 </beans:beans>
\ No newline at end of file
diff --git a/spring-security-rest-basic-auth/README.md b/spring-security-rest-basic-auth/README.md
index 3bd46bdd2a..328f46ed46 100644
--- a/spring-security-rest-basic-auth/README.md
+++ b/spring-security-rest-basic-auth/README.md
@@ -9,3 +9,4 @@ The "Learn Spring Security" Classes: http://github.learnspringsecurity.com
 - [RestTemplate with Basic Authentication in Spring](http://www.baeldung.com/2012/04/16/how-to-use-resttemplate-with-basic-authentication-in-spring-3-1)
 - [HttpClient Timeout](http://www.baeldung.com/httpclient-timeout)
 - [HttpClient with SSL](http://www.baeldung.com/httpclient-ssl)
+- [Writing a Custom Filter in Spring Security](http://www.baeldung.com/spring-security-custom-filter)
\ No newline at end of file
diff --git a/spring-security-basic-auth/src/main/java/org/baeldung/security/filter/CustomFilter.java b/spring-security-rest-basic-auth/src/main/java/org/baeldung/filter/CustomFilter.java
similarity index 92%
rename from spring-security-basic-auth/src/main/java/org/baeldung/security/filter/CustomFilter.java
rename to spring-security-rest-basic-auth/src/main/java/org/baeldung/filter/CustomFilter.java
index 8d2b919cb0..01e5b0b59d 100644
--- a/spring-security-basic-auth/src/main/java/org/baeldung/security/filter/CustomFilter.java
+++ b/spring-security-rest-basic-auth/src/main/java/org/baeldung/filter/CustomFilter.java
@@ -1,4 +1,4 @@
-package org.baeldung.security.filter;
+package org.baeldung.filter;
 
 import org.springframework.web.filter.GenericFilterBean;
 
diff --git a/spring-security-basic-auth/src/main/java/org/baeldung/security/filter/configuration/CustomWebSecurityConfigurerAdapter.java b/spring-security-rest-basic-auth/src/main/java/org/baeldung/filter/CustomWebSecurityConfigurerAdapter.java
similarity index 63%
rename from spring-security-basic-auth/src/main/java/org/baeldung/security/filter/configuration/CustomWebSecurityConfigurerAdapter.java
rename to spring-security-rest-basic-auth/src/main/java/org/baeldung/filter/CustomWebSecurityConfigurerAdapter.java
index d03d9cc018..2ff0e30f94 100644
--- a/spring-security-basic-auth/src/main/java/org/baeldung/security/filter/configuration/CustomWebSecurityConfigurerAdapter.java
+++ b/spring-security-rest-basic-auth/src/main/java/org/baeldung/filter/CustomWebSecurityConfigurerAdapter.java
@@ -1,7 +1,6 @@
-package org.baeldung.security.filter.configuration;
+package org.baeldung.filter;
 
-import org.baeldung.security.basic.MyBasicAuthenticationEntryPoint;
-import org.baeldung.security.filter.CustomFilter;
+import org.baeldung.security.RestAuthenticationEntryPoint;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
@@ -14,17 +13,28 @@ import org.springframework.security.web.authentication.www.BasicAuthenticationFi
 @EnableWebSecurity
 public class CustomWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdapter {
 
-    @Autowired
-    private MyBasicAuthenticationEntryPoint authenticationEntryPoint;
+    @Autowired private RestAuthenticationEntryPoint authenticationEntryPoint;
 
     @Autowired
     public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-        auth.inMemoryAuthentication().withUser("user1").password("user1Pass").authorities("ROLE_USER");
+        auth
+          .inMemoryAuthentication()
+          .withUser("user1")
+          .password("user1Pass")
+          .authorities("ROLE_USER");
     }
 
     @Override
     protected void configure(HttpSecurity http) throws Exception {
-        http.authorizeRequests().antMatchers("/securityNone").permitAll().anyRequest().authenticated().and().httpBasic().authenticationEntryPoint(authenticationEntryPoint);
+        http
+          .authorizeRequests()
+          .antMatchers("/securityNone")
+          .permitAll()
+          .anyRequest()
+          .authenticated()
+          .and()
+          .httpBasic()
+          .authenticationEntryPoint(authenticationEntryPoint);
 
         http.addFilterAfter(new CustomFilter(), BasicAuthenticationFilter.class);
     }