Move Marker to the SPI package.
Move Key to the public API.