Restructuring the directory