Restructuring of subdirectories