Lay down refactor plan