Remove SPIs, they will be readded as submodules in the next commit.
Added SPIs as submodules