##
-# Geni Component Wrapper
+# Sfa Component Wrapper
#
-# This wrapper implements the Geni Slice and Mgmt Interfaces on a node.
+# This wrapper implements the SFA Slice and Mgmt Interfaces on a node.
#
##
import sys
from xmlrpclib import ServerProxy
-from cert import *
-from gid import *
-from geniserver import *
-from excep import *
-from trustedroot import *
-from misc import *
-from record import *
-from geniticket import *
+from sfa.trust.certificate import Certificate, Keypair
+from sfa.trust.gid import *
+from sfa.trust.trustedroot import *
+
+from sfa.util.faults import *
+from sfa.util.misc import *
+from sfa.util.record import *
+from sfa.util.geniticket import *
+from sfa.util.geniserver import *
##
# ComponentManager is a GeniServer that serves slice and