Actually move to the "completed" dir

Previously we had been ignoring the new directory and moved files to
a subdir within dirname($current_path).

Change-Id: Iceba7058cc0628a67ccc468ff3f379d517b19b2a