diff --git a/spring-5-security-oauth/pom.xml b/spring-5-security-oauth/pom.xml
index f200052adf..5814f1dd43 100644
--- a/spring-5-security-oauth/pom.xml
+++ b/spring-5-security-oauth/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>org.thymeleaf.extras</groupId>
-            <artifactId>thymeleaf-extras-springsecurity4</artifactId>
+            <artifactId>thymeleaf-extras-springsecurity5</artifactId>
         </dependency>
 
         <!-- oauth2 -->
@@ -66,6 +66,7 @@
     </dependencies>
 	
     <properties>
+        <spring-boot.version>2.1.0.RELEASE</spring-boot.version>
         <oauth-auto.version>2.0.1.RELEASE</oauth-auto.version>
         <start-class>com.baeldung.oauth2.SpringOAuthApplication</start-class>
     </properties>
diff --git a/spring-5-security/src/main/java/com/baeldung/oauth2/CustomAuthorizationRequestResolver.java b/spring-5-security-oauth/src/main/java/com/baeldung/oauth2/CustomAuthorizationRequestResolver.java
similarity index 100%
rename from spring-5-security/src/main/java/com/baeldung/oauth2/CustomAuthorizationRequestResolver.java
rename to spring-5-security-oauth/src/main/java/com/baeldung/oauth2/CustomAuthorizationRequestResolver.java
diff --git a/spring-5-security/src/main/java/com/baeldung/oauth2/CustomRequestEntityConverter.java b/spring-5-security-oauth/src/main/java/com/baeldung/oauth2/CustomRequestEntityConverter.java
similarity index 100%
rename from spring-5-security/src/main/java/com/baeldung/oauth2/CustomRequestEntityConverter.java
rename to spring-5-security-oauth/src/main/java/com/baeldung/oauth2/CustomRequestEntityConverter.java
diff --git a/spring-5-security/src/main/java/com/baeldung/oauth2/CustomTokenResponseConverter.java b/spring-5-security-oauth/src/main/java/com/baeldung/oauth2/CustomTokenResponseConverter.java
similarity index 100%
rename from spring-5-security/src/main/java/com/baeldung/oauth2/CustomTokenResponseConverter.java
rename to spring-5-security-oauth/src/main/java/com/baeldung/oauth2/CustomTokenResponseConverter.java