diff --git a/Exercise 1/Images/Image1.png b/Exercise-1/Images/Image1.png
similarity index 100%
rename from Exercise 1/Images/Image1.png
rename to Exercise-1/Images/Image1.png
diff --git a/Exercise 1/Images/Image2.png b/Exercise-1/Images/Image2.png
similarity index 100%
rename from Exercise 1/Images/Image2.png
rename to Exercise-1/Images/Image2.png
diff --git a/Exercise 1/Images/Image3.png b/Exercise-1/Images/Image3.png
similarity index 100%
rename from Exercise 1/Images/Image3.png
rename to Exercise-1/Images/Image3.png
diff --git a/Exercise 1/Images/Image3_1.png b/Exercise-1/Images/Image3_1.png
similarity index 100%
rename from Exercise 1/Images/Image3_1.png
rename to Exercise-1/Images/Image3_1.png
diff --git a/Exercise 1/Images/Image3_2.png b/Exercise-1/Images/Image3_2.png
similarity index 100%
rename from Exercise 1/Images/Image3_2.png
rename to Exercise-1/Images/Image3_2.png
diff --git a/Exercise 1/Images/Image4.png b/Exercise-1/Images/Image4.png
similarity index 100%
rename from Exercise 1/Images/Image4.png
rename to Exercise-1/Images/Image4.png
diff --git a/Exercise 1/Images/Image5.png b/Exercise-1/Images/Image5.png
similarity index 100%
rename from Exercise 1/Images/Image5.png
rename to Exercise-1/Images/Image5.png
diff --git a/Exercise 1/Readme.md b/Exercise-1/Readme.md
similarity index 100%
rename from Exercise 1/Readme.md
rename to Exercise-1/Readme.md
diff --git a/Exercise 1/Solutions/CVE-2019-13288_example b/Exercise-1/Solutions/CVE-2019-13288_example
similarity index 100%
rename from Exercise 1/Solutions/CVE-2019-13288_example
rename to Exercise-1/Solutions/CVE-2019-13288_example
diff --git a/Exercise 10/Images/1.png b/Exercise-10/Images/1.png
similarity index 100%
rename from Exercise 10/Images/1.png
rename to Exercise-10/Images/1.png
diff --git a/Exercise 10/Images/2.png b/Exercise-10/Images/2.png
similarity index 100%
rename from Exercise 10/Images/2.png
rename to Exercise-10/Images/2.png
diff --git a/Exercise 10/Readme.md b/Exercise-10/Readme.md
similarity index 100%
rename from Exercise 10/Readme.md
rename to Exercise-10/Readme.md
diff --git a/Exercise 2/Images/Image1.png b/Exercise-2/Images/Image1.png
similarity index 100%
rename from Exercise 2/Images/Image1.png
rename to Exercise-2/Images/Image1.png
diff --git a/Exercise 2/Images/Image2.png b/Exercise-2/Images/Image2.png
similarity index 100%
rename from Exercise 2/Images/Image2.png
rename to Exercise-2/Images/Image2.png
diff --git a/Exercise 2/Images/Image3.png b/Exercise-2/Images/Image3.png
similarity index 100%
rename from Exercise 2/Images/Image3.png
rename to Exercise-2/Images/Image3.png
diff --git a/Exercise 2/Images/Image4.png b/Exercise-2/Images/Image4.png
similarity index 100%
rename from Exercise 2/Images/Image4.png
rename to Exercise-2/Images/Image4.png
diff --git a/Exercise 2/Images/Image5.png b/Exercise-2/Images/Image5.png
similarity index 100%
rename from Exercise 2/Images/Image5.png
rename to Exercise-2/Images/Image5.png
diff --git a/Exercise 2/Images/Image6.png b/Exercise-2/Images/Image6.png
similarity index 100%
rename from Exercise 2/Images/Image6.png
rename to Exercise-2/Images/Image6.png
diff --git a/Exercise 2/Images/Image7.png b/Exercise-2/Images/Image7.png
similarity index 100%
rename from Exercise 2/Images/Image7.png
rename to Exercise-2/Images/Image7.png
diff --git a/Exercise 2/Readme.md b/Exercise-2/Readme.md
similarity index 100%
rename from Exercise 2/Readme.md
rename to Exercise-2/Readme.md
diff --git a/Exercise 2/Solutions/CVE-2009-3895__Example b/Exercise-2/Solutions/CVE-2009-3895__Example
similarity index 100%
rename from Exercise 2/Solutions/CVE-2009-3895__Example
rename to Exercise-2/Solutions/CVE-2009-3895__Example
diff --git a/Exercise 2/Solutions/CVE-2012-2836__Example b/Exercise-2/Solutions/CVE-2012-2836__Example
similarity index 100%
rename from Exercise 2/Solutions/CVE-2012-2836__Example
rename to Exercise-2/Solutions/CVE-2012-2836__Example
diff --git a/Exercise 3/Images/Image1.png b/Exercise-3/Images/Image1.png
similarity index 100%
rename from Exercise 3/Images/Image1.png
rename to Exercise-3/Images/Image1.png
diff --git a/Exercise 3/Images/Image2.png b/Exercise-3/Images/Image2.png
similarity index 100%
rename from Exercise 3/Images/Image2.png
rename to Exercise-3/Images/Image2.png
diff --git a/Exercise 3/Images/Image3.png b/Exercise-3/Images/Image3.png
similarity index 100%
rename from Exercise 3/Images/Image3.png
rename to Exercise-3/Images/Image3.png
diff --git a/Exercise 3/Images/Image4.png b/Exercise-3/Images/Image4.png
similarity index 100%
rename from Exercise 3/Images/Image4.png
rename to Exercise-3/Images/Image4.png
diff --git a/Exercise 3/Readme.md b/Exercise-3/Readme.md
similarity index 100%
rename from Exercise 3/Readme.md
rename to Exercise-3/Readme.md
diff --git a/Exercise 4/Images/Image1.png b/Exercise-4/Images/Image1.png
similarity index 100%
rename from Exercise 4/Images/Image1.png
rename to Exercise-4/Images/Image1.png
diff --git a/Exercise 4/Images/Image2.png b/Exercise-4/Images/Image2.png
similarity index 100%
rename from Exercise 4/Images/Image2.png
rename to Exercise-4/Images/Image2.png
diff --git a/Exercise 4/Images/Image2_2.png b/Exercise-4/Images/Image2_2.png
similarity index 100%
rename from Exercise 4/Images/Image2_2.png
rename to Exercise-4/Images/Image2_2.png
diff --git a/Exercise 4/Images/Image3.png b/Exercise-4/Images/Image3.png
similarity index 100%
rename from Exercise 4/Images/Image3.png
rename to Exercise-4/Images/Image3.png
diff --git a/Exercise 4/Readme.md b/Exercise-4/Readme.md
similarity index 100%
rename from Exercise 4/Readme.md
rename to Exercise-4/Readme.md
diff --git a/Exercise 5/Images/Image1.png b/Exercise-5/Images/Image1.png
similarity index 100%
rename from Exercise 5/Images/Image1.png
rename to Exercise-5/Images/Image1.png
diff --git a/Exercise 5/Images/Image2.png b/Exercise-5/Images/Image2.png
similarity index 100%
rename from Exercise 5/Images/Image2.png
rename to Exercise-5/Images/Image2.png
diff --git a/Exercise 5/Images/Image3.png b/Exercise-5/Images/Image3.png
similarity index 100%
rename from Exercise 5/Images/Image3.png
rename to Exercise-5/Images/Image3.png
diff --git a/Exercise 5/Readme.md b/Exercise-5/Readme.md
similarity index 100%
rename from Exercise 5/Readme.md
rename to Exercise-5/Readme.md
diff --git a/Exercise 5/SampleInput.xml b/Exercise-5/SampleInput.xml
similarity index 100%
rename from Exercise 5/SampleInput.xml
rename to Exercise-5/SampleInput.xml
diff --git a/Exercise 6/Images/Image0.png b/Exercise-6/Images/Image0.png
similarity index 100%
rename from Exercise 6/Images/Image0.png
rename to Exercise-6/Images/Image0.png
diff --git a/Exercise 6/Images/Image1.png b/Exercise-6/Images/Image1.png
similarity index 100%
rename from Exercise 6/Images/Image1.png
rename to Exercise-6/Images/Image1.png
diff --git a/Exercise 6/Images/Image2.png b/Exercise-6/Images/Image2.png
similarity index 100%
rename from Exercise 6/Images/Image2.png
rename to Exercise-6/Images/Image2.png
diff --git a/Exercise 6/Images/Image3.png b/Exercise-6/Images/Image3.png
similarity index 100%
rename from Exercise 6/Images/Image3.png
rename to Exercise-6/Images/Image3.png
diff --git a/Exercise 6/Readme.md b/Exercise-6/Readme.md
similarity index 100%
rename from Exercise 6/Readme.md
rename to Exercise-6/Readme.md
diff --git a/Exercise 6/SampleInput.xcf b/Exercise-6/SampleInput.xcf
similarity index 100%
rename from Exercise 6/SampleInput.xcf
rename to Exercise-6/SampleInput.xcf
diff --git a/Exercise 6/persistent.patch b/Exercise-6/persistent.patch
similarity index 100%
rename from Exercise 6/persistent.patch
rename to Exercise-6/persistent.patch
diff --git a/Exercise 7/Images/image0.png b/Exercise-7/Images/image0.png
similarity index 100%
rename from Exercise 7/Images/image0.png
rename to Exercise-7/Images/image0.png
diff --git a/Exercise 7/Images/image1.png b/Exercise-7/Images/image1.png
similarity index 100%
rename from Exercise 7/Images/image1.png
rename to Exercise-7/Images/image1.png
diff --git a/Exercise 7/Images/image2.png b/Exercise-7/Images/image2.png
similarity index 100%
rename from Exercise 7/Images/image2.png
rename to Exercise-7/Images/image2.png
diff --git a/Exercise 7/Images/image3.png b/Exercise-7/Images/image3.png
similarity index 100%
rename from Exercise 7/Images/image3.png
rename to Exercise-7/Images/image3.png
diff --git a/Exercise 7/InputCorpus/short2.wmv b/Exercise-7/InputCorpus/short2.wmv
similarity index 100%
rename from Exercise 7/InputCorpus/short2.wmv
rename to Exercise-7/InputCorpus/short2.wmv
diff --git a/Exercise 7/InputCorpus/veryshort.wmv b/Exercise-7/InputCorpus/veryshort.wmv
similarity index 100%
rename from Exercise 7/InputCorpus/veryshort.wmv
rename to Exercise-7/InputCorpus/veryshort.wmv
diff --git a/Exercise 7/Partial_instrumentation b/Exercise-7/Partial_instrumentation
similarity index 100%
rename from Exercise 7/Partial_instrumentation
rename to Exercise-7/Partial_instrumentation
diff --git a/Exercise 7/Readme.md b/Exercise-7/Readme.md
similarity index 100%
rename from Exercise 7/Readme.md
rename to Exercise-7/Readme.md
diff --git a/Exercise 7/asf_dictionary.dict b/Exercise-7/asf_dictionary.dict
similarity index 100%
rename from Exercise 7/asf_dictionary.dict
rename to Exercise-7/asf_dictionary.dict
diff --git a/Exercise 7/fuzzing_harness.patch b/Exercise-7/fuzzing_harness.patch
similarity index 100%
rename from Exercise 7/fuzzing_harness.patch
rename to Exercise-7/fuzzing_harness.patch
diff --git a/Exercise 7/speedup.patch b/Exercise-7/speedup.patch
similarity index 100%
rename from Exercise 7/speedup.patch
rename to Exercise-7/speedup.patch
diff --git a/Exercise 8/Images/0.png b/Exercise-8/Images/0.png
similarity index 100%
rename from Exercise 8/Images/0.png
rename to Exercise-8/Images/0.png
diff --git a/Exercise 8/Images/10.png b/Exercise-8/Images/10.png
similarity index 100%
rename from Exercise 8/Images/10.png
rename to Exercise-8/Images/10.png
diff --git a/Exercise 8/Images/11.png b/Exercise-8/Images/11.png
similarity index 100%
rename from Exercise 8/Images/11.png
rename to Exercise-8/Images/11.png
diff --git a/Exercise 8/Images/4.png b/Exercise-8/Images/4.png
similarity index 100%
rename from Exercise 8/Images/4.png
rename to Exercise-8/Images/4.png
diff --git a/Exercise 8/Images/5.png b/Exercise-8/Images/5.png
similarity index 100%
rename from Exercise 8/Images/5.png
rename to Exercise-8/Images/5.png
diff --git a/Exercise 8/Images/6.png b/Exercise-8/Images/6.png
similarity index 100%
rename from Exercise 8/Images/6.png
rename to Exercise-8/Images/6.png
diff --git a/Exercise 8/Images/7.png b/Exercise-8/Images/7.png
similarity index 100%
rename from Exercise 8/Images/7.png
rename to Exercise-8/Images/7.png
diff --git a/Exercise 8/Images/8.png b/Exercise-8/Images/8.png
similarity index 100%
rename from Exercise 8/Images/8.png
rename to Exercise-8/Images/8.png
diff --git a/Exercise 8/Images/9.png b/Exercise-8/Images/9.png
similarity index 100%
rename from Exercise 8/Images/9.png
rename to Exercise-8/Images/9.png
diff --git a/Exercise 8/Readme.md b/Exercise-8/Readme.md
similarity index 100%
rename from Exercise 8/Readme.md
rename to Exercise-8/Readme.md
diff --git a/Exercise 9/Images/Image0.png b/Exercise-9/Images/Image0.png
similarity index 100%
rename from Exercise 9/Images/Image0.png
rename to Exercise-9/Images/Image0.png
diff --git a/Exercise 9/Images/Image1.png b/Exercise-9/Images/Image1.png
similarity index 100%
rename from Exercise 9/Images/Image1.png
rename to Exercise-9/Images/Image1.png
diff --git a/Exercise 9/Images/Image2.png b/Exercise-9/Images/Image2.png
similarity index 100%
rename from Exercise 9/Images/Image2.png
rename to Exercise-9/Images/Image2.png
diff --git a/Exercise 9/Images/Image3.png b/Exercise-9/Images/Image3.png
similarity index 100%
rename from Exercise 9/Images/Image3.png
rename to Exercise-9/Images/Image3.png
diff --git a/Exercise 9/Images/Image4.png b/Exercise-9/Images/Image4.png
similarity index 100%
rename from Exercise 9/Images/Image4.png
rename to Exercise-9/Images/Image4.png
diff --git a/Exercise 9/Images/Image5.png b/Exercise-9/Images/Image5.png
similarity index 100%
rename from Exercise 9/Images/Image5.png
rename to Exercise-9/Images/Image5.png
diff --git a/Exercise 9/Readme.md b/Exercise-9/Readme.md
similarity index 100%
rename from Exercise 9/Readme.md
rename to Exercise-9/Readme.md
diff --git a/Exercise 9/Resources/7z1505.exe b/Exercise-9/Resources/7z1505.exe
similarity index 100%
rename from Exercise 9/Resources/7z1505.exe
rename to Exercise-9/Resources/7z1505.exe
diff --git a/Exercise 9/Resources/example.img b/Exercise-9/Resources/example.img
similarity index 100%
rename from Exercise 9/Resources/example.img
rename to Exercise-9/Resources/example.img
diff --git a/Exercise 9/Resources/vs_community.exe b/Exercise-9/Resources/vs_community.exe
similarity index 100%
rename from Exercise 9/Resources/vs_community.exe
rename to Exercise-9/Resources/vs_community.exe