import com.att.authz.gui.pages.WebCommand;
import com.att.authz.org.OrganizationFactory;
import com.att.authz.server.AbsServer;
-import com.att.cadi.CadiException;
-import com.att.cadi.aaf.v2_0.AAFTrustChecker;
-import com.att.cadi.client.Future;
-import com.att.cadi.config.Config;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.aaf.v2_0.AAFTrustChecker;
+import org.onap.aaf.cadi.client.Future;
+import org.onap.aaf.cadi.config.Config;
import com.att.cssa.rserv.CachingFileAccess;
-import com.att.inno.env.APIException;
-import com.att.inno.env.Env;
-import com.att.inno.env.Slot;
-import com.att.rosetta.env.RosettaDF;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.Slot;
+import org.onap.aaf.rosetta.env.RosettaDF;
import com.att.xgen.html.HTMLGen;
import com.att.xgen.html.State;