-from sfa.util.faults import *
-from sfa.util.parameter import Parameter, Mixed, python_type, xmlrpc_type
-from sfa.trust.auth import Auth
+from sfa.util.py23 import StringType
+from sfa.util.faults import SfaFault, SfaInvalidAPIMethod, SfaInvalidArgumentCount, SfaInvalidArgument
+
+from sfa.storage.parameter import Parameter, Mixed, python_type, xmlrpc_type