diff --git a/spring-boot-rest/src/main/java/com/baeldung/config/RestClientConfig.java b/spring-rest/src/main/java/com/baeldung/sampleapp/config/RestClientConfig.java
similarity index 85%
rename from spring-boot-rest/src/main/java/com/baeldung/config/RestClientConfig.java
rename to spring-rest/src/main/java/com/baeldung/sampleapp/config/RestClientConfig.java
index 9d21e0f785..8abc368bdb 100644
--- a/spring-boot-rest/src/main/java/com/baeldung/config/RestClientConfig.java
+++ b/spring-rest/src/main/java/com/baeldung/sampleapp/config/RestClientConfig.java
@@ -1,4 +1,4 @@
-package com.baeldung.config;
+package com.baeldung.sampleapp.config;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,7 +9,7 @@ import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.client.RestTemplate;
 
-import com.baeldung.interceptors.RestTemplateHeaderModifierInterceptor;
+import com.baeldung.sampleapp.interceptors.RestTemplateHeaderModifierInterceptor;
 
 @Configuration
 public class RestClientConfig {
diff --git a/spring-boot-rest/src/main/java/com/baeldung/interceptors/RestTemplateHeaderModifierInterceptor.java b/spring-rest/src/main/java/com/baeldung/sampleapp/interceptors/RestTemplateHeaderModifierInterceptor.java
similarity index 91%
rename from spring-boot-rest/src/main/java/com/baeldung/interceptors/RestTemplateHeaderModifierInterceptor.java
rename to spring-rest/src/main/java/com/baeldung/sampleapp/interceptors/RestTemplateHeaderModifierInterceptor.java
index 9402980926..519e5ebf0d 100644
--- a/spring-boot-rest/src/main/java/com/baeldung/interceptors/RestTemplateHeaderModifierInterceptor.java
+++ b/spring-rest/src/main/java/com/baeldung/sampleapp/interceptors/RestTemplateHeaderModifierInterceptor.java
@@ -1,4 +1,4 @@
-package com.baeldung.interceptors;
+package com.baeldung.sampleapp.interceptors;
 
 import java.io.IOException;
 
diff --git a/spring-rest/src/main/java/com/baeldung/transfer/LoginForm.java b/spring-rest/src/main/java/com/baeldung/transfer/LoginForm.java
new file mode 100644
index 0000000000..caafcdb500
--- /dev/null
+++ b/spring-rest/src/main/java/com/baeldung/transfer/LoginForm.java
@@ -0,0 +1,31 @@
+package com.baeldung.transfer;
+
+public class LoginForm {
+    private String username;
+    private String password;
+
+    public LoginForm() {
+    }
+
+    public LoginForm(String username, String password) {
+        super();
+        this.username = username;
+        this.password = password;
+    }
+    
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-rest/src/test/java/com/baeldung/resttemplate/RestTemplateLiveTest.java b/spring-rest/src/test/java/com/baeldung/resttemplate/RestTemplateLiveTest.java
similarity index 96%
rename from spring-boot-rest/src/test/java/com/baeldung/resttemplate/RestTemplateLiveTest.java
rename to spring-rest/src/test/java/com/baeldung/resttemplate/RestTemplateLiveTest.java
index d0ae521837..8db31fd0a7 100644
--- a/spring-boot-rest/src/test/java/com/baeldung/resttemplate/RestTemplateLiveTest.java
+++ b/spring-rest/src/test/java/com/baeldung/resttemplate/RestTemplateLiveTest.java
@@ -16,7 +16,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.client.RestTemplate;
 
-import com.baeldung.config.RestClientConfig;
+import com.baeldung.sampleapp.config.RestClientConfig;
 import com.baeldung.transfer.LoginForm;
 
 @RunWith(SpringJUnit4ClassRunner.class)