diff --git a/erpnext/docs/assets/img/schools/admission/__init__.py b/erpnext/docs/assets/img/schools/admission/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/erpnext/docs/assets/img/schools/student/program-enrollment.png b/erpnext/docs/assets/img/schools/admission/program-enrollment.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/student/program-enrollment.png
rename to erpnext/docs/assets/img/schools/admission/program-enrollment.png
diff --git a/erpnext/docs/assets/img/schools/student/student-applicant-enroll.png b/erpnext/docs/assets/img/schools/admission/student-applicant-enroll.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/student/student-applicant-enroll.png
rename to erpnext/docs/assets/img/schools/admission/student-applicant-enroll.png
diff --git a/erpnext/docs/assets/img/schools/admission/student-applicant.png b/erpnext/docs/assets/img/schools/admission/student-applicant.png
new file mode 100644
index 0000000000..aa10807750
Binary files /dev/null and b/erpnext/docs/assets/img/schools/admission/student-applicant.png differ
diff --git a/erpnext/docs/assets/img/schools/module.png b/erpnext/docs/assets/img/schools/module.png
new file mode 100644
index 0000000000..eae84b384c
Binary files /dev/null and b/erpnext/docs/assets/img/schools/module.png differ
diff --git a/erpnext/docs/assets/img/schools/student/student-applicant.png b/erpnext/docs/assets/img/schools/student/student-applicant.png
deleted file mode 100644
index 4834cf6acb..0000000000
Binary files a/erpnext/docs/assets/img/schools/student/student-applicant.png and /dev/null differ
diff --git a/erpnext/docs/assets/img/schools/student/student-batch.png b/erpnext/docs/assets/img/schools/student/student-batch.png
new file mode 100644
index 0000000000..75a33140cc
Binary files /dev/null and b/erpnext/docs/assets/img/schools/student/student-batch.png differ
diff --git a/erpnext/docs/assets/img/schools/student/student-group.png b/erpnext/docs/assets/img/schools/student/student-group.png
index 894ef918e7..c562b00132 100644
Binary files a/erpnext/docs/assets/img/schools/student/student-group.png and b/erpnext/docs/assets/img/schools/student/student-group.png differ
diff --git a/erpnext/docs/assets/img/schools/student/student-log.png b/erpnext/docs/assets/img/schools/student/student-log.png
new file mode 100644
index 0000000000..ba89b78376
Binary files /dev/null and b/erpnext/docs/assets/img/schools/student/student-log.png differ
diff --git a/erpnext/docs/assets/img/schools/student/student-section.png b/erpnext/docs/assets/img/schools/student/student-section.png
deleted file mode 100644
index 009443d066..0000000000
Binary files a/erpnext/docs/assets/img/schools/student/student-section.png and /dev/null differ
diff --git a/erpnext/docs/assets/img/schools/student/student.png b/erpnext/docs/assets/img/schools/student/student.png
index 79dc0f993d..af3e78e595 100644
Binary files a/erpnext/docs/assets/img/schools/student/student.png and b/erpnext/docs/assets/img/schools/student/student.png differ
diff --git a/erpnext/docs/user/manual/en/schools/admission/__init__.py b/erpnext/docs/user/manual/en/schools/admission/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/erpnext/docs/user/manual/en/schools/admission/index.md b/erpnext/docs/user/manual/en/schools/admission/index.md
new file mode 100644
index 0000000000..87cdfe5c89
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/admission/index.md
@@ -0,0 +1,7 @@
+# Admission
+
+This section contains student admission related documents.
+
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/admission/index.txt b/erpnext/docs/user/manual/en/schools/admission/index.txt
new file mode 100644
index 0000000000..ec9e768116
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/admission/index.txt
@@ -0,0 +1,2 @@
+student-applicant
+program-enrollment
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/student/program-enrollment.md b/erpnext/docs/user/manual/en/schools/admission/program-enrollment.md
similarity index 72%
rename from erpnext/docs/user/manual/en/schools/student/program-enrollment.md
rename to erpnext/docs/user/manual/en/schools/admission/program-enrollment.md
index 2c8ec12327..060033cba0 100644
--- a/erpnext/docs/user/manual/en/schools/student/program-enrollment.md
+++ b/erpnext/docs/user/manual/en/schools/admission/program-enrollment.md
@@ -1,5 +1,5 @@
This form allows you to enroll a student to a program. A student can be enrolled to multiple programs.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/schools/student/student-applicant.md b/erpnext/docs/user/manual/en/schools/admission/student-applicant.md
similarity index 91%
rename from erpnext/docs/user/manual/en/schools/student/student-applicant.md
rename to erpnext/docs/user/manual/en/schools/admission/student-applicant.md
index cd4426c23e..2b33cf957f 100644
--- a/erpnext/docs/user/manual/en/schools/student/student-applicant.md
+++ b/erpnext/docs/user/manual/en/schools/admission/student-applicant.md
@@ -3,7 +3,7 @@
A Student Applicant record needs to be created when a student applies for a program at your institute.
You can Approve or Reject a student applicant. By accepting a student applicant you can add them to the student master.
-
+
### Application Status
@@ -23,6 +23,6 @@ You can Approve or Reject a student applicant. By accepting a student applicant
Once you approve a Student Applicant you can enroll them to a program. When you click the 'Enroll' buttom,
the system shall create a student against that applicant and redirect you to the [Program Enrollment form]({{docs_base_url}}/user/manual/en/schools/student/program-enrollment.html).
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/schools/index.md b/erpnext/docs/user/manual/en/schools/index.md
index 0dff60b400..e2172ff916 100644
--- a/erpnext/docs/user/manual/en/schools/index.md
+++ b/erpnext/docs/user/manual/en/schools/index.md
@@ -1 +1,6 @@
+
+The School Modules is designed to meet requirements of Schools, Colleges & Educational Institutes.
+
+
+
{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/index.txt b/erpnext/docs/user/manual/en/schools/index.txt
index 780bfa58a6..f054827e5e 100644
--- a/erpnext/docs/user/manual/en/schools/index.txt
+++ b/erpnext/docs/user/manual/en/schools/index.txt
@@ -1,4 +1,5 @@
student
+admission
schedule
fees
setup
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/student/index.md b/erpnext/docs/user/manual/en/schools/student/index.md
index 12d8b82431..5e2d153c40 100644
--- a/erpnext/docs/user/manual/en/schools/student/index.md
+++ b/erpnext/docs/user/manual/en/schools/student/index.md
@@ -2,8 +2,6 @@
This section contains student related documents.
-
-
### Topics
{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/student/index.txt b/erpnext/docs/user/manual/en/schools/student/index.txt
index 1e341417c8..9b31be4dc9 100644
--- a/erpnext/docs/user/manual/en/schools/student/index.txt
+++ b/erpnext/docs/user/manual/en/schools/student/index.txt
@@ -1,5 +1,5 @@
-student-applicant
student
-program-enrollment
+student-log
+student-batch
student-group
student-group-creation-tool
diff --git a/erpnext/docs/user/manual/en/schools/student/student-batch.md b/erpnext/docs/user/manual/en/schools/student/student-batch.md
new file mode 100644
index 0000000000..0f29d46031
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/student/student-batch.md
@@ -0,0 +1,7 @@
+# Student Batch
+
+Student batch is a collection of students from Student Groups.
+
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/schools/student/student-log.md b/erpnext/docs/user/manual/en/schools/student/student-log.md
new file mode 100644
index 0000000000..787dacb471
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/student/student-log.md
@@ -0,0 +1,8 @@
+# Student Log
+
+You can make a note of student activities using student log.
+Logs can be categorised as 'General', 'Academic', 'Medical' or 'Achievement'
+
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/schools/student/student.md b/erpnext/docs/user/manual/en/schools/student/student.md
index d0b1089630..a86d36e8cc 100644
--- a/erpnext/docs/user/manual/en/schools/student/student.md
+++ b/erpnext/docs/user/manual/en/schools/student/student.md
@@ -1,7 +1,7 @@
# Student
-A Student is defined as a person who has enrolled at your institute and you have accepted their application.
-The student doctype maintains personal details of the student.
+A Student is a person who has enrolled at your institute and you have accepted their application.
+The student doctype maintains personal details of the student.
You can view everything related to a particular student on this page. Eg : Fees, Student Group, etc