-import com.sun.vlsi.chips.marina.test.Marina.Ilc;
-import com.sun.vlsi.chips.marina.test.CmdArgs;
-import com.sun.vlsi.chips.marina.test.CmdArgs.Mode;
+import edu.berkeley.fleet.marina.Marina.Ilc;
+import edu.berkeley.fleet.marina.CmdArgs;
+import edu.berkeley.fleet.marina.CmdArgs.Mode;