Restructured the path