diff --git a/pom.xml b/pom.xml
index b50522fe75..78fb4e2f45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -517,6 +517,7 @@
 				<module>spring-rest-full</module>
 				<module>spring-rest-query-language</module>
 				<module>spring-rest</module>
+				<module>spring-resttemplate</module>
 				<module>spring-rest-simple</module>
 				<module>spring-security-acl</module>
 				<module>spring-security-cache-control</module>
@@ -786,6 +787,7 @@
 				<module>spring-rest-full</module>
 				<module>spring-rest-query-language</module>
 				<module>spring-rest</module>
+				<module>spring-resttemplate</module>
 				<module>spring-rest-simple</module>
         <module>spring-reactive-kotlin</module>
 
@@ -1055,6 +1057,7 @@
 				<module>spring-rest-full</module>
 				<module>spring-rest-query-language</module>
 				<module>spring-rest</module>
+				<module>spring-resttemplate</module>
 				<module>spring-rest-simple</module>
 				<module>spring-security-acl</module>
 				<module>spring-security-cache-control</module>
diff --git a/spring-rest-full/README.md b/spring-rest-full/README.md
index 0dd25b276b..b8fef9cb82 100644
--- a/spring-rest-full/README.md
+++ b/spring-rest-full/README.md
@@ -16,7 +16,6 @@ The "Learn Spring Security" Classes: http://github.learnspringsecurity.com
 - [Introduction to Spring Data JPA](http://www.baeldung.com/the-persistence-layer-with-spring-data-jpa)
 - [Project Configuration with Spring](http://www.baeldung.com/project-configuration-with-spring)
 - [Metrics for your Spring REST API](http://www.baeldung.com/spring-rest-api-metrics)
-- [Spring RestTemplate Tutorial](http://www.baeldung.com/rest-template)
 - [Bootstrap a Web Application with Spring 4](http://www.baeldung.com/bootstraping-a-web-application-with-spring-and-java-based-configuration)
 - [Build a REST API with Spring 4 and Java Config](http://www.baeldung.com/building-a-restful-web-service-with-spring-and-java-based-configuration)
 - [Error Handling for REST with Spring](http://www.baeldung.com/exception-handling-for-rest-with-spring)
diff --git a/spring-rest-simple/README.md b/spring-rest-simple/README.md
index ae853ba787..57d6f50887 100644
--- a/spring-rest-simple/README.md
+++ b/spring-rest-simple/README.md
@@ -6,5 +6,4 @@
 - [Spring RequestMapping](http://www.baeldung.com/spring-requestmapping)
 - [ETags for REST with Spring](http://www.baeldung.com/etags-for-rest-with-spring)
 - [Spring and Apache FileUpload](http://www.baeldung.com/spring-apache-file-upload)
-- [Spring RestTemplate Error Handling](http://www.baeldung.com/spring-rest-template-error-handling)
 - [Test a REST API with curl](http://www.baeldung.com/curl-rest)
diff --git a/spring-rest-simple/src/test/java/org/baeldung/client/RestTemplateBasicLiveTest.java b/spring-rest-simple/src/test/java/org/baeldung/client/RestTemplateBasicLiveTest.java
deleted file mode 100644
index 40e93f2d89..0000000000
--- a/spring-rest-simple/src/test/java/org/baeldung/client/RestTemplateBasicLiveTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.baeldung.client;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import java.io.IOException;
-
-import org.baeldung.web.dto.Foo;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.client.RestTemplate;
-
-public class RestTemplateBasicLiveTest {
-
-    private RestTemplate restTemplate;
-
-    private static final String fooResourceUrl = String.format("http://localhost:%d/spring-rest/foos", 8082);
-
-    @Before
-    public void beforeTest() {
-        restTemplate = new RestTemplate();
-    }
-
-    // GET
-
-    @Test
-    public void givenResourceUrl_whenSendGetForRequestEntity_thenStatusOk() throws IOException {
-        final ResponseEntity<String> response = restTemplate.getForEntity(fooResourceUrl + "/1", String.class);
-
-        assertThat(response.getStatusCode(), equalTo(HttpStatus.OK));
-    }
-
-    @Test
-    public void givenResourceUrl_whenRetrievingResource_thenCorrect() throws IOException {
-        final Foo foo = restTemplate.getForObject(fooResourceUrl + "/1", Foo.class);
-
-        assertThat(foo.getName(), notNullValue());
-        assertThat(foo.getId(), is(1L));
-    }
-
-    // PUT
-
-    @Test
-    public void givenFooService_whenPutObject_thenUpdatedObjectIsReturned() {
-        final HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_JSON);
-        final Foo foo = new Foo(1, "newName");
-        final String resourceUrl = fooResourceUrl + "/1";
-        final HttpEntity<Foo> requestUpdate = new HttpEntity<>(foo, headers);
-        final ResponseEntity<Foo> response = restTemplate.exchange(resourceUrl, HttpMethod.PUT, requestUpdate, Foo.class);
-
-        assertThat(foo.getName(), is(response.getBody()
-            .getName()));
-    }
-
-}
diff --git a/spring-rest/README.md b/spring-rest/README.md
index 6ef86ad015..d449a4d92a 100644
--- a/spring-rest/README.md
+++ b/spring-rest/README.md
@@ -14,7 +14,6 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Introduction to FindBugs](http://www.baeldung.com/intro-to-findbugs)
 - [A Custom Media Type for a Spring REST API](http://www.baeldung.com/spring-rest-custom-media-type)
 - [HTTP PUT vs HTTP PATCH in a REST API](http://www.baeldung.com/http-put-patch-difference-spring)
-- [Exploring the Spring Boot TestRestTemplate](http://www.baeldung.com/spring-boot-testresttemplate)
 - [Spring – Log Incoming Requests](http://www.baeldung.com/spring-http-logging)
 - [RequestBody and ResponseBody Annotations](http://www.baeldung.com/requestbody-and-responsebody-annotations)
 - [Introduction to CheckStyle](http://www.baeldung.com/checkstyle-java)
@@ -22,6 +21,5 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Guide to DeferredResult in Spring](http://www.baeldung.com/spring-deferred-result)
 - [Spring Custom Property Editor](http://www.baeldung.com/spring-mvc-custom-property-editor)
 - [Using the Spring RestTemplate Interceptor](http://www.baeldung.com/spring-rest-template-interceptor)
-- [Configure a RestTemplate with RestTemplateBuilder](http://www.baeldung.com/spring-rest-template-builder)
 - [Get and Post Lists of Objects with RestTemplate](http://www.baeldung.com/spring-rest-template-list)
 - [How to Set a Header on a Response with Spring 5](http://www.baeldung.com/spring-response-header)
diff --git a/spring-rest/src/test/java/org/baeldung/client/TestRestTemplateBasicLiveTest.java b/spring-rest/src/test/java/org/baeldung/client/TestRestTemplateBasicLiveTest.java
deleted file mode 100644
index a8a71c7d73..0000000000
--- a/spring-rest/src/test/java/org/baeldung/client/TestRestTemplateBasicLiveTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.baeldung.client;
-
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.client.RestTemplateBuilder;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.client.RestTemplate;
-
-import static org.baeldung.client.Consts.APPLICATION_PORT;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-public class TestRestTemplateBasicLiveTest {
-
-    private RestTemplateBuilder restTemplate;
-    private static final String FOO_RESOURCE_URL = "http://localhost:" + APPLICATION_PORT + "/spring-rest/foos";
-    private static final String URL_SECURED_BY_AUTHENTICATION = "http://httpbin.org/basic-auth/user/passwd";
-    private static final String BASE_URL = "http://localhost:" + APPLICATION_PORT + "/spring-rest";
-
-    @Before
-    public void beforeTest() {
-        restTemplate = new RestTemplateBuilder();
-    }
-
-    // GET
-    @Test
-    public void givenTestRestTemplate_whenSendGetForEntity_thenStatusOk() {
-        TestRestTemplate testRestTemplate = new TestRestTemplate();
-        ResponseEntity<String> response = testRestTemplate.getForEntity(FOO_RESOURCE_URL + "/1", String.class);
-        assertThat(response.getStatusCode(), equalTo(HttpStatus.OK));
-    }
-
-    @Test
-    public void givenRestTemplateWrapper_whenSendGetForEntity_thenStatusOk() {
-        TestRestTemplate testRestTemplate = new TestRestTemplate(restTemplate);
-        ResponseEntity<String> response = testRestTemplate.getForEntity(FOO_RESOURCE_URL + "/1", String.class);
-        assertThat(response.getStatusCode(), equalTo(HttpStatus.OK));
-    }
-
-    @Test
-    public void givenRestTemplateBuilderWrapper_whenSendGetForEntity_thenStatusOk() {
-        RestTemplateBuilder restTemplateBuilder = new RestTemplateBuilder();
-        restTemplateBuilder.build();
-        TestRestTemplate testRestTemplate = new TestRestTemplate(restTemplateBuilder);
-        ResponseEntity<String> response = testRestTemplate.getForEntity(FOO_RESOURCE_URL + "/1", String.class);
-        assertThat(response.getStatusCode(), equalTo(HttpStatus.OK));
-    }
-
-    @Test
-    public void givenRestTemplateWrapperWithCredentials_whenSendGetForEntity_thenStatusOk() {
-        TestRestTemplate testRestTemplate = new TestRestTemplate(restTemplate, "user", "passwd");
-        ResponseEntity<String> response = testRestTemplate.getForEntity(URL_SECURED_BY_AUTHENTICATION,
-                String.class);
-        assertThat(response.getStatusCode(), equalTo(HttpStatus.OK));
-    }
-
-    @Test
-    public void givenTestRestTemplateWithCredentials_whenSendGetForEntity_thenStatusOk() {
-        TestRestTemplate testRestTemplate = new TestRestTemplate("user", "passwd");
-        ResponseEntity<String> response = testRestTemplate.getForEntity(URL_SECURED_BY_AUTHENTICATION,
-                String.class);
-        assertThat(response.getStatusCode(), equalTo(HttpStatus.OK));
-    }
-
-    @Test
-    public void givenTestRestTemplateWithBasicAuth_whenSendGetForEntity_thenStatusOk() {
-        TestRestTemplate testRestTemplate = new TestRestTemplate();
-        ResponseEntity<String> response = testRestTemplate.withBasicAuth("user", "passwd").
-                getForEntity(URL_SECURED_BY_AUTHENTICATION, String.class);
-        assertThat(response.getStatusCode(), equalTo(HttpStatus.OK));
-    }
-
-    @Test
-    public void givenTestRestTemplateWithCredentialsAndEnabledCookies_whenSendGetForEntity_thenStatusOk() {
-        TestRestTemplate testRestTemplate = new TestRestTemplate("user", "passwd", TestRestTemplate.
-                HttpClientOption.ENABLE_COOKIES);
-        ResponseEntity<String> response = testRestTemplate.getForEntity(URL_SECURED_BY_AUTHENTICATION,
-                String.class);
-        assertThat(response.getStatusCode(), equalTo(HttpStatus.OK));
-    }
-
-    // HEAD
-    @Test
-    public void givenFooService_whenCallHeadForHeaders_thenReceiveAllHeaders() {
-        TestRestTemplate testRestTemplate = new TestRestTemplate();
-        final HttpHeaders httpHeaders = testRestTemplate.headForHeaders(FOO_RESOURCE_URL);
-        assertTrue(httpHeaders.getContentType().includes(MediaType.APPLICATION_JSON));
-    }
-
-    // POST
-    @Test
-    public void givenService_whenPostForObject_thenCreatedObjectIsReturned() {
-        TestRestTemplate testRestTemplate = new TestRestTemplate("user", "passwd");
-        final RequestBody body = RequestBody.create(okhttp3.MediaType.parse("text/html; charset=utf-8"),
-                "{\"id\":1,\"name\":\"Jim\"}");
-        final Request request = new Request.Builder().url(BASE_URL + "/users/detail").post(body).build();
-        testRestTemplate.postForObject(URL_SECURED_BY_AUTHENTICATION, request, String.class);
-    }
-
-    // PUT
-    @Test
-    public void givenService_whenPutForObject_thenCreatedObjectIsReturned() {
-        TestRestTemplate testRestTemplate = new TestRestTemplate("user", "passwd");
-        final RequestBody body = RequestBody.create(okhttp3.MediaType.parse("text/html; charset=utf-8"),
-                "{\"id\":1,\"name\":\"Jim\"}");
-        final Request request = new Request.Builder().url(BASE_URL + "/users/detail").post(body).build();
-        testRestTemplate.put(URL_SECURED_BY_AUTHENTICATION, request, String.class);
-    }
-
-}
diff --git a/spring-resttemplate/.gitignore b/spring-resttemplate/.gitignore
new file mode 100644
index 0000000000..83c05e60c8
--- /dev/null
+++ b/spring-resttemplate/.gitignore
@@ -0,0 +1,13 @@
+*.class
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+
+# Packaged files #
+*.jar
+*.war
+*.ear
\ No newline at end of file
diff --git a/spring-resttemplate/README.md b/spring-resttemplate/README.md
new file mode 100644
index 0000000000..bf8c56e6ec
--- /dev/null
+++ b/spring-resttemplate/README.md
@@ -0,0 +1,10 @@
+## Spring REST Example Project
+
+### The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring
+
+### Relevant Articles:
+- [Spring RestTemplate Tutorial](http://www.baeldung.com/rest-template)
+- [Exploring the Spring Boot TestRestTemplate](http://www.baeldung.com/spring-boot-testresttemplate)
+- [Spring RestTemplate Error Handling](http://www.baeldung.com/spring-rest-template-error-handling)
+- [Configure a RestTemplate with RestTemplateBuilder](http://www.baeldung.com/spring-rest-template-builder)
\ No newline at end of file
diff --git a/spring-resttemplate/pom.xml b/spring-resttemplate/pom.xml
new file mode 100644
index 0000000000..481104372a
--- /dev/null
+++ b/spring-resttemplate/pom.xml
@@ -0,0 +1,297 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung</groupId>
+    <artifactId>spring-resttemplate</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <name>spring-resttemplate</name>
+    <packaging>war</packaging>
+
+    <parent>
+        <artifactId>parent-boot-1</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-1</relativePath>
+    </parent>
+
+    <dependencies>
+
+        <!-- Spring Boot Dependencies -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Spring -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-oxm</artifactId>
+        </dependency>
+
+        <!-- marshalling -->
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>${xstream.version}</version>
+        </dependency>
+
+        <!-- util -->
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+
+        <!-- logging -->
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <!-- <scope>runtime</scope> -->
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <!-- <scope>runtime</scope> --> <!-- some spring dependencies need to compile against jcl -->
+        </dependency>
+
+        <!-- okhttp -->
+
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>${com.squareup.okhttp3.version}</version>
+        </dependency>
+
+        <!-- test scoped -->
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>spring-resttemplate</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.7.0</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <forkCount>3</forkCount>
+                    <reuseForks>true</reuseForks>
+                    <excludes>
+                        <exclude>**/*IntegrationTest.java</exclude>
+                        <exclude>**/*IntTest.java</exclude>
+                        <exclude>**/*LongRunningUnitTest.java</exclude>
+                        <exclude>**/*ManualTest.java</exclude>
+                        <exclude>**/JdbcTest.java</exclude>
+                        <exclude>**/*LiveTest.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.cargo</groupId>
+                <artifactId>cargo-maven2-plugin</artifactId>
+                <version>${cargo-maven2-plugin.version}</version>
+                <configuration>
+                    <!--<wait>true</wait> caused errors on commit -->
+                    <container>
+                        <containerId>tomcat8x</containerId>
+                        <type>embedded</type>
+                        <systemProperties>
+                            <!-- <provPersistenceTarget>cargo</provPersistenceTarget> -->
+                        </systemProperties>
+                    </container>
+                    <configuration>
+                        <properties>
+                            <cargo.servlet.port>8082</cargo.servlet.port>
+                        </properties>
+                    </configuration>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>integration</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <excludes>
+                                        <exclude>none</exclude>
+                                    </excludes>
+                                    <includes>
+                                        <include>**/*IntegrationTest.java</include>
+                                        <include>**/*IntTest.java</include>
+                                    </includes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>live</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.cargo</groupId>
+                        <artifactId>cargo-maven2-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>start-server</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>stop-server</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <excludes>
+                                        <exclude>none</exclude>
+                                    </excludes>
+                                    <includes>
+                                        <include>**/*LiveTest.java</include>
+                                    </includes>
+                                    <systemPropertyVariables>
+                                        <webTarget>cargo</webTarget>
+                                    </systemPropertyVariables>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <properties>
+        <commons-lang3.version>3.5</commons-lang3.version>
+        <xstream.version>1.4.9</xstream.version>
+
+        <!-- util -->
+        <guava.version>20.0</guava.version>
+
+        <!-- Maven plugins -->
+        <cargo-maven2-plugin.version>1.6.0</cargo-maven2-plugin.version>
+        <findbugs-maven-plugin.version>3.0.4</findbugs-maven-plugin.version>
+
+        <!-- okhttp -->
+        <com.squareup.okhttp3.version>3.4.1</com.squareup.okhttp3.version>
+    </properties>
+
+</project>
diff --git a/spring-rest/src/main/java/org/baeldung/resttemplate/configuration/CustomClientHttpRequestInterceptor.java b/spring-resttemplate/src/main/java/org/baeldung/resttemplate/configuration/CustomClientHttpRequestInterceptor.java
similarity index 100%
rename from spring-rest/src/main/java/org/baeldung/resttemplate/configuration/CustomClientHttpRequestInterceptor.java
rename to spring-resttemplate/src/main/java/org/baeldung/resttemplate/configuration/CustomClientHttpRequestInterceptor.java
diff --git a/spring-rest/src/main/java/org/baeldung/resttemplate/configuration/CustomRestTemplateCustomizer.java b/spring-resttemplate/src/main/java/org/baeldung/resttemplate/configuration/CustomRestTemplateCustomizer.java
similarity index 100%
rename from spring-rest/src/main/java/org/baeldung/resttemplate/configuration/CustomRestTemplateCustomizer.java
rename to spring-resttemplate/src/main/java/org/baeldung/resttemplate/configuration/CustomRestTemplateCustomizer.java
diff --git a/spring-rest/src/main/java/org/baeldung/resttemplate/configuration/HelloController.java b/spring-resttemplate/src/main/java/org/baeldung/resttemplate/configuration/HelloController.java
similarity index 100%
rename from spring-rest/src/main/java/org/baeldung/resttemplate/configuration/HelloController.java
rename to spring-resttemplate/src/main/java/org/baeldung/resttemplate/configuration/HelloController.java
diff --git a/spring-rest/src/main/java/org/baeldung/resttemplate/configuration/RestTemplateConfigurationApplication.java b/spring-resttemplate/src/main/java/org/baeldung/resttemplate/configuration/RestTemplateConfigurationApplication.java
similarity index 100%
rename from spring-rest/src/main/java/org/baeldung/resttemplate/configuration/RestTemplateConfigurationApplication.java
rename to spring-resttemplate/src/main/java/org/baeldung/resttemplate/configuration/RestTemplateConfigurationApplication.java
diff --git a/spring-rest/src/main/java/org/baeldung/resttemplate/configuration/SpringConfig.java b/spring-resttemplate/src/main/java/org/baeldung/resttemplate/configuration/SpringConfig.java
similarity index 100%
rename from spring-rest/src/main/java/org/baeldung/resttemplate/configuration/SpringConfig.java
rename to spring-resttemplate/src/main/java/org/baeldung/resttemplate/configuration/SpringConfig.java
diff --git a/spring-resttemplate/src/main/java/org/baeldung/web/dto/Foo.java b/spring-resttemplate/src/main/java/org/baeldung/web/dto/Foo.java
new file mode 100644
index 0000000000..240b368b50
--- /dev/null
+++ b/spring-resttemplate/src/main/java/org/baeldung/web/dto/Foo.java
@@ -0,0 +1,45 @@
+package org.baeldung.web.dto;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
+@XStreamAlias("Foo")
+public class Foo {
+    private long id;
+    private String name;
+
+    public Foo() {
+        super();
+    }
+
+    public Foo(final String name) {
+        super();
+
+        this.name = name;
+    }
+
+    public Foo(final long id, final String name) {
+        super();
+
+        this.id = id;
+        this.name = name;
+    }
+
+    // API
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(final long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+}
\ No newline at end of file
diff --git a/spring-rest-simple/src/main/java/org/baeldung/web/exception/NotFoundException.java b/spring-resttemplate/src/main/java/org/baeldung/web/exception/NotFoundException.java
similarity index 100%
rename from spring-rest-simple/src/main/java/org/baeldung/web/exception/NotFoundException.java
rename to spring-resttemplate/src/main/java/org/baeldung/web/exception/NotFoundException.java
diff --git a/spring-rest-simple/src/main/java/org/baeldung/web/handler/RestTemplateResponseErrorHandler.java b/spring-resttemplate/src/main/java/org/baeldung/web/handler/RestTemplateResponseErrorHandler.java
similarity index 100%
rename from spring-rest-simple/src/main/java/org/baeldung/web/handler/RestTemplateResponseErrorHandler.java
rename to spring-resttemplate/src/main/java/org/baeldung/web/handler/RestTemplateResponseErrorHandler.java
diff --git a/spring-rest-simple/src/main/java/org/baeldung/web/model/Bar.java b/spring-resttemplate/src/main/java/org/baeldung/web/model/Bar.java
similarity index 100%
rename from spring-rest-simple/src/main/java/org/baeldung/web/model/Bar.java
rename to spring-resttemplate/src/main/java/org/baeldung/web/model/Bar.java
diff --git a/spring-rest-simple/src/main/java/org/baeldung/web/service/BarConsumerService.java b/spring-resttemplate/src/main/java/org/baeldung/web/service/BarConsumerService.java
similarity index 100%
rename from spring-rest-simple/src/main/java/org/baeldung/web/service/BarConsumerService.java
rename to spring-resttemplate/src/main/java/org/baeldung/web/service/BarConsumerService.java
diff --git a/spring-resttemplate/src/main/resources/application.properties b/spring-resttemplate/src/main/resources/application.properties
new file mode 100644
index 0000000000..1a26e3ad99
--- /dev/null
+++ b/spring-resttemplate/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+server.port=8082
+server.servlet.context-path=/spring-rest
\ No newline at end of file
diff --git a/spring-resttemplate/src/main/resources/logback.xml b/spring-resttemplate/src/main/resources/logback.xml
new file mode 100644
index 0000000000..9f48d36486
--- /dev/null
+++ b/spring-resttemplate/src/main/resources/logback.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+    
+    <logger name="org.springframework.web.filter.CommonsRequestLoggingFilter">
+		<level value="DEBUG" />
+	</logger>
+
+    <logger name="org.springframework" level="WARN" />
+    <logger name="org.springframework.transaction" level="WARN" />
+
+    <!-- in order to debug some marshalling issues, this needs to be TRACE -->
+    <logger name="org.springframework.web.servlet.mvc" level="WARN" />
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/spring-resttemplate/src/test/java/org/baeldung/client/Consts.java b/spring-resttemplate/src/test/java/org/baeldung/client/Consts.java
new file mode 100644
index 0000000000..b40561d9c3
--- /dev/null
+++ b/spring-resttemplate/src/test/java/org/baeldung/client/Consts.java
@@ -0,0 +1,5 @@
+package org.baeldung.client;
+
+public interface Consts {
+    int APPLICATION_PORT = 8082;
+}
diff --git a/spring-rest/src/test/java/org/baeldung/client/RestTemplateBasicLiveTest.java b/spring-resttemplate/src/test/java/org/baeldung/client/RestTemplateBasicLiveTest.java
similarity index 100%
rename from spring-rest/src/test/java/org/baeldung/client/RestTemplateBasicLiveTest.java
rename to spring-resttemplate/src/test/java/org/baeldung/client/RestTemplateBasicLiveTest.java
diff --git a/spring-rest-simple/src/test/java/org/baeldung/client/TestRestTemplateBasicLiveTest.java b/spring-resttemplate/src/test/java/org/baeldung/client/TestRestTemplateBasicLiveTest.java
similarity index 100%
rename from spring-rest-simple/src/test/java/org/baeldung/client/TestRestTemplateBasicLiveTest.java
rename to spring-resttemplate/src/test/java/org/baeldung/client/TestRestTemplateBasicLiveTest.java
diff --git a/spring-rest-simple/src/test/java/org/baeldung/web/handler/RestTemplateResponseErrorHandlerIntegrationTest.java b/spring-resttemplate/src/test/java/org/baeldung/web/handler/RestTemplateResponseErrorHandlerIntegrationTest.java
similarity index 100%
rename from spring-rest-simple/src/test/java/org/baeldung/web/handler/RestTemplateResponseErrorHandlerIntegrationTest.java
rename to spring-resttemplate/src/test/java/org/baeldung/web/handler/RestTemplateResponseErrorHandlerIntegrationTest.java
diff --git a/spring-resttemplate/src/test/resources/.gitignore b/spring-resttemplate/src/test/resources/.gitignore
new file mode 100644
index 0000000000..83c05e60c8
--- /dev/null
+++ b/spring-resttemplate/src/test/resources/.gitignore
@@ -0,0 +1,13 @@
+*.class
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+
+# Packaged files #
+*.jar
+*.war
+*.ear
\ No newline at end of file