Restructured the directory