Revised to remove directory from originals