Restructure DSC Folders