Restructuring the directorys