Restructure implicits