9 files changed, 70 insertions, 51 deletions
diff --git a/devfiles/videos/teacher/.keepme b/devfiles/videos/teacher/.keepme
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/devfiles/videos/teacher/.keepme
diff --git a/devfiles/videos/teacher/teacher-1.json b/devfiles/videos/teacher/teacher-1.json
deleted file mode 100644
index 4c065ed..0000000
--- a/devfiles/videos/teacher/teacher-1.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "id": "teacher-1",
-    "number": "0",
-    "title": "Intro",
-    "length": 182,
-    "image": "http://d12xq7pqelpwt.cloudfront.net/Teacher%20Video%201%20-%20Intro.png",
-    "pdf": "http://d12xq7pqelpwt.cloudfront.net/teacher-intro.pdf",
-    "urls": [{"src":"http://d12xq7pqelpwt.cloudfront.net/Teacher%20Video%201%20-%20Intro-low.mp4", "type":"video/mp4"},
-{"src":"http://d12xq7pqelpwt.cloudfront.net/Teacher%20Video%201%20-%20Intro.webmhd.webm", "type":"video/webm"}]
-}
-\ No newline at end of file
diff --git a/devfiles/videos/teacher/teacher-2.json b/devfiles/videos/teacher/teacher-2.json
index cd671e3..e2bc5ff 100644
--- a/devfiles/videos/teacher/teacher-2.json
+++ b/devfiles/videos/teacher/teacher-2.json
@@ -1,10 +1,18 @@
 {
-    "id": "teacher-2",
-    "number": "1",
     "title": "Biblical Expectations",
-    "length": 481,
     "image": "http://d12xq7pqelpwt.cloudfront.net/Teacher%20Video%202%20-%20Biblical%20Expectations.png",
+    "number": "1",
+    "length": 306,
+    "urls": [
+        {
+            "src": "https://d12xq7pqelpwt.cloudfront.net/videos-2018/teacher-1.mp4",
+            "type": "video/mp4"
+        },
+        {
+            "src": "https://d12xq7pqelpwt.cloudfront.net/videos-2018/teacher-1.webm",
+            "type": "video/webm"
+        }
+    ],
     "pdf": "http://d12xq7pqelpwt.cloudfront.net/teacher-1.pdf",
-    "urls": [{"src":"http://d12xq7pqelpwt.cloudfront.net/teacher-video-2-biblical-expectations.mp4", "type":"video/mp4"},
-{"src":"http://d12xq7pqelpwt.cloudfront.net/teacher-video-2-biblical-expectations.webmhd.webm", "type":"video/webm"}]
+    "id": "teacher-2"
 }
 \ No newline at end of file
diff --git a/devfiles/videos/teacher/teacher-3.json b/devfiles/videos/teacher/teacher-3.json
index 8101788..5bb8c8f 100644
--- a/devfiles/videos/teacher/teacher-3.json
+++ b/devfiles/videos/teacher/teacher-3.json
@@ -1,10 +1,18 @@
 {
-    "id": "teacher-3",
-    "number": "2",
     "title": "Foursquare Expectations",
-    "length": 342,
     "image": "http://d12xq7pqelpwt.cloudfront.net/Teacher%20Video%203%20-%20Foursquare%20Expectations.png",
+    "number": "2",
+    "length": 297,
+    "urls": [
+        {
+            "src": "https://d12xq7pqelpwt.cloudfront.net/videos-2018/teacher-2.mp4",
+            "type": "video/mp4"
+        },
+        {
+            "src": "https://d12xq7pqelpwt.cloudfront.net/videos-2018/teacher-2.webm",
+            "type": "video/webm"
+        }
+    ],
     "pdf": "http://d12xq7pqelpwt.cloudfront.net/teacher-2.pdf",
-    "urls": [{"src":"http://d12xq7pqelpwt.cloudfront.net/teacher-video-3-foursquare-expectations.mp4", "type":"video/mp4"},
-{"src":"http://d12xq7pqelpwt.cloudfront.net/teacher-video-3-foursquare-expectations.webmhd.webm", "type":"video/webm"}]
+    "id": "teacher-3"
 }
 \ No newline at end of file
diff --git a/devfiles/videos/teacher/teacher-4.json b/devfiles/videos/teacher/teacher-4.json
deleted file mode 100644
index fb31a71..0000000
--- a/devfiles/videos/teacher/teacher-4.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "id": "teacher-4",
-    "number": "3",
-    "title": "Conforming to Doctrine",
-    "length": 355,
-    "image": "http://d12xq7pqelpwt.cloudfront.net/Teacher%20Video%204%20-%20Conforming%20to%20Doctrine.png",
-    "pdf": "http://d12xq7pqelpwt.cloudfront.net/teacher-3.pdf",
-    "urls": [{"src":"http://d12xq7pqelpwt.cloudfront.net/teacher-video-4-conforming-to-doctorine.mp4", "type":"video/mp4"},
-{"src":"http://d12xq7pqelpwt.cloudfront.net/teacher-video-4-conforming-to-doctorine.webmhd.webm", "type":"video/webm"}]
-}
-\ No newline at end of file
diff --git a/devfiles/videos/teacher/teacher-5.json b/devfiles/videos/teacher/teacher-5.json
index 64faf9f..612a6cc 100644
--- a/devfiles/videos/teacher/teacher-5.json
+++ b/devfiles/videos/teacher/teacher-5.json
@@ -1,10 +1,18 @@
 {
-    "id": "teacher-5",
-    "number": "4",
-    "title": "Adhering to Mission & Values",
-    "length": 222,
+    "title": "Church Values",
     "image": "http://d12xq7pqelpwt.cloudfront.net/Teacher%20Video%205%20-%20Adhering%20to%20Mission%20%26%20Values.png",
+    "number": "3",
+    "length": 99,
+    "urls": [
+        {
+            "src": "https://d12xq7pqelpwt.cloudfront.net/videos-2018/teacher-3.mp4",
+            "type": "video/mp4"
+        },
+        {
+            "src": "https://d12xq7pqelpwt.cloudfront.net/videos-2018/teacher-3.webm",
+            "type": "video/webm"
+        }
+    ],
     "pdf": "http://d12xq7pqelpwt.cloudfront.net/teacher-4.pdf",
-    "urls": [{"src":"http://d12xq7pqelpwt.cloudfront.net/Teacher%20Video%205%20-%20Adhering%20to%20Mission%20%26%20Values-low.mp4", "type":"video/mp4"},
-{"src":"http://d12xq7pqelpwt.cloudfront.net/Teacher%20Video%205%20-%20Adhering%20to%20Mission%20%26%20Values.webmhd.webm", "type":"video/webm"}]
+    "id": "teacher-5"
 }
 \ No newline at end of file
diff --git a/devfiles/videos/teacher/teacher-6.json b/devfiles/videos/teacher/teacher-6.json
deleted file mode 100644
index 2383b8c..0000000
--- a/devfiles/videos/teacher/teacher-6.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "id": "teacher-6",
-    "number": "5",
-    "title": "Being a Disciple & Developing Others",
-    "length": 722,
-    "image": "http://d12xq7pqelpwt.cloudfront.net/Teacher%20Video%206%20-%20Being%20a%20Disciple%20%26%20Developing%20Others.png",
-    "pdf": "http://d12xq7pqelpwt.cloudfront.net/teacher-5.pdf",
-    "urls": [{"src":"http://d12xq7pqelpwt.cloudfront.net/teacher-video-6-being-a-disciple-%26-developing-others.mp4", "type":"video/mp4"},
-{"src":"http://d12xq7pqelpwt.cloudfront.net/teacher-video-6-being-a-disciple-%26-developing-others.webmhd.webm", "type":"video/webm"}]
-}
-\ No newline at end of file
diff --git a/devfiles/videos/teacher/teacher-7.json b/devfiles/videos/teacher/teacher-7.json
index 4acf7d4..f178031 100644
--- a/devfiles/videos/teacher/teacher-7.json
+++ b/devfiles/videos/teacher/teacher-7.json
@@ -1,10 +1,18 @@
 {
-    "id": "teacher-7",
-    "number": "6",
     "title": "Prerequisites",
-    "length": 535,
     "image": "http://d12xq7pqelpwt.cloudfront.net/Teacher%20Video%207%20-%20Prerequisites.png",
+    "number": "5",
+    "length": 268,
+    "urls": [
+        {
+            "src": "https://d12xq7pqelpwt.cloudfront.net/videos-2018/teacher-5.mp4",
+            "type": "video/mp4"
+        },
+        {
+            "src": "https://d12xq7pqelpwt.cloudfront.net/videos-2018/teacher-5.webm",
+            "type": "video/webm"
+        }
+    ],
     "pdf": "http://d12xq7pqelpwt.cloudfront.net/teacher-6.pdf",
-    "urls": [{"src":"http://d12xq7pqelpwt.cloudfront.net/teacher-video-7-prerequisites.mp4", "type":"video/mp4"},
-{"src":"http://d12xq7pqelpwt.cloudfront.net/teacher-video-7-prerequisites.webmhd.webm", "type":"video/webm"}]
+    "id": "teacher-7"
 }
 \ No newline at end of file
diff --git a/devfiles/videos/teacher/teacher-8.json b/devfiles/videos/teacher/teacher-8.json
new file mode 100644
index 0000000..88da761
--- /dev/null
+++ b/devfiles/videos/teacher/teacher-8.json
@@ -0,0 +1,17 @@
+{
+    "title": "Spiritual Disciplines",
+    "image": "http://d12xq7pqelpwt.cloudfront.net/Teacher%20Video%202%20-%20Biblical%20Expectations.png",
+    "number": "4",
+    "length": 138,
+    "urls": [
+        {
+            "src": "https://d12xq7pqelpwt.cloudfront.net/videos-2018/teacher-4.mp4",
+            "type": "video/mp4"
+        },
+        {
+            "src": "https://d12xq7pqelpwt.cloudfront.net/videos-2018/teacher-4.webm",
+            "type": "video/webm"
+        }
+    ],
+    "id": "teacher-8"
+}
+\ No newline at end of file