spi leanup: class rename and package shift