Redid the atrocious folder-copy and folder-move for both large and small.