Just code movement, and the glue to call the new functions.

Preparation for hotplug APIs.
Signed-off-by: NJeff Garzik <jgarzik@redhat.com>