diff --git a/community/community/doctype/community_course/community_course.py b/community/community/doctype/community_course/community_course.py
deleted file mode 100644
index 0aebc502..00000000
--- a/community/community/doctype/community_course/community_course.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2021, Frappe and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-# import frappe
-from frappe.website.website_generator import WebsiteGenerator
-
-class CommunityCourse(WebsiteGenerator):
-	pass
diff --git a/community/community/doctype/community_course/templates/community_course.html b/community/community/doctype/community_course/templates/community_course.html
deleted file mode 100644
index 14cb508c..00000000
--- a/community/community/doctype/community_course/templates/community_course.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% extends "templates/web.html" %}
-
-{% block page_content %}
-
-<ol class="breadcrumb" itemscope="" itemtype="http://schema.org/BreadcrumbList">
-  <li itemprop="itemListElement" itemscope="" itemtype="http://schema.org/ListItem" class="breadcrumb-item">
-    <a itemprop="item" href="/courses">
-      <span itemprop="name">&larr; Courses</span>
-      <meta itemprop="position" content="1">
-    </a>
-    <span itemprop="item">
-  </li>
-</ol>
-
-<h1>{{ title }}</h1>
-
-{{description}}
-
-{% endblock %}
-
-<!-- this is a sample default web page template -->
\ No newline at end of file
diff --git a/community/community/doctype/community_course/templates/community_course_row.html b/community/community/doctype/community_course/templates/community_course_row.html
deleted file mode 100644
index b1d1de4c..00000000
--- a/community/community/doctype/community_course/templates/community_course_row.html
+++ /dev/null
@@ -1,7 +0,0 @@
-  <div class="card" style="width: 100%; margin: 5px 0px">
-	<div class="card-body">
-	  <h5 class="card-title"><a href="{{doc.route}}">{{doc.title}}</a></h5>
-	  <p class="card-text">{{doc.description}}</p>
-	  <a href="{{doc.route}}" class="card-link">See more &rarr;</a>
-	</div>
-  </div>
diff --git a/community/community/doctype/community_course_topic/community_course_topic.py b/community/community/doctype/community_course_topic/community_course_topic.py
deleted file mode 100644
index 69c69fab..00000000
--- a/community/community/doctype/community_course_topic/community_course_topic.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2021, Frappe and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-# import frappe
-from frappe.website.website_generator import WebsiteGenerator
-
-class CommunityCourseTopic(WebsiteGenerator):
-	pass
diff --git a/community/community/doctype/community_course_topic/templates/community_course_lession.html b/community/community/doctype/community_course_topic/templates/community_course_lession.html
deleted file mode 100644
index db123090..00000000
--- a/community/community/doctype/community_course_topic/templates/community_course_lession.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends "templates/web.html" %}
-
-{% block page_content %}
-<h1>{{ title }}</h1>
-{% endblock %}
-
-<!-- this is a sample default web page template -->
\ No newline at end of file
diff --git a/community/community/doctype/community_course_topic/templates/community_course_lession_row.html b/community/community/doctype/community_course_topic/templates/community_course_lession_row.html
deleted file mode 100644
index d7014b45..00000000
--- a/community/community/doctype/community_course_topic/templates/community_course_lession_row.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-	<a href="{{ doc.route }}">{{ doc.title or doc.name }}</a>
-</div>
-<!-- this is a sample default list template -->
diff --git a/community/community/doctype/community_course/__init__.py b/community/lms/doctype/__init__.py
similarity index 100%
rename from community/community/doctype/community_course/__init__.py
rename to community/lms/doctype/__init__.py
diff --git a/community/community/doctype/community_course_enrollment/__init__.py b/community/lms/doctype/community_course/__init__.py
similarity index 100%
rename from community/community/doctype/community_course_enrollment/__init__.py
rename to community/lms/doctype/community_course/__init__.py
diff --git a/community/community/doctype/community_course/community_course.js b/community/lms/doctype/community_course/community_course.js
similarity index 52%
rename from community/community/doctype/community_course/community_course.js
rename to community/lms/doctype/community_course/community_course.js
index c1f014ed..41ff356a 100644
--- a/community/community/doctype/community_course/community_course.js
+++ b/community/lms/doctype/community_course/community_course.js
@@ -1,5 +1,8 @@
-// Copyright (c) 2021, Frappe and contributors
+// Copyright (c) 2021, FOSS United and contributors
 // For license information, please see license.txt
 
 frappe.ui.form.on('Community Course', {
+	// refresh: function(frm) {
+
+	// }
 });
diff --git a/community/community/doctype/community_course/community_course.json b/community/lms/doctype/community_course/community_course.json
similarity index 94%
rename from community/community/doctype/community_course/community_course.json
rename to community/lms/doctype/community_course/community_course.json
index 3e0a4b07..7030bb10 100644
--- a/community/community/doctype/community_course/community_course.json
+++ b/community/lms/doctype/community_course/community_course.json
@@ -36,9 +36,9 @@
  "index_web_pages_for_search": 1,
  "is_published_field": "is_published",
  "links": [],
- "modified": "2021-03-02 12:25:25.235975",
+ "modified": "2021-03-05 11:01:09.327111",
  "modified_by": "Administrator",
- "module": "Community",
+ "module": "LMS",
  "name": "Community Course",
  "owner": "Administrator",
  "permissions": [
diff --git a/community/lms/doctype/community_course/community_course.py b/community/lms/doctype/community_course/community_course.py
new file mode 100644
index 00000000..57ed1bd0
--- /dev/null
+++ b/community/lms/doctype/community_course/community_course.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2021, FOSS United and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class CommunityCourse(Document):
+	pass
diff --git a/community/community/doctype/community_course/test_community_course.py b/community/lms/doctype/community_course/test_community_course.py
similarity index 76%
rename from community/community/doctype/community_course/test_community_course.py
rename to community/lms/doctype/community_course/test_community_course.py
index 4fee6c4b..06e9400e 100644
--- a/community/community/doctype/community_course/test_community_course.py
+++ b/community/lms/doctype/community_course/test_community_course.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2021, Frappe and Contributors
+# Copyright (c) 2021, FOSS United and Contributors
 # See license.txt
 from __future__ import unicode_literals
 
diff --git a/community/community/doctype/community_course_topic/__init__.py b/community/lms/doctype/community_course_enrollment/__init__.py
similarity index 100%
rename from community/community/doctype/community_course_topic/__init__.py
rename to community/lms/doctype/community_course_enrollment/__init__.py
diff --git a/community/community/doctype/community_course_enrollment/community_course_enrollment.js b/community/lms/doctype/community_course_enrollment/community_course_enrollment.js
similarity index 73%
rename from community/community/doctype/community_course_enrollment/community_course_enrollment.js
rename to community/lms/doctype/community_course_enrollment/community_course_enrollment.js
index 9eaf784d..8909e117 100644
--- a/community/community/doctype/community_course_enrollment/community_course_enrollment.js
+++ b/community/lms/doctype/community_course_enrollment/community_course_enrollment.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, Frappe and contributors
+// Copyright (c) 2021, FOSS United and contributors
 // For license information, please see license.txt
 
 frappe.ui.form.on('Community Course Enrollment', {
diff --git a/community/community/doctype/community_course_enrollment/community_course_enrollment.json b/community/lms/doctype/community_course_enrollment/community_course_enrollment.json
similarity index 93%
rename from community/community/doctype/community_course_enrollment/community_course_enrollment.json
rename to community/lms/doctype/community_course_enrollment/community_course_enrollment.json
index bd4e583d..c375c249 100644
--- a/community/community/doctype/community_course_enrollment/community_course_enrollment.json
+++ b/community/lms/doctype/community_course_enrollment/community_course_enrollment.json
@@ -24,9 +24,9 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-03-04 18:24:22.654503",
+ "modified": "2021-03-05 11:00:53.879144",
  "modified_by": "Administrator",
- "module": "Community",
+ "module": "LMS",
  "name": "Community Course Enrollment",
  "owner": "Administrator",
  "permissions": [
diff --git a/community/community/doctype/community_course_enrollment/community_course_enrollment.py b/community/lms/doctype/community_course_enrollment/community_course_enrollment.py
similarity index 81%
rename from community/community/doctype/community_course_enrollment/community_course_enrollment.py
rename to community/lms/doctype/community_course_enrollment/community_course_enrollment.py
index 32025965..c5e4fc78 100644
--- a/community/community/doctype/community_course_enrollment/community_course_enrollment.py
+++ b/community/lms/doctype/community_course_enrollment/community_course_enrollment.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2021, Frappe and contributors
+# Copyright (c) 2021, FOSS United and contributors
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
diff --git a/community/community/doctype/community_course_enrollment/test_community_course_enrollment.py b/community/lms/doctype/community_course_enrollment/test_community_course_enrollment.py
similarity index 77%
rename from community/community/doctype/community_course_enrollment/test_community_course_enrollment.py
rename to community/lms/doctype/community_course_enrollment/test_community_course_enrollment.py
index 3cec732d..438a8e20 100644
--- a/community/community/doctype/community_course_enrollment/test_community_course_enrollment.py
+++ b/community/lms/doctype/community_course_enrollment/test_community_course_enrollment.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2021, Frappe and Contributors
+# Copyright (c) 2021, FOSS United and Contributors
 # See license.txt
 from __future__ import unicode_literals
 
diff --git a/community/lms/doctype/community_course_topic/__init__.py b/community/lms/doctype/community_course_topic/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/community/community/doctype/community_course_topic/community_course_topic.js b/community/lms/doctype/community_course_topic/community_course_topic.js
similarity index 72%
rename from community/community/doctype/community_course_topic/community_course_topic.js
rename to community/lms/doctype/community_course_topic/community_course_topic.js
index 933ff0d8..0a880bf3 100644
--- a/community/community/doctype/community_course_topic/community_course_topic.js
+++ b/community/lms/doctype/community_course_topic/community_course_topic.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, Frappe and contributors
+// Copyright (c) 2021, FOSS United and contributors
 // For license information, please see license.txt
 
 frappe.ui.form.on('Community Course Topic', {
diff --git a/community/community/doctype/community_course_topic/community_course_topic.json b/community/lms/doctype/community_course_topic/community_course_topic.json
similarity index 94%
rename from community/community/doctype/community_course_topic/community_course_topic.json
rename to community/lms/doctype/community_course_topic/community_course_topic.json
index 46be90be..208162c1 100644
--- a/community/community/doctype/community_course_topic/community_course_topic.json
+++ b/community/lms/doctype/community_course_topic/community_course_topic.json
@@ -41,9 +41,9 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-03-02 11:43:47.044344",
+ "modified": "2021-03-05 11:01:28.215352",
  "modified_by": "Administrator",
- "module": "Community",
+ "module": "LMS",
  "name": "Community Course Topic",
  "owner": "Administrator",
  "permissions": [
diff --git a/community/lms/doctype/community_course_topic/community_course_topic.py b/community/lms/doctype/community_course_topic/community_course_topic.py
new file mode 100644
index 00000000..c308e9e6
--- /dev/null
+++ b/community/lms/doctype/community_course_topic/community_course_topic.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2021, FOSS United and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class CommunityCourseTopic(Document):
+	pass
diff --git a/community/community/doctype/community_course_topic/test_community_course_topic.py b/community/lms/doctype/community_course_topic/test_community_course_topic.py
similarity index 77%
rename from community/community/doctype/community_course_topic/test_community_course_topic.py
rename to community/lms/doctype/community_course_topic/test_community_course_topic.py
index dd64ad7e..d2e142e2 100644
--- a/community/community/doctype/community_course_topic/test_community_course_topic.py
+++ b/community/lms/doctype/community_course_topic/test_community_course_topic.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2021, Frappe and Contributors
+# Copyright (c) 2021, FOSS United and Contributors
 # See license.txt
 from __future__ import unicode_literals