Restructure Directory Paths