Group into Tool and Viewer instead
Renamed KCTVBase to KVBase