minor improvs to rename participants
move to own unit
much better impl of move package/module quick fix #604