moving the keysets into their own module