Simple client import

One line client import (from the two or three that it was before.)