fix imports for client refactoring