refactor: move to subpackage for current