Created spi package and moved appropriate files to it.