Refactor: move things around