diff --git a/Makefile b/Makefile
index dc777ff..b17d6e5 100644
--- a/Makefile
+++ b/Makefile
@@ -16,12 +16,22 @@ help: ## Display this help message.
 	@grep '^[a-zA-Z]' $(MAKEFILE_LIST) | sort | awk -F ':.*?## ' 'NF==2 {printf "\033[36m  %-25s\033[0m %s\n", $$1, $$2}'
 
 clean: ## Delete all generated course exports.
-	rm -f $(CC_COURSE_TAR) $(OEX_INTRO_COURSE_TAR) $(DEV_INTRO_COURSE_TAR)
+	rm -f $(CC_COURSE_TAR) $(OEX_INTRO_COURSE_TAR) $(DEV_INTRO_COURSE_TAR) $(OLX_EXAMPLE_COURSE_TAR)
 
-dist: clean ## Create/overwrite exports in ./dist/ folder for courses
+dist_cc: ## Create/overwrite exports in ./dist/ folder for courses
+	rf -f $(CC_COURSE_TAR)
 	cd $(CC_COURSE) && tar czfv ../$(CC_COURSE_TAR) ./course/
+
+dist_intro:
+	rm -f $(OEX_INTRO_COURSE_TAR)
 	cd $(OEX_INTRO_COURSE) && tar czfv ../$(OEX_INTRO_COURSE_TAR) ./course/
+
+dist_dev:
+	rm -f $(DEV_INTRO_COURSE_TAR)
 	cd $(DEV_INTRO_COURSE) && tar czfv ../$(DEV_INTRO_COURSE_TAR) ./course/
+
+dist_olx:
+	rm -f $(OLX_EXAMPLE_COURSE_TAR)
 	cd $(OLX_EXAMPLE_COURSE) && tar czfv ../$(OLX_EXAMPLE_COURSE_TAR) ./course/	
 
 gitclean:  ## Remove hidden system files that are ignored by git.
@@ -32,3 +42,15 @@ unpack: ## Unpack course exports from ./dist/ folder into source OLX.
 	[ -f $(OEX_INTRO_COURSE_TAR) ] && mkdir -p $(OEX_INTRO_COURSE) && (cd $(OEX_INTRO_COURSE) && tar xzfv ../$(OEX_INTRO_COURSE_TAR)) || echo "No course to unpack."
 	[ -f $(DEV_INTRO_COURSE_TAR) ] && mkdir -p $(DEV_INTRO_COURSE) && (cd $(DEV_INTRO_COURSE) && tar xzfv ../$(DEV_INTRO_COURSE_TAR)) || echo "No course to unpack."
 	[ -f $(OLX_EXAMPLE_COURSE_TAR) ] && mkdir -p $(OLX_EXAMPLE_COURSE) && (cd $(OLX_EXAMPLE_COURSE) && tar xzfv ../$(OLX_EXAMPLE_COURSE_TAR)) || echo "No course to unpack."
+
+unpack_cc:
+	[ -f $(CC_COURSE_TAR) ] && mkdir -p $(CC_COURSE) && (cd $(CC_COURSE) && tar xzfv ../$(CC_COURSE_TAR)) || echo "No course to unpack."
+
+unpack_intro:
+	[ -f $(OEX_INTRO_COURSE_TAR) ] && mkdir -p $(OEX_INTRO_COURSE) && (cd $(OEX_INTRO_COURSE) && tar xzfv ../$(OEX_INTRO_COURSE_TAR)) || echo "No course to unpack."
+
+unpack_dev:
+	[ -f $(DEV_INTRO_COURSE_TAR) ] && mkdir -p $(DEV_INTRO_COURSE) && (cd $(DEV_INTRO_COURSE) && tar xzfv ../$(DEV_INTRO_COURSE_TAR)) || echo "No course to unpack."
+
+unpack_olx:
+	[ -f $(OLX_EXAMPLE_COURSE_TAR) ] && mkdir -p $(OLX_EXAMPLE_COURSE) && (cd $(OLX_EXAMPLE_COURSE) && tar xzfv ../$(OLX_EXAMPLE_COURSE_TAR)) || echo "No course to unpack."