diff --git a/spring-cloud-security/personservice.zip b/spring-cloud-security/personservice.zip
deleted file mode 100644
index 9c6c9e2ef5..0000000000
Binary files a/spring-cloud-security/personservice.zip and /dev/null differ
diff --git a/spring-cloud-security/springoath2client/src/main/resources/static/index.html b/spring-cloud-security/springoath2client/src/main/resources/static/index.html
deleted file mode 100644
index f304980bb1..0000000000
--- a/spring-cloud-security/springoath2client/src/main/resources/static/index.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-<meta charset="utf-8" />
-<meta http-equiv="X-UA-Compatible" content="IE=edge" />
-<title>Demo</title>
-<meta name="description" content="" />
-<meta name="viewport" content="width=device-width" />
-<base href="/" />
-<link rel="stylesheet" type="text/css"
-	href="/webjars/bootstrap/css/bootstrap.min.css" />
-<script type="text/javascript" src="/webjars/jquery/jquery.min.js"></script>
-<script type="text/javascript"
-	src="/webjars/bootstrap/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="/webjars/js-cookie/js.cookie.js"></script>
-</head>
-<body>
-	<h1>Demo</h1>
-	<div class="container unauthenticated">
-		With Facebook: <a href="/login">click here</a>
-	</div>
-
-	<div class="container authenticated" style="display: none">
-		Logged in as: <span id="user"></span>
-		<div>
-			<button onClick="logout()" class="btn btn-primary">Logout</button>
-		</div>
-	</div>
-
-	<script type="text/javascript">
-		$.get("/user", function(data) {
-			$("#user").html(data.userAuthentication.details.name);
-			$(".unauthenticated").hide()
-			$(".authenticated").show()
-		});
-		var logout = function() {
-			$.post("/logout", function() {
-				$("#user").html('');
-				$(".unauthenticated").show();
-				$(".authenticated").hide();
-			})
-			return true;
-		}
-		$.ajaxSetup({
-			beforeSend : function(xhr, settings) {
-				if (settings.type == 'POST' || settings.type == 'PUT'
-						|| settings.type == 'DELETE') {
-					if (!(/^http:.*/.test(settings.url) || /^https:.*/
-							.test(settings.url))) {
-						// Only send the token to relative URLs i.e. locally.
-						xhr.setRequestHeader("X-XSRF-TOKEN", Cookies
-								.get('XSRF-TOKEN'));
-					}
-				}
-			}
-		});
-	</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-cloud-security/README.md b/spring-cloud/spring-cloud-security/README.md
similarity index 100%
rename from spring-cloud-security/README.md
rename to spring-cloud/spring-cloud-security/README.md
diff --git a/spring-cloud-security/alias.rtf b/spring-cloud/spring-cloud-security/alias.rtf
similarity index 100%
rename from spring-cloud-security/alias.rtf
rename to spring-cloud/spring-cloud-security/alias.rtf
diff --git a/spring-cloud-security/authserver/pom.xml b/spring-cloud/spring-cloud-security/authserver/pom.xml
similarity index 100%
rename from spring-cloud-security/authserver/pom.xml
rename to spring-cloud/spring-cloud-security/authserver/pom.xml
diff --git a/spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/AuthServer.java b/spring-cloud/spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/AuthServer.java
similarity index 100%
rename from spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/AuthServer.java
rename to spring-cloud/spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/AuthServer.java
diff --git a/spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/config/AuthServerConfigurer.java b/spring-cloud/spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/config/AuthServerConfigurer.java
similarity index 100%
rename from spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/config/AuthServerConfigurer.java
rename to spring-cloud/spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/config/AuthServerConfigurer.java
diff --git a/spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/config/ResourceServerConfigurer.java b/spring-cloud/spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/config/ResourceServerConfigurer.java
similarity index 100%
rename from spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/config/ResourceServerConfigurer.java
rename to spring-cloud/spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/config/ResourceServerConfigurer.java
diff --git a/spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/config/WebMvcConfigurer.java b/spring-cloud/spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/config/WebMvcConfigurer.java
similarity index 100%
rename from spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/config/WebMvcConfigurer.java
rename to spring-cloud/spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/config/WebMvcConfigurer.java
diff --git a/spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/config/WebSecurityConfigurer.java b/spring-cloud/spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/config/WebSecurityConfigurer.java
similarity index 96%
rename from spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/config/WebSecurityConfigurer.java
rename to spring-cloud/spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/config/WebSecurityConfigurer.java
index eb81e65196..9014aa4954 100644
--- a/spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/config/WebSecurityConfigurer.java
+++ b/spring-cloud/spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/config/WebSecurityConfigurer.java
@@ -19,8 +19,8 @@ public class WebSecurityConfigurer
     extends
         WebSecurityConfigurerAdapter {
 
-    @Autowired
-    private OAuth2ClientContext oauth2ClientContext;
+//    @Autowired
+//    private OAuth2ClientContext oauth2ClientContext;
 
     @Override
     protected void configure(HttpSecurity http)
diff --git a/spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/controller/ResourceController.java b/spring-cloud/spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/controller/ResourceController.java
similarity index 100%
rename from spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/controller/ResourceController.java
rename to spring-cloud/spring-cloud-security/authserver/src/main/java/com/cloudsecurity/auth/controller/ResourceController.java
diff --git a/spring-cloud-security/authserver/src/main/resources/application.yml b/spring-cloud/spring-cloud-security/authserver/src/main/resources/application.yml
similarity index 100%
rename from spring-cloud-security/authserver/src/main/resources/application.yml
rename to spring-cloud/spring-cloud-security/authserver/src/main/resources/application.yml
diff --git a/spring-cloud-security/authserver/src/main/resources/certificate/mykeystore.jks b/spring-cloud/spring-cloud-security/authserver/src/main/resources/certificate/mykeystore.jks
similarity index 100%
rename from spring-cloud-security/authserver/src/main/resources/certificate/mykeystore.jks
rename to spring-cloud/spring-cloud-security/authserver/src/main/resources/certificate/mykeystore.jks
diff --git a/spring-cloud-security/authserver/src/main/resources/templates/login.html b/spring-cloud/spring-cloud-security/authserver/src/main/resources/templates/login.html
similarity index 100%
rename from spring-cloud-security/authserver/src/main/resources/templates/login.html
rename to spring-cloud/spring-cloud-security/authserver/src/main/resources/templates/login.html
diff --git a/spring-cloud-security/mykeystore.jks b/spring-cloud/spring-cloud-security/mykeystore.jks
similarity index 100%
rename from spring-cloud-security/mykeystore.jks
rename to spring-cloud/spring-cloud-security/mykeystore.jks
diff --git a/spring-cloud-security/personservice/pom.xml b/spring-cloud/spring-cloud-security/personservice/pom.xml
similarity index 100%
rename from spring-cloud-security/personservice/pom.xml
rename to spring-cloud/spring-cloud-security/personservice/pom.xml
diff --git a/spring-cloud-security/personservice/src/main/java/com/baeldung/service/model/Person.java b/spring-cloud/spring-cloud-security/personservice/src/main/java/com/baeldung/service/model/Person.java
similarity index 100%
rename from spring-cloud-security/personservice/src/main/java/com/baeldung/service/model/Person.java
rename to spring-cloud/spring-cloud-security/personservice/src/main/java/com/baeldung/service/model/Person.java
diff --git a/spring-cloud-security/personservice/src/main/java/com/baeldung/service/personservice/PersonserviceApplication.java b/spring-cloud/spring-cloud-security/personservice/src/main/java/com/baeldung/service/personservice/PersonserviceApplication.java
similarity index 100%
rename from spring-cloud-security/personservice/src/main/java/com/baeldung/service/personservice/PersonserviceApplication.java
rename to spring-cloud/spring-cloud-security/personservice/src/main/java/com/baeldung/service/personservice/PersonserviceApplication.java
diff --git a/spring-cloud-security/personservice/src/main/java/com/baeldung/service/personservice/config/ResourceConfigurer.java b/spring-cloud/spring-cloud-security/personservice/src/main/java/com/baeldung/service/personservice/config/ResourceConfigurer.java
similarity index 100%
rename from spring-cloud-security/personservice/src/main/java/com/baeldung/service/personservice/config/ResourceConfigurer.java
rename to spring-cloud/spring-cloud-security/personservice/src/main/java/com/baeldung/service/personservice/config/ResourceConfigurer.java
diff --git a/spring-cloud-security/personservice/src/main/java/com/baeldung/service/personservice/controller/PersonInfoController.java b/spring-cloud/spring-cloud-security/personservice/src/main/java/com/baeldung/service/personservice/controller/PersonInfoController.java
similarity index 100%
rename from spring-cloud-security/personservice/src/main/java/com/baeldung/service/personservice/controller/PersonInfoController.java
rename to spring-cloud/spring-cloud-security/personservice/src/main/java/com/baeldung/service/personservice/controller/PersonInfoController.java
diff --git a/spring-cloud-security/personservice/src/main/resources/application.properties b/spring-cloud/spring-cloud-security/personservice/src/main/resources/application.properties
similarity index 100%
rename from spring-cloud-security/personservice/src/main/resources/application.properties
rename to spring-cloud/spring-cloud-security/personservice/src/main/resources/application.properties
diff --git a/spring-cloud-security/personservice/src/main/resources/application.yml b/spring-cloud/spring-cloud-security/personservice/src/main/resources/application.yml
similarity index 100%
rename from spring-cloud-security/personservice/src/main/resources/application.yml
rename to spring-cloud/spring-cloud-security/personservice/src/main/resources/application.yml
diff --git a/spring-cloud-security/personservice/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationTests.java b/spring-cloud/spring-cloud-security/personservice/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationTests.java
similarity index 100%
rename from spring-cloud-security/personservice/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationTests.java
rename to spring-cloud/spring-cloud-security/personservice/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationTests.java
diff --git a/spring-cloud-security/pubkey.txt b/spring-cloud/spring-cloud-security/pubkey.txt
similarity index 100%
rename from spring-cloud-security/pubkey.txt
rename to spring-cloud/spring-cloud-security/pubkey.txt
diff --git a/spring-cloud-security/springoath2client/pom.xml b/spring-cloud/spring-cloud-security/springoath2client/pom.xml
similarity index 100%
rename from spring-cloud-security/springoath2client/pom.xml
rename to spring-cloud/spring-cloud-security/springoath2client/pom.xml
diff --git a/spring-cloud-security/springoath2client/src/main/java/com/cloud/springwebsite/CloudSite.java b/spring-cloud/spring-cloud-security/springoath2client/src/main/java/com/cloud/springwebsite/CloudSite.java
similarity index 100%
rename from spring-cloud-security/springoath2client/src/main/java/com/cloud/springwebsite/CloudSite.java
rename to spring-cloud/spring-cloud-security/springoath2client/src/main/java/com/cloud/springwebsite/CloudSite.java
diff --git a/spring-cloud-security/springoath2client/src/main/java/com/cloud/springwebsite/config/SiteSecurityConfigurer.java b/spring-cloud/spring-cloud-security/springoath2client/src/main/java/com/cloud/springwebsite/config/SiteSecurityConfigurer.java
similarity index 100%
rename from spring-cloud-security/springoath2client/src/main/java/com/cloud/springwebsite/config/SiteSecurityConfigurer.java
rename to spring-cloud/spring-cloud-security/springoath2client/src/main/java/com/cloud/springwebsite/config/SiteSecurityConfigurer.java
diff --git a/spring-cloud-security/springoath2client/src/main/java/com/cloud/springwebsite/controller/CloudSiteController.java b/spring-cloud/spring-cloud-security/springoath2client/src/main/java/com/cloud/springwebsite/controller/CloudSiteController.java
similarity index 100%
rename from spring-cloud-security/springoath2client/src/main/java/com/cloud/springwebsite/controller/CloudSiteController.java
rename to spring-cloud/spring-cloud-security/springoath2client/src/main/java/com/cloud/springwebsite/controller/CloudSiteController.java
diff --git a/spring-cloud-security/springoath2client/src/main/java/com/cloudsite/filters/pre/SimpleFilter.java b/spring-cloud/spring-cloud-security/springoath2client/src/main/java/com/cloudsite/filters/pre/SimpleFilter.java
similarity index 100%
rename from spring-cloud-security/springoath2client/src/main/java/com/cloudsite/filters/pre/SimpleFilter.java
rename to spring-cloud/spring-cloud-security/springoath2client/src/main/java/com/cloudsite/filters/pre/SimpleFilter.java
diff --git a/spring-cloud-security/springoath2client/src/main/resources/application.properties b/spring-cloud/spring-cloud-security/springoath2client/src/main/resources/application.properties
similarity index 100%
rename from spring-cloud-security/springoath2client/src/main/resources/application.properties
rename to spring-cloud/spring-cloud-security/springoath2client/src/main/resources/application.properties
diff --git a/spring-cloud-security/springoath2client/src/main/resources/application.yml b/spring-cloud/spring-cloud-security/springoath2client/src/main/resources/application.yml
similarity index 100%
rename from spring-cloud-security/springoath2client/src/main/resources/application.yml
rename to spring-cloud/spring-cloud-security/springoath2client/src/main/resources/application.yml
diff --git a/spring-cloud-security/springoath2client/src/main/resources/templates/personinfo.html b/spring-cloud/spring-cloud-security/springoath2client/src/main/resources/templates/personinfo.html
similarity index 92%
rename from spring-cloud-security/springoath2client/src/main/resources/templates/personinfo.html
rename to spring-cloud/spring-cloud-security/springoath2client/src/main/resources/templates/personinfo.html
index 9ed0c3cb4f..4f8eedfb6a 100644
--- a/spring-cloud-security/springoath2client/src/main/resources/templates/personinfo.html
+++ b/spring-cloud/spring-cloud-security/springoath2client/src/main/resources/templates/personinfo.html
@@ -2,7 +2,7 @@
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 <head>
 <meta charset="UTF-8" />
-<title>My Website - Current time</title>
+<title>My Website - Getting Personal Information</title>
 <script th:inline="javascript">
 	/*<![CDATA[*/
 	function refreshTime() {
diff --git a/spring-cloud-security/springoath2client/src/test/java/com/example/springoath2/Springoath2ApplicationTests.java b/spring-cloud/spring-cloud-security/springoath2client/src/test/java/com/example/springoath2/Springoath2ApplicationTests.java
similarity index 100%
rename from spring-cloud-security/springoath2client/src/test/java/com/example/springoath2/Springoath2ApplicationTests.java
rename to spring-cloud/spring-cloud-security/springoath2client/src/test/java/com/example/springoath2/Springoath2ApplicationTests.java
