from types import StringTypes, ListType
from optparse import OptionParser
-from geni.util.certificate import Keypair, Certificate
-from geni.util.credential import Credential
+from geni.trust.certificate import Keypair, Certificate
+from geni.trust.credential import Credential
from geni.util.geniclient import GeniClient, ServerException
-from geni.util.gid import create_uuid
+from geni.trust.gid import create_uuid
from geni.util.record import *
from geni.util.rspec import Rspec