Moving the KeyVerifier under the Context directory