Correction of placement of directories for DSW1 class.
Commits of Projects 1 and 2.