Started refactor to integrated SaltKeep from SaltSafe