Refactor mediatorInsertion #22

Merged n-nitta merged 7 commits into nitta-lab:main from nitta-lab:refactor-mediatorInsertion on 30 Sep