move kb/cpp out