refactor: moving things around