Moved implicits out of package object and into companion objects