Revert "Seperated KGB from GRU"

This reverts commit 556d9b7c5ebf16646dd241b1e755457918c84438.