chore(clean): move things around