Improving rename/move of module (unfinished).