replaced mv-workaround with clean Python-move-solution