Some cleanup
Added in new MoveFile command