Restructuring file hierarchy