ArchitecturalRefactoring #12

Merged n-nitta merged 2 commits into nitta-lab:master from nitta-lab:architecturalRefactoring on 26 Mar 2021