Refactor: move code
Merge pull request #306 from my-personal-forks/refactor

Refactor: move code