Moved base functionality to Core subspec