diff --git a/year4/semester1/CT417: Software Engineering III/notes/CT417-Notes.pdf b/year4/semester1/CT417/notes/CT417-Notes.pdf
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/notes/CT417-Notes.pdf
rename to year4/semester1/CT417/notes/CT417-Notes.pdf
diff --git a/year4/semester1/CT417: Software Engineering III/notes/CT417-Notes.tex b/year4/semester1/CT417/notes/CT417-Notes.tex
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/notes/CT417-Notes.tex
rename to year4/semester1/CT417/notes/CT417-Notes.tex
diff --git a/year4/semester1/CT417: Software Engineering III/notes/images/centralised_vcs.png b/year4/semester1/CT417/notes/images/centralised_vcs.png
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/notes/images/centralised_vcs.png
rename to year4/semester1/CT417/notes/images/centralised_vcs.png
diff --git a/year4/semester1/CT417: Software Engineering III/notes/images/distributed_vcs.png b/year4/semester1/CT417/notes/images/distributed_vcs.png
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/notes/images/distributed_vcs.png
rename to year4/semester1/CT417/notes/images/distributed_vcs.png
diff --git a/year4/semester1/CT417: Software Engineering III/notes/images/example_cd.png b/year4/semester1/CT417/notes/images/example_cd.png
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/notes/images/example_cd.png
rename to year4/semester1/CT417/notes/images/example_cd.png
diff --git a/year4/semester1/CT417: Software Engineering III/notes/images/mvn_conv_dir_structure.png b/year4/semester1/CT417/notes/images/mvn_conv_dir_structure.png
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/notes/images/mvn_conv_dir_structure.png
rename to year4/semester1/CT417/notes/images/mvn_conv_dir_structure.png
diff --git a/year4/semester1/CT417: Software Engineering III/notes/images/mvn_dir_structure.png b/year4/semester1/CT417/notes/images/mvn_dir_structure.png
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/notes/images/mvn_dir_structure.png
rename to year4/semester1/CT417/notes/images/mvn_dir_structure.png
diff --git a/year4/semester1/CT417: Software Engineering III/notes/images/mvn_pom.png b/year4/semester1/CT417/notes/images/mvn_pom.png
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/notes/images/mvn_pom.png
rename to year4/semester1/CT417/notes/images/mvn_pom.png
diff --git a/year4/semester1/CT417: Software Engineering III/notes/images/svn_branch.png b/year4/semester1/CT417/notes/images/svn_branch.png
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/notes/images/svn_branch.png
rename to year4/semester1/CT417/notes/images/svn_branch.png
diff --git a/year4/semester1/CT417: Software Engineering III/notes/images/svn_conflict1.png b/year4/semester1/CT417/notes/images/svn_conflict1.png
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/notes/images/svn_conflict1.png
rename to year4/semester1/CT417/notes/images/svn_conflict1.png
diff --git a/year4/semester1/CT417: Software Engineering III/notes/images/svn_conflict2.png b/year4/semester1/CT417/notes/images/svn_conflict2.png
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/notes/images/svn_conflict2.png
rename to year4/semester1/CT417/notes/images/svn_conflict2.png
diff --git a/year4/semester1/CT417: Software Engineering III/notes/images/svn_sequential_merge.png b/year4/semester1/CT417/notes/images/svn_sequential_merge.png
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/notes/images/svn_sequential_merge.png
rename to year4/semester1/CT417/notes/images/svn_sequential_merge.png
diff --git a/year4/semester1/CT417: Software Engineering III/notes/images/svn_trunk.png b/year4/semester1/CT417/notes/images/svn_trunk.png
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/notes/images/svn_trunk.png
rename to year4/semester1/CT417/notes/images/svn_trunk.png
diff --git a/year4/semester1/CT417: Software Engineering III/papers/2007_2008_CT417_1_1_5.PDF b/year4/semester1/CT417/papers/2007_2008_CT417_1_1_5.PDF
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/papers/2007_2008_CT417_1_1_5.PDF
rename to year4/semester1/CT417/papers/2007_2008_CT417_1_1_5.PDF
diff --git a/year4/semester1/CT417: Software Engineering III/papers/2008_2009_CT417_1_1_5.PDF b/year4/semester1/CT417/papers/2008_2009_CT417_1_1_5.PDF
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/papers/2008_2009_CT417_1_1_5.PDF
rename to year4/semester1/CT417/papers/2008_2009_CT417_1_1_5.PDF
diff --git a/year4/semester1/CT417: Software Engineering III/papers/2009_2010_CT417_1_1_5.PDF b/year4/semester1/CT417/papers/2009_2010_CT417_1_1_5.PDF
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/papers/2009_2010_CT417_1_1_5.PDF
rename to year4/semester1/CT417/papers/2009_2010_CT417_1_1_5.PDF
diff --git a/year4/semester1/CT417: Software Engineering III/papers/2009_2010_CT417_1_2_3.PDF b/year4/semester1/CT417/papers/2009_2010_CT417_1_2_3.PDF
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/papers/2009_2010_CT417_1_2_3.PDF
rename to year4/semester1/CT417/papers/2009_2010_CT417_1_2_3.PDF
diff --git a/year4/semester1/CT417: Software Engineering III/papers/2010_2011_CT417_1_1_5.PDF b/year4/semester1/CT417/papers/2010_2011_CT417_1_1_5.PDF
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/papers/2010_2011_CT417_1_1_5.PDF
rename to year4/semester1/CT417/papers/2010_2011_CT417_1_1_5.PDF
diff --git a/year4/semester1/CT417: Software Engineering III/papers/2010_2011_CT417_1_2_3.PDF b/year4/semester1/CT417/papers/2010_2011_CT417_1_2_3.PDF
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/papers/2010_2011_CT417_1_2_3.PDF
rename to year4/semester1/CT417/papers/2010_2011_CT417_1_2_3.PDF
diff --git a/year4/semester1/CT417: Software Engineering III/papers/2011_2012_CT417_1_1_5.PDF b/year4/semester1/CT417/papers/2011_2012_CT417_1_1_5.PDF
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/papers/2011_2012_CT417_1_1_5.PDF
rename to year4/semester1/CT417/papers/2011_2012_CT417_1_1_5.PDF
diff --git a/year4/semester1/CT417: Software Engineering III/papers/2012_2013_CT417_1_1_5.PDF b/year4/semester1/CT417/papers/2012_2013_CT417_1_1_5.PDF
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/papers/2012_2013_CT417_1_1_5.PDF
rename to year4/semester1/CT417/papers/2012_2013_CT417_1_1_5.PDF
diff --git a/year4/semester1/CT417: Software Engineering III/papers/2013_2014_CT417_1_1_5.PDF b/year4/semester1/CT417/papers/2013_2014_CT417_1_1_5.PDF
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/papers/2013_2014_CT417_1_1_5.PDF
rename to year4/semester1/CT417/papers/2013_2014_CT417_1_1_5.PDF
diff --git a/year4/semester1/CT417: Software Engineering III/papers/2013_2014_CT417_1_2_3.PDF b/year4/semester1/CT417/papers/2013_2014_CT417_1_2_3.PDF
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/papers/2013_2014_CT417_1_2_3.PDF
rename to year4/semester1/CT417/papers/2013_2014_CT417_1_2_3.PDF
diff --git a/year4/semester1/CT417: Software Engineering III/papers/2014_2015_CT417_1_1_5.PDF b/year4/semester1/CT417/papers/2014_2015_CT417_1_1_5.PDF
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/papers/2014_2015_CT417_1_1_5.PDF
rename to year4/semester1/CT417/papers/2014_2015_CT417_1_1_5.PDF
diff --git a/year4/semester1/CT417: Software Engineering III/papers/2014_2015_CT417_1_2_3.PDF b/year4/semester1/CT417/papers/2014_2015_CT417_1_2_3.PDF
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/papers/2014_2015_CT417_1_2_3.PDF
rename to year4/semester1/CT417/papers/2014_2015_CT417_1_2_3.PDF
diff --git a/year4/semester1/CT417: Software Engineering III/papers/2015_2016_CT417_1_1_5.PDF b/year4/semester1/CT417/papers/2015_2016_CT417_1_1_5.PDF
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/papers/2015_2016_CT417_1_1_5.PDF
rename to year4/semester1/CT417/papers/2015_2016_CT417_1_1_5.PDF
diff --git a/year4/semester1/CT417: Software Engineering III/papers/2015_2016_CT417_1_2_3.PDF b/year4/semester1/CT417/papers/2015_2016_CT417_1_2_3.PDF
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/papers/2015_2016_CT417_1_2_3.PDF
rename to year4/semester1/CT417/papers/2015_2016_CT417_1_2_3.PDF
diff --git a/year4/semester1/CT417: Software Engineering III/papers/2016_2017_CT417_1_1_5.PDF b/year4/semester1/CT417/papers/2016_2017_CT417_1_1_5.PDF
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/papers/2016_2017_CT417_1_1_5.PDF
rename to year4/semester1/CT417/papers/2016_2017_CT417_1_1_5.PDF
diff --git a/year4/semester1/CT417: Software Engineering III/papers/2016_2017_CT417_1_2_3.PDF b/year4/semester1/CT417/papers/2016_2017_CT417_1_2_3.PDF
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/papers/2016_2017_CT417_1_2_3.PDF
rename to year4/semester1/CT417/papers/2016_2017_CT417_1_2_3.PDF
diff --git a/year4/semester1/CT417: Software Engineering III/papers/2017_2018_CT417_1_1_5.PDF b/year4/semester1/CT417/papers/2017_2018_CT417_1_1_5.PDF
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/papers/2017_2018_CT417_1_1_5.PDF
rename to year4/semester1/CT417/papers/2017_2018_CT417_1_1_5.PDF
diff --git a/year4/semester1/CT417: Software Engineering III/papers/2017_2018_CT417_1_2_3.PDF b/year4/semester1/CT417/papers/2017_2018_CT417_1_2_3.PDF
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/papers/2017_2018_CT417_1_2_3.PDF
rename to year4/semester1/CT417/papers/2017_2018_CT417_1_2_3.PDF
diff --git a/year4/semester1/CT417: Software Engineering III/papers/2018_2019_CT417_1_1_5.PDF b/year4/semester1/CT417/papers/2018_2019_CT417_1_1_5.PDF
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/papers/2018_2019_CT417_1_1_5.PDF
rename to year4/semester1/CT417/papers/2018_2019_CT417_1_1_5.PDF
diff --git a/year4/semester1/CT417: Software Engineering III/papers/2018_2019_CT417_1_2_3.PDF b/year4/semester1/CT417/papers/2018_2019_CT417_1_2_3.PDF
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/papers/2018_2019_CT417_1_2_3.PDF
rename to year4/semester1/CT417/papers/2018_2019_CT417_1_2_3.PDF
diff --git a/year4/semester1/CT417: Software Engineering III/papers/2019_2020_CT417_1_1_5.PDF b/year4/semester1/CT417/papers/2019_2020_CT417_1_1_5.PDF
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/papers/2019_2020_CT417_1_1_5.PDF
rename to year4/semester1/CT417/papers/2019_2020_CT417_1_1_5.PDF
diff --git a/year4/semester1/CT417: Software Engineering III/papers/2021_2022_CT417_1_1_5.PDF b/year4/semester1/CT417/papers/2021_2022_CT417_1_1_5.PDF
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/papers/2021_2022_CT417_1_1_5.PDF
rename to year4/semester1/CT417/papers/2021_2022_CT417_1_1_5.PDF
diff --git a/year4/semester1/CT417: Software Engineering III/papers/2023_2024_CT417_1_1_5.PDF b/year4/semester1/CT417/papers/2023_2024_CT417_1_1_5.PDF
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/papers/2023_2024_CT417_1_1_5.PDF
rename to year4/semester1/CT417/papers/2023_2024_CT417_1_1_5.PDF
diff --git a/year4/semester1/CT417: Software Engineering III/slides/WK01-1_ModuleOverview.pdf b/year4/semester1/CT417/slides/WK01-1_ModuleOverview.pdf
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/slides/WK01-1_ModuleOverview.pdf
rename to year4/semester1/CT417/slides/WK01-1_ModuleOverview.pdf
diff --git a/year4/semester1/CT417: Software Engineering III/slides/WK01-2_SWRevision.pdf b/year4/semester1/CT417/slides/WK01-2_SWRevision.pdf
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/slides/WK01-2_SWRevision.pdf
rename to year4/semester1/CT417/slides/WK01-2_SWRevision.pdf
diff --git a/year4/semester1/CT417: Software Engineering III/slides/WK01-3_AgileDevOps.pdf b/year4/semester1/CT417/slides/WK01-3_AgileDevOps.pdf
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/slides/WK01-3_AgileDevOps.pdf
rename to year4/semester1/CT417/slides/WK01-3_AgileDevOps.pdf
diff --git a/year4/semester1/CT417: Software Engineering III/slides/WK01-4_GitVersionCtrl.pdf b/year4/semester1/CT417/slides/WK01-4_GitVersionCtrl.pdf
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/slides/WK01-4_GitVersionCtrl.pdf
rename to year4/semester1/CT417/slides/WK01-4_GitVersionCtrl.pdf
diff --git a/year4/semester1/CT417: Software Engineering III/slides/WK01-5_WorkingGitHub.html b/year4/semester1/CT417/slides/WK01-5_WorkingGitHub.html
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/slides/WK01-5_WorkingGitHub.html
rename to year4/semester1/CT417/slides/WK01-5_WorkingGitHub.html
diff --git a/year4/semester1/CT417: Software Engineering III/slides/WK02-1_BuildTools.pdf b/year4/semester1/CT417/slides/WK02-1_BuildTools.pdf
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/slides/WK02-1_BuildTools.pdf
rename to year4/semester1/CT417/slides/WK02-1_BuildTools.pdf
diff --git a/year4/semester1/CT417: Software Engineering III/slides/WK02-2_BuildToolsDef.pdf b/year4/semester1/CT417/slides/WK02-2_BuildToolsDef.pdf
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/slides/WK02-2_BuildToolsDef.pdf
rename to year4/semester1/CT417/slides/WK02-2_BuildToolsDef.pdf
diff --git a/year4/semester1/CT417: Software Engineering III/slides/WK02-3_MavenInfo.pdf b/year4/semester1/CT417/slides/WK02-3_MavenInfo.pdf
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/slides/WK02-3_MavenInfo.pdf
rename to year4/semester1/CT417/slides/WK02-3_MavenInfo.pdf
diff --git a/year4/semester1/CT417: Software Engineering III/slides/WK02-4_SpringBootActions.pdf b/year4/semester1/CT417/slides/WK02-4_SpringBootActions.pdf
similarity index 100%
rename from year4/semester1/CT417: Software Engineering III/slides/WK02-4_SpringBootActions.pdf
rename to year4/semester1/CT417/slides/WK02-4_SpringBootActions.pdf
diff --git a/year4/semester1/CT417: Software Engineering III/assignments/assignment1/AS01-Instructions-Setup-musicFinder.pdf b/year4/semester1/CT417: Software Engineering III/assignments/assignment1/AS01-Instructions-Setup-musicFinder.pdf
deleted file mode 100644
index f2b2cf62..00000000
Binary files a/year4/semester1/CT417: Software Engineering III/assignments/assignment1/AS01-Instructions-Setup-musicFinder.pdf and /dev/null differ