Moved SprayClientExtras to the internal package
Some minor cleanups