Aligns naming. Moves most SP classes to sp package.