chore(setup): move things around