Restructure the directory hierarchy