diff --git a/src/main/java/org/wikitolearn/midtier/course/entity/dto/out/AddedCourseChaptersDto.java b/src/main/java/org/wikitolearn/midtier/course/entity/dto/out/AddedCourseChaptersDto.java
index 0050e43..9c6a502 100644
--- a/src/main/java/org/wikitolearn/midtier/course/entity/dto/out/AddedCourseChaptersDto.java
+++ b/src/main/java/org/wikitolearn/midtier/course/entity/dto/out/AddedCourseChaptersDto.java
@@ -1,54 +1,57 @@
 package org.wikitolearn.midtier.course.entity.dto.out;
 
 import java.util.Date;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_DEFAULT)
 public class AddedCourseChaptersDto {
   
   @JsonProperty("_id")
   private String id;
 
   @JsonProperty("_etag")
   private String etag;
 
   @JsonProperty("_version")
   private int version;
 
   @JsonProperty("_latest_version")
   private int latestVersion;
 
   @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "EEE, dd MMM yyyy HH:mm:ss z")
   @JsonProperty("_updated")
   private Date updated;
 
   @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "EEE, dd MMM yyyy HH:mm:ss z")
   @JsonProperty("_created")
   private Date created;
   
   private List<ChapterInAddedCourseChapters> chapters;
   
   @Data
   @NoArgsConstructor
   @JsonIgnoreProperties(ignoreUnknown = true)
   @JsonInclude(Include.NON_DEFAULT)
   public static final class ChapterInAddedCourseChapters {
     @JsonProperty("_id")
     private String id;
+    
+    @JsonProperty("_etag")
+    private String etag;
 
     @JsonProperty("_version")
     private int version;
   }
 }
diff --git a/src/main/java/org/wikitolearn/midtier/course/entity/dto/out/AddedCourseChaptersDto.java b/src/main/java/org/wikitolearn/midtier/course/entity/dto/out/GetChapterDto.java
similarity index 81%
copy from src/main/java/org/wikitolearn/midtier/course/entity/dto/out/AddedCourseChaptersDto.java
copy to src/main/java/org/wikitolearn/midtier/course/entity/dto/out/GetChapterDto.java
index 0050e43..ac8709d 100644
--- a/src/main/java/org/wikitolearn/midtier/course/entity/dto/out/AddedCourseChaptersDto.java
+++ b/src/main/java/org/wikitolearn/midtier/course/entity/dto/out/GetChapterDto.java
@@ -1,54 +1,64 @@
 package org.wikitolearn.midtier.course.entity.dto.out;
 
 import java.util.Date;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_DEFAULT)
-public class AddedCourseChaptersDto {
-  
+public class GetChapterDto {
   @JsonProperty("_id")
   private String id;
 
   @JsonProperty("_etag")
   private String etag;
 
   @JsonProperty("_version")
   private int version;
 
   @JsonProperty("_latest_version")
   private int latestVersion;
 
   @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "EEE, dd MMM yyyy HH:mm:ss z")
   @JsonProperty("_updated")
   private Date updated;
 
   @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "EEE, dd MMM yyyy HH:mm:ss z")
   @JsonProperty("_created")
   private Date created;
-  
-  private List<ChapterInAddedCourseChapters> chapters;
-  
+
+  private String title;
+
+  private List<String> authors;
+
+  private String language;
+
+  private List<PageInChapter> pages;
+
   @Data
   @NoArgsConstructor
   @JsonIgnoreProperties(ignoreUnknown = true)
   @JsonInclude(Include.NON_DEFAULT)
-  public static final class ChapterInAddedCourseChapters {
+  public static final class PageInChapter {
     @JsonProperty("_id")
     private String id;
+    
+    @JsonProperty("_etag")
+    private String etag;
 
     @JsonProperty("_version")
     private int version;
+
+    private String title;
   }
 }
diff --git a/src/main/java/org/wikitolearn/midtier/course/entity/dto/in/GetCourseDto.java b/src/main/java/org/wikitolearn/midtier/course/entity/dto/out/GetCourseDto.java
similarity index 91%
rename from src/main/java/org/wikitolearn/midtier/course/entity/dto/in/GetCourseDto.java
rename to src/main/java/org/wikitolearn/midtier/course/entity/dto/out/GetCourseDto.java
index f545423..c199f46 100644
--- a/src/main/java/org/wikitolearn/midtier/course/entity/dto/in/GetCourseDto.java
+++ b/src/main/java/org/wikitolearn/midtier/course/entity/dto/out/GetCourseDto.java
@@ -1,77 +1,83 @@
-package org.wikitolearn.midtier.course.entity.dto.in;
+package org.wikitolearn.midtier.course.entity.dto.out;
 
 import java.util.Date;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_DEFAULT)
 public class GetCourseDto {
   @JsonProperty("_id")
   private String id;
 
   @JsonProperty("_etag")
   private String etag;
 
   @JsonProperty("_version")
   private int version;
 
   @JsonProperty("_latest_version")
   private int latestVersion;
 
   @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "EEE, dd MMM yyyy HH:mm:ss z")
   @JsonProperty("_updated")
   private Date updated;
 
   @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "EEE, dd MMM yyyy HH:mm:ss z")
   @JsonProperty("_created")
   private Date created;
 
   private String title;
 
   private List<String> authors;
 
   private String language;
 
   private List<ChapterInCourse> chapters;
 
   @Data
   @NoArgsConstructor
   @JsonIgnoreProperties(ignoreUnknown = true)
   @JsonInclude(Include.NON_DEFAULT)
   public static final class ChapterInCourse {
     @JsonProperty("_id")
     private String id;
+    
+    @JsonProperty("_etag")
+    private String etag;
 
     @JsonProperty("_version")
     private int version;
 
     private String title;
 
     private List<PageInChapter> pages;
 
     @Data
     @NoArgsConstructor
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(Include.NON_DEFAULT)
     public static final class PageInChapter {
       @JsonProperty("_id")
       private String id;
+      
+      @JsonProperty("_etag")
+      private String etag;
 
       @JsonProperty("_version")
       private int version;
 
       private String title;
     }
   }
 }
diff --git a/src/main/java/org/wikitolearn/midtier/course/entity/dto/in/GetCourseVersionsDto.java b/src/main/java/org/wikitolearn/midtier/course/entity/dto/out/GetCourseVersionsDto.java
similarity index 96%
rename from src/main/java/org/wikitolearn/midtier/course/entity/dto/in/GetCourseVersionsDto.java
rename to src/main/java/org/wikitolearn/midtier/course/entity/dto/out/GetCourseVersionsDto.java
index 0675d07..f16fa97 100644
--- a/src/main/java/org/wikitolearn/midtier/course/entity/dto/in/GetCourseVersionsDto.java
+++ b/src/main/java/org/wikitolearn/midtier/course/entity/dto/out/GetCourseVersionsDto.java
@@ -1,62 +1,62 @@
-package org.wikitolearn.midtier.course.entity.dto.in;
+package org.wikitolearn.midtier.course.entity.dto.out;
 
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 import org.wikitolearn.midtier.course.entity.Link;
 import org.wikitolearn.midtier.course.entity.Meta;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_DEFAULT)
 public class GetCourseVersionsDto {
   @JsonProperty("_items")
   List<CourseVersionInListDto> items;
 
   @JsonProperty("_meta")
   Meta meta;
 
   @JsonProperty("_links")
   Map<String, Link> links;
 
   @Data
   @NoArgsConstructor
   @JsonIgnoreProperties(ignoreUnknown = true)
   @JsonInclude(Include.NON_DEFAULT)
   public static final class CourseVersionInListDto {
     @JsonProperty("_id")
     private String id;
 
     @JsonProperty("_etag")
     private String etag;
 
     @JsonProperty("_version")
     private int version;
 
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "EEE, dd MMM yyyy HH:mm:ss z")
     @JsonProperty("_updated")
     private Date updated;
 
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "EEE, dd MMM yyyy HH:mm:ss z")
     @JsonProperty("_created")
     private Date created;
 
     private String title;
 
     private List<String> authors;
 
     private String language;
 
   }
 }
diff --git a/src/main/java/org/wikitolearn/midtier/course/entity/dto/in/GetCoursesDto.java b/src/main/java/org/wikitolearn/midtier/course/entity/dto/out/GetCoursesDto.java
similarity index 96%
rename from src/main/java/org/wikitolearn/midtier/course/entity/dto/in/GetCoursesDto.java
rename to src/main/java/org/wikitolearn/midtier/course/entity/dto/out/GetCoursesDto.java
index b52a202..a301e85 100644
--- a/src/main/java/org/wikitolearn/midtier/course/entity/dto/in/GetCoursesDto.java
+++ b/src/main/java/org/wikitolearn/midtier/course/entity/dto/out/GetCoursesDto.java
@@ -1,65 +1,65 @@
-package org.wikitolearn.midtier.course.entity.dto.in;
+package org.wikitolearn.midtier.course.entity.dto.out;
 
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 import org.wikitolearn.midtier.course.entity.Link;
 import org.wikitolearn.midtier.course.entity.Meta;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_DEFAULT)
 public class GetCoursesDto {
   @JsonProperty("_items")
   List<CourseInListDto> items;
 
   @JsonProperty("_meta")
   Meta meta;
 
   @JsonProperty("_links")
   Map<String, Link> links;
 
   @Data
   @NoArgsConstructor
   @JsonIgnoreProperties(ignoreUnknown = true)
   @JsonInclude(Include.NON_DEFAULT)
   public static final class CourseInListDto {
     @JsonProperty("_id")
     private String id;
 
     @JsonProperty("_etag")
     private String etag;
 
     @JsonProperty("_version")
     private int version;
 
     @JsonProperty("_latest_version")
     private int latestVersion;
 
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "EEE, dd MMM yyyy HH:mm:ss z")
     @JsonProperty("_updated")
     private Date updated;
 
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "EEE, dd MMM yyyy HH:mm:ss z")
     @JsonProperty("_created")
     private Date created;
 
     private String title;
 
     private List<String> authors;
 
     private String language;
 
   }
 }