Changes to the way subdir is handled

Here, the number of arguments is important in deciding whether the part
should be copied to directory or subdirectory.