refactor: merge 2 Mochi class
refactor: change structure of state