Restructuring directory before development

Note: SCAD files have not been updated with new include paths!