diff --git a/.gitignore b/.gitignore
index e00cff7..2d1e60a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 .DS_Store?
 .ehthumbs.db
 Icon?
-Thumbs.db.DS_Store
+Thumbs.db
+._*
diff --git a/Makefile b/Makefile
index 5a3597c..5aae5a2 100644
--- a/Makefile
+++ b/Makefile
@@ -18,13 +18,16 @@ help: ## Display this help message.
 clean: ## Delete all generated course and library exports.
 	rm -f $(COURSE_TAR) $(LIBRARY_TAR)
 
-dist: ## Create/overwrite exports in ./dist/ folder for course and libary.
+dist: clean ## Create/overwrite exports in ./dist/ folder for course and libary.
 	cd $(COURSE) && tar czfv ../$(COURSE_TAR) ./course/
 	cd $(LIBRARY) && tar czfv ../$(LIBRARY_TAR) ./library/
 
+clean:  ## Remove hidden system files that are ignored by git.
+	git clean -dfX
+
 unpack: ## Unpack course and library exports from ./dist/ folder into source OLX.
-	[ -f $(COURSE_TAR) ] && (cd $(COURSE) && tar xzfv ../$(COURSE_TAR)) || echo "No course to unpack."
-	[ -f $(LIBRARY_TAR) ] && (cd $(LIBRARY) && tar xzfv ../$(LIBRARY_TAR)) || echo "No content library to unpack."
+	[ -f $(COURSE_TAR) ] && mkdir -p $(COURSE) && (cd $(COURSE) && tar xzfv ../$(COURSE_TAR)) || echo "No course to unpack."
+	[ -f $(LIBRARY_TAR) ] && mkdir -p $(LIBRARY) && (cd $(LIBRARY) && tar xzfv ../$(LIBRARY_TAR)) || echo "No content library to unpack."
 
 import: dist ## Import course and libraries into a locally-running Tutor instance. Requires an admin user.
 	$(TUTOR) mounts add cms,cms-worker:.:/openedx/data/$(REPO_NAME)
diff --git a/dist/demo-content-library.tar.gz b/dist/demo-content-library.tar.gz
index 6f93358..8895efd 100644
Binary files a/dist/demo-content-library.tar.gz and b/dist/demo-content-library.tar.gz differ
diff --git a/dist/demo-course.tar.gz b/dist/demo-course.tar.gz
index e958140..8e5052f 100644
Binary files a/dist/demo-course.tar.gz and b/dist/demo-course.tar.gz differ