import sys
import tempfile
-from geni.util.certificate import *
-from geni.util.trustedroot import *
+from geni.trust.certificate import *
+from geni.trust.trustedroot import *
from geni.util.hierarchy import *
from geni.util.record import *
from geni.util.genitable import *