Add: move file in subdir and take care of file already exist