More reorganization. We don't have "best picks" yet, so most actual
implementation classes live in "candidates" for now.