Much more work on import handling with copy and Move unit #613