We now have the org.modeshape.jcr.spi package where we want to have all of our SPIs. We should rename the org.modeshape.jcr.federation.spi package to org.modeshape.jcr.spi.federation. This will break existing implementations from 3.x, but all that is required is to change the imports in their code and recompile.