Client: move vendor imports into the vendor file