diff --git a/spring-rest-angular-pagination/StudentDirectory/pom.xml b/spring-rest-angular-pagination/pom.xml
similarity index 100%
rename from spring-rest-angular-pagination/StudentDirectory/pom.xml
rename to spring-rest-angular-pagination/pom.xml
diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/mock/MockStudentData.java b/spring-rest-angular-pagination/src/main/java/org/baeldung/mock/MockStudentData.java
similarity index 100%
rename from spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/mock/MockStudentData.java
rename to spring-rest-angular-pagination/src/main/java/org/baeldung/mock/MockStudentData.java
diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java b/spring-rest-angular-pagination/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java
similarity index 100%
rename from spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java
rename to spring-rest-angular-pagination/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java
diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/main/Application.java b/spring-rest-angular-pagination/src/main/java/org/baeldung/web/main/Application.java
similarity index 100%
rename from spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/main/Application.java
rename to spring-rest-angular-pagination/src/main/java/org/baeldung/web/main/Application.java
diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/rest/StudentDirectoryRestController.java b/spring-rest-angular-pagination/src/main/java/org/baeldung/web/rest/StudentDirectoryRestController.java
similarity index 100%
rename from spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/rest/StudentDirectoryRestController.java
rename to spring-rest-angular-pagination/src/main/java/org/baeldung/web/rest/StudentDirectoryRestController.java
diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/service/IOperations.java b/spring-rest-angular-pagination/src/main/java/org/baeldung/web/service/IOperations.java
similarity index 100%
rename from spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/service/IOperations.java
rename to spring-rest-angular-pagination/src/main/java/org/baeldung/web/service/IOperations.java
diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/service/StudentService.java b/spring-rest-angular-pagination/src/main/java/org/baeldung/web/service/StudentService.java
similarity index 100%
rename from spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/service/StudentService.java
rename to spring-rest-angular-pagination/src/main/java/org/baeldung/web/service/StudentService.java
diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/service/StudentServiceImpl.java b/spring-rest-angular-pagination/src/main/java/org/baeldung/web/service/StudentServiceImpl.java
similarity index 100%
rename from spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/service/StudentServiceImpl.java
rename to spring-rest-angular-pagination/src/main/java/org/baeldung/web/service/StudentServiceImpl.java
diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/vo/Student.java b/spring-rest-angular-pagination/src/main/java/org/baeldung/web/vo/Student.java
similarity index 100%
rename from spring-rest-angular-pagination/StudentDirectory/src/main/java/org/baeldung/web/vo/Student.java
rename to spring-rest-angular-pagination/src/main/java/org/baeldung/web/vo/Student.java
diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/resources/application.properties b/spring-rest-angular-pagination/src/main/resources/application.properties
similarity index 100%
rename from spring-rest-angular-pagination/StudentDirectory/src/main/resources/application.properties
rename to spring-rest-angular-pagination/src/main/resources/application.properties
diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/webapp/WEB-INF/web.xml b/spring-rest-angular-pagination/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from spring-rest-angular-pagination/StudentDirectory/src/main/webapp/WEB-INF/web.xml
rename to spring-rest-angular-pagination/src/main/webapp/WEB-INF/web.xml
diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/webapp/index.html b/spring-rest-angular-pagination/src/main/webapp/index.html
similarity index 100%
rename from spring-rest-angular-pagination/StudentDirectory/src/main/webapp/index.html
rename to spring-rest-angular-pagination/src/main/webapp/index.html
diff --git a/spring-rest-angular-pagination/StudentDirectory/src/main/webapp/view/app.js b/spring-rest-angular-pagination/src/main/webapp/view/app.js
similarity index 100%
rename from spring-rest-angular-pagination/StudentDirectory/src/main/webapp/view/app.js
rename to spring-rest-angular-pagination/src/main/webapp/view/app.js
diff --git a/spring-rest-angular-pagination/StudentDirectory/src/test/java/org/baeldung/web/service/StudentServiceTest.java b/spring-rest-angular-pagination/src/test/java/org/baeldung/web/service/StudentServiceTest.java
similarity index 79%
rename from spring-rest-angular-pagination/StudentDirectory/src/test/java/org/baeldung/web/service/StudentServiceTest.java
rename to spring-rest-angular-pagination/src/test/java/org/baeldung/web/service/StudentServiceTest.java
index 55855c4c7d..da3a36cf7a 100644
--- a/spring-rest-angular-pagination/StudentDirectory/src/test/java/org/baeldung/web/service/StudentServiceTest.java
+++ b/spring-rest-angular-pagination/src/test/java/org/baeldung/web/service/StudentServiceTest.java
@@ -1,30 +1,17 @@
 package org.baeldung.web.service;
 
-import static io.restassured.RestAssured.given;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.IsCollectionContaining.hasItems;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.hamcrest.core.StringContains.containsString;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.springframework.http.MediaType.APPLICATION_JSON;
-import static org.springframework.util.Assert.isTrue;
-
 import org.apache.commons.lang3.RandomStringUtils;
 import org.baeldung.web.main.Application;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.IntegrationTest;
 import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.boot.test.TestRestTemplate;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
-import io.restassured.RestAssured;
-import io.restassured.response.Response;
-import org.springframework.web.client.RestTemplate;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.core.IsCollectionContaining.hasItems;
+import static org.hamcrest.core.IsEqual.equalTo;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = Application.class)
@@ -32,7 +19,7 @@ import org.springframework.web.client.RestTemplate;
 @IntegrationTest("server.port:8888")
 public class StudentServiceTest {
 
-    private static final String ENDPOINT = "http://localhost:8080/StudentDirectory/student/get";
+    private static final String ENDPOINT = "http://localhost:8888/StudentDirectory/student/get";
 
     @Test
     public void givenRequestForStudents_whenPageIsOne_expectContainsNames() {
@@ -76,6 +63,13 @@ public class StudentServiceTest {
                 .statusCode(500);
     }
 
+    @Test
+    public void givenRequestForStudents_whenPageIsFive_expectFiveItems() {
+        given().params("page", "1", "size", "5").get(ENDPOINT)
+                .then()
+                .body("content.studentId.max()", equalTo("5"));
+    }
+
     @Test
     public void givenResourcesExist_whenFirstPageIsRetrieved_thenPageContainsResources() {
         given().params("page", "1", "size", "2").get(ENDPOINT)
@@ -83,10 +77,4 @@ public class StudentServiceTest {
                 .assertThat().body("first", equalTo(true));
     }
 
-    @Test
-    public void givenRequestForStudents_whenPageIsFive_expectFiveItems() {
-        given().params("page", "1", "size", "5").get(ENDPOINT)
-                .then()
-                .body("content.studentId.max()", equalTo("5"));
-    }
 }