diff --git a/restservice/src/main/java/com/plannaplan/controllers/AssignmentsController.java b/restservice/src/main/java/com/plannaplan/controllers/AssignmentsController.java
index ca8af01..1ff8570 100755
--- a/restservice/src/main/java/com/plannaplan/controllers/AssignmentsController.java
+++ b/restservice/src/main/java/com/plannaplan/controllers/AssignmentsController.java
@@ -39,8 +39,7 @@ public class AssignmentsController extends TokenBasedController {
 
         if (com.isPresent()) {
             List<Assignment> respone = this.assignmentService.getCommisionAssignments(com.get());
-            return new ResponseEntity<>(AssignmentResponseMappers.mapAssignmentsListToAssignmentResponseList(respone),
-                    HttpStatus.OK);
+            return new ResponseEntity<>(AssignmentResponseMappers.mapToResponse(respone), HttpStatus.OK);
         }
 
         return new ResponseEntity<>(null, HttpStatus.OK);
diff --git a/restservice/src/main/java/com/plannaplan/controllers/CoursesController.java b/restservice/src/main/java/com/plannaplan/controllers/CoursesController.java
index 533b182..204fbc3 100755
--- a/restservice/src/main/java/com/plannaplan/controllers/CoursesController.java
+++ b/restservice/src/main/java/com/plannaplan/controllers/CoursesController.java
@@ -27,7 +27,7 @@ public class CoursesController {
     @GetMapping("/getCourses")
     public ResponseEntity<List<GetCoursesResponse>> getMethodName() {
         List<Course> courses = this.courseService.getAllCourses();
-        List<GetCoursesResponse> response = CoursesResponseMappers.mapCoursesListToCoursesResponseList(courses);
+        List<GetCoursesResponse> response = CoursesResponseMappers.mapToGetCoursesResponse(courses);
         return new ResponseEntity<>(response, HttpStatus.OK);
     }
 
@@ -35,30 +35,9 @@ public class CoursesController {
     public ResponseEntity<List<GetCoursesWithGroupsResponse>> getCoursesWithGroups() {
         final List<Course> courses = this.courseService.getAllCourses();
         final List<GetCoursesWithGroupsResponse> response = CoursesResponseMappers
-                .mapCoursesWithGrtoupsListToCoursesResponseList(courses);
+                .mapToGetCoursesWithGroupsResponse(courses);
         return new ResponseEntity<>(response, HttpStatus.OK);
 
-        // for (Course c : courses) {
-        // Dictionary<String, Object> element = new Hashtable<>();
-        // element.put("id", c.getId());
-        // element.put("name", c.getName());
-        // List<Dictionary<String, Object>> groups = new ArrayList<>();
-        // for (Groups g : c.getGroups()) {
-        // Dictionary<String, Object> group = new Hashtable<>();
-        // group.put("id", g.getId());
-        // group.put("day", g.getDay().label);
-        // group.put("time", g.getTimeString());
-        // group.put("lecturer", g.getLecturer().toString());
-        // group.put("room", g.getRoom());
-        // group.put("type", g.getType());
-        // groups.add(group);
-        // }
-
-        // element.put("groups", groups);
-        // response.add(element);
-        // }
-
-        // return new ResponseEntity<>(response, HttpStatus.OK);
     }
 
 }
\ No newline at end of file
diff --git a/restservice/src/main/java/com/plannaplan/responses/mappers/AssignmentResponseMappers.java b/restservice/src/main/java/com/plannaplan/responses/mappers/AssignmentResponseMappers.java
index b49ddcb..abc7ddc 100755
--- a/restservice/src/main/java/com/plannaplan/responses/mappers/AssignmentResponseMappers.java
+++ b/restservice/src/main/java/com/plannaplan/responses/mappers/AssignmentResponseMappers.java
@@ -9,8 +9,7 @@ import com.plannaplan.responses.models.GetCurrentAssignmentsResponse;
 
 public class AssignmentResponseMappers {
 
-    public static final List<GetCurrentAssignmentsResponse> mapAssignmentsListToAssignmentResponseList(
-            List<Assignment> assignments) {
+    public static final List<GetCurrentAssignmentsResponse> mapToResponse(List<Assignment> assignments) {
         return assignments.stream().filter(Objects::nonNull).map(GetCurrentAssignmentsResponse::new)
                 .collect(Collectors.toList());
     }
diff --git a/restservice/src/main/java/com/plannaplan/responses/mappers/CoursesResponseMappers.java b/restservice/src/main/java/com/plannaplan/responses/mappers/CoursesResponseMappers.java
index 1fb2655..24958c5 100755
--- a/restservice/src/main/java/com/plannaplan/responses/mappers/CoursesResponseMappers.java
+++ b/restservice/src/main/java/com/plannaplan/responses/mappers/CoursesResponseMappers.java
@@ -9,12 +9,11 @@ import com.plannaplan.responses.models.GetCoursesResponse;
 import com.plannaplan.responses.models.GetCoursesWithGroupsResponse;
 
 public class CoursesResponseMappers {
-    public static final List<GetCoursesResponse> mapCoursesListToCoursesResponseList(List<Course> courses) {
+    public static final List<GetCoursesResponse> mapToGetCoursesResponse(List<Course> courses) {
         return courses.stream().filter(Objects::nonNull).map(GetCoursesResponse::new).collect(Collectors.toList());
     }
 
-    public static final List<GetCoursesWithGroupsResponse> mapCoursesWithGrtoupsListToCoursesResponseList(
-            List<Course> courses) {
+    public static final List<GetCoursesWithGroupsResponse> mapToGetCoursesWithGroupsResponse(List<Course> courses) {
         return courses.stream().filter(Objects::nonNull).map(GetCoursesWithGroupsResponse::new)
                 .collect(Collectors.toList());
     }
diff --git a/restservice/src/main/java/com/plannaplan/responses/models/GetCoursesResponse.java b/restservice/src/main/java/com/plannaplan/responses/models/GetCoursesResponse.java
index eb9ffde..565eb80 100755
--- a/restservice/src/main/java/com/plannaplan/responses/models/GetCoursesResponse.java
+++ b/restservice/src/main/java/com/plannaplan/responses/models/GetCoursesResponse.java
@@ -1,6 +1,7 @@
 package com.plannaplan.responses.models;
 
 import com.plannaplan.entities.Course;
+import com.plannaplan.responses.models.abstracts.CoursesResponse;
 
 public class GetCoursesResponse extends CoursesResponse {
 
diff --git a/restservice/src/main/java/com/plannaplan/responses/models/GetCoursesWithGroupsResponse.java b/restservice/src/main/java/com/plannaplan/responses/models/GetCoursesWithGroupsResponse.java
index 3105b95..404366d 100755
--- a/restservice/src/main/java/com/plannaplan/responses/models/GetCoursesWithGroupsResponse.java
+++ b/restservice/src/main/java/com/plannaplan/responses/models/GetCoursesWithGroupsResponse.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.plannaplan.entities.Course;
+import com.plannaplan.responses.models.abstracts.CoursesResponse;
 import com.plannaplan.types.GroupType;
 
 public class GetCoursesWithGroupsResponse extends CoursesResponse {
diff --git a/restservice/src/main/java/com/plannaplan/responses/models/CoursesResponse.java b/restservice/src/main/java/com/plannaplan/responses/models/abstracts/CoursesResponse.java
similarity index 89%
rename from restservice/src/main/java/com/plannaplan/responses/models/CoursesResponse.java
rename to restservice/src/main/java/com/plannaplan/responses/models/abstracts/CoursesResponse.java
index 6e50258..6f1f916 100755
--- a/restservice/src/main/java/com/plannaplan/responses/models/CoursesResponse.java
+++ b/restservice/src/main/java/com/plannaplan/responses/models/abstracts/CoursesResponse.java
@@ -1,4 +1,4 @@
-package com.plannaplan.responses.models;
+package com.plannaplan.responses.models.abstracts;
 
 import com.plannaplan.entities.Course;
 
diff --git a/restservice/src/test/java/com/plannaplan/responses/mappers/AssignmentResponseMappersTest.java b/restservice/src/test/java/com/plannaplan/responses/mappers/AssignmentResponseMappersTest.java
index d92689b..27eb13d 100755
--- a/restservice/src/test/java/com/plannaplan/responses/mappers/AssignmentResponseMappersTest.java
+++ b/restservice/src/test/java/com/plannaplan/responses/mappers/AssignmentResponseMappersTest.java
@@ -18,8 +18,7 @@ public class AssignmentResponseMappersTest {
         final Commision com = new Commision();
         final List<Assignment> groups = Arrays.asList(new Assignment(new Groups(), com),
                 new Assignment(new Groups(), com));
-        final List<GetCurrentAssignmentsResponse> response = AssignmentResponseMappers
-                .mapAssignmentsListToAssignmentResponseList(groups);
+        final List<GetCurrentAssignmentsResponse> response = AssignmentResponseMappers.mapToResponse(groups);
 
         assertTrue(response.size() == 2);
         assertTrue(response instanceof List);
diff --git a/restservice/src/test/java/com/plannaplan/responses/mappers/CoursesResponseMappersTest.java b/restservice/src/test/java/com/plannaplan/responses/mappers/CoursesResponseMappersTest.java
index 9952d4b..60bb9e0 100755
--- a/restservice/src/test/java/com/plannaplan/responses/mappers/CoursesResponseMappersTest.java
+++ b/restservice/src/test/java/com/plannaplan/responses/mappers/CoursesResponseMappersTest.java
@@ -15,7 +15,7 @@ public class CoursesResponseMappersTest {
     @Test
     public void shouldMapListCoursesToResponseList() {
         final List<Course> courses = Arrays.asList(new Course(), new Course());
-        final List<GetCoursesResponse> response = CoursesResponseMappers.mapCoursesListToCoursesResponseList(courses);
+        final List<GetCoursesResponse> response = CoursesResponseMappers.mapToGetCoursesResponse(courses);
 
         assertTrue(response.size() == 2);
         assertTrue(response.get(0) instanceof GetCoursesResponse);
@@ -26,7 +26,7 @@ public class CoursesResponseMappersTest {
     public void shouldMapListCoursesToResponseWithGroupsList() {
         final List<Course> courses = Arrays.asList(new Course(), new Course());
         final List<GetCoursesWithGroupsResponse> response = CoursesResponseMappers
-                .mapCoursesWithGrtoupsListToCoursesResponseList(courses);
+                .mapToGetCoursesWithGroupsResponse(courses);
 
         assertTrue(response.size() == 2);
         assertTrue(response.get(0) instanceof GetCoursesWithGroupsResponse);