Restructuring of directories