ref #6921 Avoid double save editor warning when closing wizard
ref #7005 Refactor DI annotations
ref #7005 Refactor package structure