refactor: moving stuff around