diff --git a/anchorgarden/src/main/java/jaist/css/covis/AnchorGarden.java b/anchorgarden/src/main/java/jaist/css/covis/AnchorGarden.java
index b98b3f3..cca24a4 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/AnchorGarden.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/AnchorGarden.java
@@ -14,16 +14,16 @@
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import edu.umd.cs.piccolo.PCamera;
-import edu.umd.cs.piccolo.PInputManager;
-import edu.umd.cs.piccolo.PNode;
-import edu.umd.cs.piccolo.event.PBasicInputEventHandler;
-import edu.umd.cs.piccolo.event.PInputEvent;
-import edu.umd.cs.piccolo.event.PInputEventListener;
-import edu.umd.cs.piccolo.nodes.PText;
-import edu.umd.cs.piccolo.util.PBounds;
-import edu.umd.cs.piccolo.util.PPaintContext;
-import edu.umd.cs.piccolox.event.PZoomToEventHandler;
+import org.piccolo2d.PCamera;
+import org.piccolo2d.PInputManager;
+import org.piccolo2d.PNode;
+import org.piccolo2d.event.PBasicInputEventHandler;
+import org.piccolo2d.event.PInputEvent;
+import org.piccolo2d.event.PInputEventListener;
+import org.piccolo2d.nodes.PText;
+import org.piccolo2d.util.PBounds;
+import org.piccolo2d.util.PPaintContext;
+import org.piccolo2d.extras.event.PZoomToEventHandler;
 import jaist.css.covis.cls.Covis_Object;
 import jaist.css.covis.cls.Informer;
 import jaist.css.covis.fm.FlowMenu_TMRG;
diff --git a/anchorgarden/src/main/java/jaist/css/covis/CoVisBuffer.java b/anchorgarden/src/main/java/jaist/css/covis/CoVisBuffer.java
index e9e9c5a..fc04705 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/CoVisBuffer.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/CoVisBuffer.java
@@ -9,8 +9,8 @@
 import javax.swing.JCheckBox;
 import javax.swing.Timer;
 
-import edu.umd.cs.piccolo.PNode;
-import edu.umd.cs.piccolo.nodes.PPath;
+import org.piccolo2d.PNode;
+import org.piccolo2d.nodes.PPath;
 import jaist.css.covis.cls.Anchor;
 import jaist.css.covis.cls.ClassField;
 import jaist.css.covis.cls.ClassFieldMenu;
diff --git a/anchorgarden/src/main/java/jaist/css/covis/CoVisWindow_SelectionRegionHandler.java b/anchorgarden/src/main/java/jaist/css/covis/CoVisWindow_SelectionRegionHandler.java
index 9541ea6..809ef2a 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/CoVisWindow_SelectionRegionHandler.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/CoVisWindow_SelectionRegionHandler.java
@@ -9,11 +9,11 @@
 import java.util.Collection;
 import java.util.Hashtable;
 
-import edu.umd.cs.piccolo.PNode;
-import edu.umd.cs.piccolo.event.PDragSequenceEventHandler;
-import edu.umd.cs.piccolo.event.PInputEvent;
-import edu.umd.cs.piccolo.nodes.PPath;
-import edu.umd.cs.piccolo.util.PBounds;
+import org.piccolo2d.PNode;
+import org.piccolo2d.event.PDragSequenceEventHandler;
+import org.piccolo2d.event.PInputEvent;
+import org.piccolo2d.nodes.PPath;
+import org.piccolo2d.util.PBounds;
 
 /**
  * Selectableを範囲選択
diff --git a/anchorgarden/src/main/java/jaist/css/covis/CoVisWindow_ZoomRegionHandler.java b/anchorgarden/src/main/java/jaist/css/covis/CoVisWindow_ZoomRegionHandler.java
index eb03f93..1d8d632 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/CoVisWindow_ZoomRegionHandler.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/CoVisWindow_ZoomRegionHandler.java
@@ -6,13 +6,13 @@
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 
-import edu.umd.cs.piccolo.PCamera;
-import edu.umd.cs.piccolo.PNode;
-import edu.umd.cs.piccolo.event.PDragSequenceEventHandler;
-import edu.umd.cs.piccolo.event.PInputEvent;
-import edu.umd.cs.piccolo.nodes.PPath;
-import edu.umd.cs.piccolo.util.PAffineTransform;
-import edu.umd.cs.piccolo.util.PBounds;
+import org.piccolo2d.PCamera;
+import org.piccolo2d.PNode;
+import org.piccolo2d.event.PDragSequenceEventHandler;
+import org.piccolo2d.event.PInputEvent;
+import org.piccolo2d.nodes.PPath;
+import org.piccolo2d.util.PAffineTransform;
+import org.piccolo2d.util.PBounds;
 import jaist.css.covis.util.BUtil;
 import jaist.css.covis.util.FramePopup;
 
diff --git a/anchorgarden/src/main/java/jaist/css/covis/CoversTransparencyControl.java b/anchorgarden/src/main/java/jaist/css/covis/CoversTransparencyControl.java
index 0d8bc06..5e6e64e 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/CoversTransparencyControl.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/CoversTransparencyControl.java
@@ -2,7 +2,7 @@
 
 import java.util.ArrayList;
 
-import edu.umd.cs.piccolo.PNode;
+import org.piccolo2d.PNode;
 
 public class CoversTransparencyControl implements Runnable {
 	Thread transparencyThread = null;
diff --git a/anchorgarden/src/main/java/jaist/css/covis/MyPPanEventHandler.java b/anchorgarden/src/main/java/jaist/css/covis/MyPPanEventHandler.java
index b0977a1..f3a46f6 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/MyPPanEventHandler.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/MyPPanEventHandler.java
@@ -1,8 +1,8 @@
 package jaist.css.covis;
 
-import edu.umd.cs.piccolo.event.PDragSequenceEventHandler;
-import edu.umd.cs.piccolo.event.PInputEvent;
-import edu.umd.cs.piccolo.util.PDimension;
+import org.piccolo2d.event.PDragSequenceEventHandler;
+import org.piccolo2d.event.PInputEvent;
+import org.piccolo2d.util.PDimension;
 
 /**
  * ATNWindow右上メニューの[pan]
diff --git a/anchorgarden/src/main/java/jaist/css/covis/PPickEventHandler.java b/anchorgarden/src/main/java/jaist/css/covis/PPickEventHandler.java
index 79e9756..29adbbb 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/PPickEventHandler.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/PPickEventHandler.java
@@ -2,10 +2,10 @@
 
 import java.util.ArrayList;
 
-import edu.umd.cs.piccolo.PNode;
-import edu.umd.cs.piccolo.event.PDragSequenceEventHandler;
-import edu.umd.cs.piccolo.event.PInputEvent;
-import edu.umd.cs.piccolo.util.PDimension;
+import org.piccolo2d.PNode;
+import org.piccolo2d.event.PDragSequenceEventHandler;
+import org.piccolo2d.event.PInputEvent;
+import org.piccolo2d.util.PDimension;
 
 /**
  * ATNWindow右上メニューの[pick]
diff --git a/anchorgarden/src/main/java/jaist/css/covis/RootBuffer.java b/anchorgarden/src/main/java/jaist/css/covis/RootBuffer.java
index 6e5d1fb..ea6cd62 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/RootBuffer.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/RootBuffer.java
@@ -3,9 +3,9 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 
-import edu.umd.cs.piccolo.PCamera;
-import edu.umd.cs.piccolo.PLayer;
-import edu.umd.cs.piccolo.PRoot;
+import org.piccolo2d.PCamera;
+import org.piccolo2d.PLayer;
+import org.piccolo2d.PRoot;
 
 /**
  * ATNBuffer(バッファ)のスーパークラス．画面表示モデルのルート(root), および表示レイヤ(layer)を持つ．
diff --git a/anchorgarden/src/main/java/jaist/css/covis/RootWindow.java b/anchorgarden/src/main/java/jaist/css/covis/RootWindow.java
index 8f9f4b9..e754ed9 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/RootWindow.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/RootWindow.java
@@ -23,9 +23,9 @@
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 
-import edu.umd.cs.piccolo.PCamera;
-import edu.umd.cs.piccolo.event.PInputEventFilter;
-import edu.umd.cs.piccolo.util.PBounds;
+import org.piccolo2d.PCamera;
+import org.piccolo2d.event.PInputEventFilter;
+import org.piccolo2d.util.PBounds;
 import jaist.css.covis.cls.ClassFieldMenu;
 import jaist.css.covis.util.MyPCanvas;
 import jaist.css.covis.util.MyPFrame;
diff --git a/anchorgarden/src/main/java/jaist/css/covis/Selectable.java b/anchorgarden/src/main/java/jaist/css/covis/Selectable.java
index 80853c8..e1aa8cf 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/Selectable.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/Selectable.java
@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.Hashtable;
 
-import edu.umd.cs.piccolo.PNode;
+import org.piccolo2d.PNode;
 
 public interface Selectable {
 	boolean isSelected();
diff --git a/anchorgarden/src/main/java/jaist/css/covis/ToolTipProvider.java b/anchorgarden/src/main/java/jaist/css/covis/ToolTipProvider.java
index a4569c5..cd8acf8 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/ToolTipProvider.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/ToolTipProvider.java
@@ -1,6 +1,6 @@
 package jaist.css.covis;
 
-import edu.umd.cs.piccolo.PNode;
+import org.piccolo2d.PNode;
 
 public interface ToolTipProvider {
 	PNode getToolTipNode();
diff --git a/anchorgarden/src/main/java/jaist/css/covis/ViewerKeyEventListener.java b/anchorgarden/src/main/java/jaist/css/covis/ViewerKeyEventListener.java
index 9fe7c35..42b1b37 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/ViewerKeyEventListener.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/ViewerKeyEventListener.java
@@ -4,10 +4,10 @@
 import java.awt.event.KeyListener;
 import java.util.Hashtable;
 
-import edu.umd.cs.piccolo.PCamera;
-import edu.umd.cs.piccolo.event.PBasicInputEventHandler;
-import edu.umd.cs.piccolo.event.PInputEvent;
-import edu.umd.cs.piccolo.util.PBounds;
+import org.piccolo2d.PCamera;
+import org.piccolo2d.event.PBasicInputEventHandler;
+import org.piccolo2d.event.PInputEvent;
+import org.piccolo2d.util.PBounds;
 import jaist.css.covis.pui.PMenuItem_Abstract;
 import jaist.css.covis.util.BUtil;
 
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/Anchor.java b/anchorgarden/src/main/java/jaist/css/covis/cls/Anchor.java
index 43c01f6..cda939f 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/Anchor.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/Anchor.java
@@ -6,12 +6,12 @@
 import java.awt.BasicStroke;
 import java.awt.Color;
 
-import edu.umd.cs.piccolo.PNode;
-import edu.umd.cs.piccolo.event.PInputEvent;
-import edu.umd.cs.piccolo.nodes.PPath;
-import edu.umd.cs.piccolo.nodes.PText;
-import edu.umd.cs.piccolo.util.PBounds;
-import edu.umd.cs.piccolo.util.PDimension;
+import org.piccolo2d.PNode;
+import org.piccolo2d.event.PInputEvent;
+import org.piccolo2d.nodes.PPath;
+import org.piccolo2d.nodes.PText;
+import org.piccolo2d.util.PBounds;
+import org.piccolo2d.util.PDimension;
 
 class AnchorTab extends PPath implements Move, ToolTipProvider {
 	private static final long serialVersionUID = 3651392444867276102L;
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/ClassField.java b/anchorgarden/src/main/java/jaist/css/covis/cls/ClassField.java
index 990f182..9b121c4 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/ClassField.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/ClassField.java
@@ -9,8 +9,8 @@
 
 import javax.swing.Timer;
 
-import edu.umd.cs.piccolo.PNode;
-import edu.umd.cs.piccolo.nodes.PText;
+import org.piccolo2d.PNode;
+import org.piccolo2d.nodes.PText;
 
 public class ClassField extends Field {
 	private static final long serialVersionUID = 3524513728998576206L;
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/ClassStamp.java b/anchorgarden/src/main/java/jaist/css/covis/cls/ClassStamp.java
index 2258b79..83c3927 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/ClassStamp.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/ClassStamp.java
@@ -10,10 +10,10 @@
 import java.util.List;
 import java.util.TreeMap;
 
-import edu.umd.cs.piccolo.PNode;
-import edu.umd.cs.piccolo.nodes.PPath;
-import edu.umd.cs.piccolo.nodes.PText;
-import edu.umd.cs.piccolo.util.PDimension;
+import org.piccolo2d.PNode;
+import org.piccolo2d.nodes.PPath;
+import org.piccolo2d.nodes.PText;
+import org.piccolo2d.util.PDimension;
 
 public class ClassStamp extends PPath implements Layoutable, Selectable, Move {
 	public static BasicStroke roundrectStroke = new BasicStroke(4f,BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND, 90.0f);
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/ClickHandler.java b/anchorgarden/src/main/java/jaist/css/covis/cls/ClickHandler.java
index 8f62f5e..6e12fa2 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/ClickHandler.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/ClickHandler.java
@@ -1,7 +1,7 @@
 package jaist.css.covis.cls;
 
 import jaist.css.covis.fm.FlowMenu_TMRG;
-import edu.umd.cs.piccolo.event.PInputEvent;
+import org.piccolo2d.event.PInputEvent;
 
 public interface ClickHandler {
 	public void clicked(PInputEvent e, FlowMenu_TMRG fmenu);
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/CovisObj_TransparencyControl.java b/anchorgarden/src/main/java/jaist/css/covis/cls/CovisObj_TransparencyControl.java
index f1d5ff4..70f08ef 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/CovisObj_TransparencyControl.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/CovisObj_TransparencyControl.java
@@ -1,6 +1,6 @@
 package jaist.css.covis.cls;
 
-import edu.umd.cs.piccolo.PNode;
+import org.piccolo2d.PNode;
 
 public class CovisObj_TransparencyControl implements Runnable {
 	Thread transparencyThread = null;
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_Array.java b/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_Array.java
index a238bbf..5bf4a82 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_Array.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_Array.java
@@ -13,9 +13,9 @@
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 
-import edu.umd.cs.piccolo.nodes.PPath;
-import edu.umd.cs.piccolo.nodes.PText;
-import edu.umd.cs.piccolo.util.PDimension;
+import org.piccolo2d.nodes.PPath;
+import org.piccolo2d.nodes.PText;
+import org.piccolo2d.util.PDimension;
 
 public class Covis_Array extends Covis_Object {
 	private static final long serialVersionUID = 8131819427660903628L;
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_BTree.java b/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_BTree.java
index 4612bb6..6dbcba8 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_BTree.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_BTree.java
@@ -19,7 +19,7 @@
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
-import edu.umd.cs.piccolo.nodes.PText;
+import org.piccolo2d.nodes.PText;
 
 public class Covis_BTree extends Covis_Object {
 
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_Frac.java b/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_Frac.java
index d2e1b43..45dd813 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_Frac.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_Frac.java
@@ -19,8 +19,8 @@
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
-import edu.umd.cs.piccolo.nodes.PPath;
-import edu.umd.cs.piccolo.nodes.PText;
+import org.piccolo2d.nodes.PPath;
+import org.piccolo2d.nodes.PText;
 
 public class Covis_Frac extends Covis_Object {
 
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_LinkList.java b/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_LinkList.java
index 38da98c..c3c5656 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_LinkList.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_LinkList.java
@@ -19,7 +19,7 @@
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
-import edu.umd.cs.piccolo.nodes.PText;
+import org.piccolo2d.nodes.PText;
 
 public class Covis_LinkList extends Covis_Object {
 
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_Object.java b/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_Object.java
index 99e0be7..9902d36 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_Object.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_Object.java
@@ -17,10 +17,10 @@
 
 import javax.swing.JFrame;
 
-import edu.umd.cs.piccolo.PNode;
-import edu.umd.cs.piccolo.activities.PActivity;
-import edu.umd.cs.piccolo.nodes.PText;
-import edu.umd.cs.piccolo.util.PDimension;
+import org.piccolo2d.PNode;
+import org.piccolo2d.activities.PActivity;
+import org.piccolo2d.nodes.PText;
+import org.piccolo2d.util.PDimension;
 
 public class Covis_Object extends Covis_Type implements ToolTipProvider, ToFront, Move {
 	public static BasicStroke basicStroke = new BasicStroke(3f,BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND, 90.0f);
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_String.java b/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_String.java
index cabbee2..53ef4e6 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_String.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_String.java
@@ -6,7 +6,7 @@
 
 import javax.swing.JOptionPane;
 
-import edu.umd.cs.piccolo.nodes.PText;
+import org.piccolo2d.nodes.PText;
 
 public class Covis_String extends Covis_Object {
 	private static final long serialVersionUID = 8131819427660903628L;
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_Type.java b/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_Type.java
index d7fb105..7a17787 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_Type.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_Type.java
@@ -7,8 +7,8 @@
 
 import javax.swing.JFrame;
 
-import edu.umd.cs.piccolo.PNode;
-import edu.umd.cs.piccolo.nodes.PPath;
+import org.piccolo2d.PNode;
+import org.piccolo2d.nodes.PPath;
 
 @SuppressWarnings("serial")
 public abstract class Covis_Type extends PPath {
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_char.java b/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_char.java
index c8c7b18..8889d37 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_char.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_char.java
@@ -4,7 +4,7 @@
 
 import java.awt.Color;
 
-import edu.umd.cs.piccolo.nodes.PText;
+import org.piccolo2d.nodes.PText;
 
 public class Covis_char extends Covis_primitive {
 	private static final long serialVersionUID = 8131819427660903628L;
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_int.java b/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_int.java
index 13cceaf..d164078 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_int.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_int.java
@@ -4,8 +4,8 @@
 
 import java.awt.Color;
 
-import edu.umd.cs.piccolo.PNode;
-import edu.umd.cs.piccolo.nodes.PText;
+import org.piccolo2d.PNode;
+import org.piccolo2d.nodes.PText;
 
 public class Covis_int extends Covis_primitive {
 	private static final long serialVersionUID = 8131819427660903628L;
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_primitive.java b/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_primitive.java
index 447bb51..4115f6a 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_primitive.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/Covis_primitive.java
@@ -14,9 +14,9 @@
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 
-import edu.umd.cs.piccolo.PNode;
-import edu.umd.cs.piccolo.nodes.PText;
-import edu.umd.cs.piccolo.util.PDimension;
+import org.piccolo2d.PNode;
+import org.piccolo2d.nodes.PText;
+import org.piccolo2d.util.PDimension;
 
 public class Covis_primitive extends Covis_Type implements ToolTipProvider, ToFront, Move {
 	public static BasicStroke basicStroke = new BasicStroke(3f,BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND, 90.0f);
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/DragNotice.java b/anchorgarden/src/main/java/jaist/css/covis/cls/DragNotice.java
index 274361c..1911815 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/DragNotice.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/DragNotice.java
@@ -1,7 +1,7 @@
 package jaist.css.covis.cls;
 
 import jaist.css.covis.CoVisBuffer;
-import edu.umd.cs.piccolo.event.PInputEvent;
+import org.piccolo2d.event.PInputEvent;
 
 public interface DragNotice {
 	public void setDragNotice(boolean f);
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/Field.java b/anchorgarden/src/main/java/jaist/css/covis/cls/Field.java
index 764a80f..be5393f 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/Field.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/Field.java
@@ -5,10 +5,10 @@
 import java.util.List;
 import java.util.TreeMap;
 
-import edu.umd.cs.piccolo.PNode;
-import edu.umd.cs.piccolo.nodes.PPath;
-import edu.umd.cs.piccolo.nodes.PText;
-import edu.umd.cs.piccolo.util.PDimension;
+import org.piccolo2d.PNode;
+import org.piccolo2d.nodes.PPath;
+import org.piccolo2d.nodes.PText;
+import org.piccolo2d.util.PDimension;
 
 public class Field extends PPath implements Layoutable , Move{
 	private static final long serialVersionUID = 3524513728998576206L;
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/Layoutable.java b/anchorgarden/src/main/java/jaist/css/covis/cls/Layoutable.java
index d5e7bd1..add3608 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/Layoutable.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/Layoutable.java
@@ -1,6 +1,6 @@
 package jaist.css.covis.cls;
 
-import edu.umd.cs.piccolo.PNode;
+import org.piccolo2d.PNode;
 
 public interface Layoutable {
 	public void layout(int dur);
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/Move.java b/anchorgarden/src/main/java/jaist/css/covis/cls/Move.java
index e04ed21..a14baa1 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/Move.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/Move.java
@@ -1,6 +1,6 @@
 package jaist.css.covis.cls;
 
-import edu.umd.cs.piccolo.util.PDimension;
+import org.piccolo2d.util.PDimension;
 
 public interface Move {
 	public void move(PDimension d);
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/ObjectField.java b/anchorgarden/src/main/java/jaist/css/covis/cls/ObjectField.java
index 45004cf..41c21ba 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/ObjectField.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/ObjectField.java
@@ -12,12 +12,12 @@
 import java.util.List;
 import java.util.TreeMap;
 
-import edu.umd.cs.piccolo.PNode;
-import edu.umd.cs.piccolo.event.PInputEvent;
-import edu.umd.cs.piccolo.nodes.PPath;
-import edu.umd.cs.piccolo.nodes.PText;
-import edu.umd.cs.piccolo.util.PBounds;
-import edu.umd.cs.piccolo.util.PDimension;
+import org.piccolo2d.PNode;
+import org.piccolo2d.event.PInputEvent;
+import org.piccolo2d.nodes.PPath;
+import org.piccolo2d.nodes.PText;
+import org.piccolo2d.util.PBounds;
+import org.piccolo2d.util.PDimension;
 
 public class ObjectField extends PPath implements Layoutable , ToolTipProvider, ClickHandler, Move {
 	private static final long serialVersionUID = 3524513728998576206L;
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/PNodeBoundsIntersectsFilter.java b/anchorgarden/src/main/java/jaist/css/covis/cls/PNodeBoundsIntersectsFilter.java
index 9c04417..bd86687 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/PNodeBoundsIntersectsFilter.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/PNodeBoundsIntersectsFilter.java
@@ -1,8 +1,8 @@
 package jaist.css.covis.cls;
 
-import edu.umd.cs.piccolo.PNode;
-import edu.umd.cs.piccolo.util.PBounds;
-import edu.umd.cs.piccolo.util.PNodeFilter;
+import org.piccolo2d.PNode;
+import org.piccolo2d.util.PBounds;
+import org.piccolo2d.util.PNodeFilter;
 
 /**
  * 引数に与えたノードの領域が，boundsの領域に完全に入っているかどうかを調べるフィルタ
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/RefLink.java b/anchorgarden/src/main/java/jaist/css/covis/cls/RefLink.java
index afb1ee7..574c8f2 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/RefLink.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/RefLink.java
@@ -6,10 +6,10 @@
 import java.awt.geom.Line2D;
 import java.awt.geom.Point2D;
 
-import edu.umd.cs.piccolo.PNode;
-import edu.umd.cs.piccolo.event.PInputEvent;
-import edu.umd.cs.piccolo.nodes.PPath;
-import edu.umd.cs.piccolo.util.PDimension;
+import org.piccolo2d.PNode;
+import org.piccolo2d.event.PInputEvent;
+import org.piccolo2d.nodes.PPath;
+import org.piccolo2d.util.PDimension;
 
 /**
  * アンカータブと変数などとをつなぐ「線」
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/StaticField.java b/anchorgarden/src/main/java/jaist/css/covis/cls/StaticField.java
index b1db9e0..52ec9a6 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/StaticField.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/StaticField.java
@@ -11,11 +11,11 @@
 import java.util.List;
 import java.util.TreeMap;
 
-import edu.umd.cs.piccolo.PNode;
-import edu.umd.cs.piccolo.event.PInputEvent;
-import edu.umd.cs.piccolo.nodes.PPath;
-import edu.umd.cs.piccolo.nodes.PText;
-import edu.umd.cs.piccolo.util.PDimension;
+import org.piccolo2d.PNode;
+import org.piccolo2d.event.PInputEvent;
+import org.piccolo2d.nodes.PPath;
+import org.piccolo2d.nodes.PText;
+import org.piccolo2d.util.PDimension;
 
 public class StaticField extends PPath implements Layoutable , ToolTipProvider, ClickHandler, Move {
 	private static final long serialVersionUID = -6949546345615986003L;
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/VarField.java b/anchorgarden/src/main/java/jaist/css/covis/cls/VarField.java
index 55ff8eb..7193bec 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/VarField.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/VarField.java
@@ -16,11 +16,11 @@
 
 import javax.swing.Timer;
 
-import edu.umd.cs.piccolo.PNode;
-import edu.umd.cs.piccolo.event.PInputEvent;
-import edu.umd.cs.piccolo.nodes.PPath;
-import edu.umd.cs.piccolo.nodes.PText;
-import edu.umd.cs.piccolo.util.PDimension;
+import org.piccolo2d.PNode;
+import org.piccolo2d.event.PInputEvent;
+import org.piccolo2d.nodes.PPath;
+import org.piccolo2d.nodes.PText;
+import org.piccolo2d.util.PDimension;
 
 public class VarField extends PPath implements Layoutable , ToolTipProvider, ClickHandler, Move {
 	private static final long serialVersionUID = 3524513728998576206L;
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/Variable.java b/anchorgarden/src/main/java/jaist/css/covis/cls/Variable.java
index 63ae87d..77cccec 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/Variable.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/Variable.java
@@ -18,10 +18,10 @@
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 
-import edu.umd.cs.piccolo.PNode;
-import edu.umd.cs.piccolo.nodes.PPath;
-import edu.umd.cs.piccolo.nodes.PText;
-import edu.umd.cs.piccolo.util.PDimension;
+import org.piccolo2d.PNode;
+import org.piccolo2d.nodes.PPath;
+import org.piccolo2d.nodes.PText;
+import org.piccolo2d.util.PDimension;
 
 public class Variable extends PPath implements Layoutable, Selectable, ToFront , Move{
 	public static BasicStroke roundrectStroke = new BasicStroke(6f,BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND, 90.0f);
diff --git a/anchorgarden/src/main/java/jaist/css/covis/cls/VariableM.java b/anchorgarden/src/main/java/jaist/css/covis/cls/VariableM.java
index 74eeb23..84e8562 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/cls/VariableM.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/cls/VariableM.java
@@ -11,8 +11,8 @@
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 
-import edu.umd.cs.piccolo.PNode;
-import edu.umd.cs.piccolo.util.PDimension;
+import org.piccolo2d.PNode;
+import org.piccolo2d.util.PDimension;
 
 public class VariableM extends Variable{
 	private static final long serialVersionUID = 1922932400458120787L;
diff --git a/anchorgarden/src/main/java/jaist/css/covis/fm/AbstractFlowMenu.java b/anchorgarden/src/main/java/jaist/css/covis/fm/AbstractFlowMenu.java
index b30c738..9b3b93d 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/fm/AbstractFlowMenu.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/fm/AbstractFlowMenu.java
@@ -5,11 +5,11 @@
 
 import javax.swing.JFrame;
 
-import edu.umd.cs.piccolo.PCamera;
-import edu.umd.cs.piccolo.PCanvas;
-import edu.umd.cs.piccolo.PNode;
-import edu.umd.cs.piccolo.event.PDragSequenceEventHandler;
-import edu.umd.cs.piccolo.event.PInputEvent;
+import org.piccolo2d.PCamera;
+import org.piccolo2d.PCanvas;
+import org.piccolo2d.PNode;
+import org.piccolo2d.event.PDragSequenceEventHandler;
+import org.piccolo2d.event.PInputEvent;
 
 /**
  * フローメニューの共通部分
diff --git a/anchorgarden/src/main/java/jaist/css/covis/fm/DefaultState.java b/anchorgarden/src/main/java/jaist/css/covis/fm/DefaultState.java
index fbc9bbc..a7f8f5a 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/fm/DefaultState.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/fm/DefaultState.java
@@ -8,9 +8,9 @@
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 
-import edu.umd.cs.piccolo.event.PInputEvent;
-import edu.umd.cs.piccolo.nodes.PPath;
-import edu.umd.cs.piccolo.nodes.PText;
+import org.piccolo2d.event.PInputEvent;
+import org.piccolo2d.nodes.PPath;
+import org.piccolo2d.nodes.PText;
 
 /**
  * 一般的な「状態」
diff --git a/anchorgarden/src/main/java/jaist/css/covis/fm/FlowMenu_TMRG.java b/anchorgarden/src/main/java/jaist/css/covis/fm/FlowMenu_TMRG.java
index c333558..b3db749 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/fm/FlowMenu_TMRG.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/fm/FlowMenu_TMRG.java
@@ -12,10 +12,10 @@
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
 
-import edu.umd.cs.piccolo.PNode;
-import edu.umd.cs.piccolo.event.PInputEvent;
-import edu.umd.cs.piccolo.util.PBounds;
-import edu.umd.cs.piccolo.util.PDimension;
+import org.piccolo2d.PNode;
+import org.piccolo2d.event.PInputEvent;
+import org.piccolo2d.util.PBounds;
+import org.piccolo2d.util.PDimension;
 
 /**
  * フローメニュー
diff --git a/anchorgarden/src/main/java/jaist/css/covis/fm/JogState.java b/anchorgarden/src/main/java/jaist/css/covis/fm/JogState.java
index 94039c9..89be972 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/fm/JogState.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/fm/JogState.java
@@ -9,9 +9,9 @@
 import java.awt.geom.Ellipse2D;
 import java.awt.geom.Point2D;
 
-import edu.umd.cs.piccolo.event.PInputEvent;
-import edu.umd.cs.piccolo.nodes.PPath;
-import edu.umd.cs.piccolo.nodes.PText;
+import org.piccolo2d.event.PInputEvent;
+import org.piccolo2d.nodes.PPath;
+import org.piccolo2d.nodes.PText;
 
 /**
  * ジョグダイアル状態
diff --git a/anchorgarden/src/main/java/jaist/css/covis/fm/PActionListener.java b/anchorgarden/src/main/java/jaist/css/covis/fm/PActionListener.java
index f3104f2..82581f3 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/fm/PActionListener.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/fm/PActionListener.java
@@ -1,6 +1,6 @@
 package jaist.css.covis.fm;
 
-import edu.umd.cs.piccolo.event.PInputEvent;
+import org.piccolo2d.event.PInputEvent;
 
 /**
  * FlowMenuでメニューアイテムが選択されたときに，実行される標準的なアクションのためのインタフェース
diff --git a/anchorgarden/src/main/java/jaist/css/covis/fm/ScrollStateAction.java b/anchorgarden/src/main/java/jaist/css/covis/fm/ScrollStateAction.java
index c35c254..316f580 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/fm/ScrollStateAction.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/fm/ScrollStateAction.java
@@ -2,8 +2,8 @@
 
 import java.awt.geom.Point2D;
 
-import edu.umd.cs.piccolo.event.PInputEvent;
-import edu.umd.cs.piccolo.util.PDimension;
+import org.piccolo2d.event.PInputEvent;
+import org.piccolo2d.util.PDimension;
 
 /**
  * 画面のパニング
diff --git a/anchorgarden/src/main/java/jaist/css/covis/fm/State.java b/anchorgarden/src/main/java/jaist/css/covis/fm/State.java
index 84d70b0..86ea8a3 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/fm/State.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/fm/State.java
@@ -2,8 +2,8 @@
 
 import java.awt.Color;
 
-import edu.umd.cs.piccolo.event.PInputEvent;
-import edu.umd.cs.piccolo.nodes.PPath;
+import org.piccolo2d.event.PInputEvent;
+import org.piccolo2d.nodes.PPath;
 
 /**
  * 状態
diff --git a/anchorgarden/src/main/java/jaist/css/covis/fm/StateAction.java b/anchorgarden/src/main/java/jaist/css/covis/fm/StateAction.java
index fc12389..99afb8c 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/fm/StateAction.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/fm/StateAction.java
@@ -1,6 +1,6 @@
 package jaist.css.covis.fm;
 
-import edu.umd.cs.piccolo.event.PInputEvent;
+import org.piccolo2d.event.PInputEvent;
 
 /**
  * 状態を選択したときのアクション
diff --git a/anchorgarden/src/main/java/jaist/css/covis/fm/WalkScrollStateAction.java b/anchorgarden/src/main/java/jaist/css/covis/fm/WalkScrollStateAction.java
index e090dbf..8789072 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/fm/WalkScrollStateAction.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/fm/WalkScrollStateAction.java
@@ -4,8 +4,8 @@
 import java.awt.geom.Point2D;
 import java.util.TimerTask;
 
-import edu.umd.cs.piccolo.event.PInputEvent;
-import edu.umd.cs.piccolo.nodes.PPath;
+import org.piccolo2d.event.PInputEvent;
+import org.piccolo2d.nodes.PPath;
 
 /**
  * ウォーク・スクロールのときのアクション
diff --git a/anchorgarden/src/main/java/jaist/css/covis/fm/ZoomRegionStateAction.java b/anchorgarden/src/main/java/jaist/css/covis/fm/ZoomRegionStateAction.java
index 80172b9..8f98732 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/fm/ZoomRegionStateAction.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/fm/ZoomRegionStateAction.java
@@ -6,9 +6,9 @@
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 
-import edu.umd.cs.piccolo.event.PInputEvent;
-import edu.umd.cs.piccolo.nodes.PPath;
-import edu.umd.cs.piccolo.util.PAffineTransform;
+import org.piccolo2d.event.PInputEvent;
+import org.piccolo2d.nodes.PPath;
+import org.piccolo2d.util.PAffineTransform;
 
 /**
  * 範囲指定ズームのためのアクション
diff --git a/anchorgarden/src/main/java/jaist/css/covis/hist/CVHist_MethodNew.java b/anchorgarden/src/main/java/jaist/css/covis/hist/CVHist_MethodNew.java
index 136e14b..d2f61f8 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/hist/CVHist_MethodNew.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/hist/CVHist_MethodNew.java
@@ -2,7 +2,7 @@
 
 import jaist.css.covis.CoVisBuffer;
 import jaist.css.covis.cls.Covis_Object;
-import edu.umd.cs.piccolo.PNode;
+import org.piccolo2d.PNode;
 
 public class CVHist_MethodNew extends CVHist_New {
 //	Covis_Object obj;
diff --git a/anchorgarden/src/main/java/jaist/css/covis/hist/CVHist_New.java b/anchorgarden/src/main/java/jaist/css/covis/hist/CVHist_New.java
index 8863921..80b51e6 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/hist/CVHist_New.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/hist/CVHist_New.java
@@ -2,7 +2,7 @@
 
 import jaist.css.covis.CoVisBuffer;
 import jaist.css.covis.cls.Covis_Object;
-import edu.umd.cs.piccolo.PNode;
+import org.piccolo2d.PNode;
 
 public class CVHist_New extends CVHistory {
 	Covis_Object obj;
diff --git a/anchorgarden/src/main/java/jaist/css/covis/mi/MethodInvocationDialog.java b/anchorgarden/src/main/java/jaist/css/covis/mi/MethodInvocationDialog.java
index 8a1aa8b..f43390c 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/mi/MethodInvocationDialog.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/mi/MethodInvocationDialog.java
@@ -20,7 +20,7 @@
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
-import edu.umd.cs.piccolo.activities.PActivity;
+import org.piccolo2d.activities.PActivity;
 
 public class MethodInvocationDialog extends JDialog implements KeyListener {
 	private static final long serialVersionUID = 1852035735398130391L;
diff --git a/anchorgarden/src/main/java/jaist/css/covis/mi/WrapMethod.java b/anchorgarden/src/main/java/jaist/css/covis/mi/WrapMethod.java
index b041350..4519ccd 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/mi/WrapMethod.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/mi/WrapMethod.java
@@ -12,7 +12,7 @@
 
 import javax.swing.AbstractAction;
 
-import edu.umd.cs.piccolo.PNode;
+import org.piccolo2d.PNode;
 
 public class WrapMethod extends AbstractAction {
 	private static final long serialVersionUID = -3933799327221553449L;
diff --git a/anchorgarden/src/main/java/jaist/css/covis/pui/CameraFitConstraint.java b/anchorgarden/src/main/java/jaist/css/covis/pui/CameraFitConstraint.java
index ec78ff8..2c3cde4 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/pui/CameraFitConstraint.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/pui/CameraFitConstraint.java
@@ -4,8 +4,8 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 
-import edu.umd.cs.piccolo.PCamera;
-import edu.umd.cs.piccolo.util.PBounds;
+import org.piccolo2d.PCamera;
+import org.piccolo2d.util.PBounds;
 
 /**
  * 表示領域（キャンバス）のサイズ変更に合わせて，ぴったりレイアウトするためのPropertyChangeListener
diff --git a/anchorgarden/src/main/java/jaist/css/covis/pui/CameraFittable.java b/anchorgarden/src/main/java/jaist/css/covis/pui/CameraFittable.java
index 2c35526..d7575c5 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/pui/CameraFittable.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/pui/CameraFittable.java
@@ -1,6 +1,6 @@
 package jaist.css.covis.pui;
 
-import edu.umd.cs.piccolo.util.PBounds;
+import org.piccolo2d.util.PBounds;
 
 /**
  * 画面表示領域にぴったり揃えて配置されるオブジェクトが実装すべきインタフェース．
diff --git a/anchorgarden/src/main/java/jaist/css/covis/pui/FadeTimer.java b/anchorgarden/src/main/java/jaist/css/covis/pui/FadeTimer.java
index f64038e..bdfe4e4 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/pui/FadeTimer.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/pui/FadeTimer.java
@@ -6,7 +6,7 @@
 
 import javax.swing.Timer;
 
-import edu.umd.cs.piccolo.PNode;
+import org.piccolo2d.PNode;
 
 public class FadeTimer implements ActionListener, Runnable{
 	int keepMsec;
diff --git a/anchorgarden/src/main/java/jaist/css/covis/pui/PMenuBar.java b/anchorgarden/src/main/java/jaist/css/covis/pui/PMenuBar.java
index 078a5ea..cfb8b17 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/pui/PMenuBar.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/pui/PMenuBar.java
@@ -5,11 +5,11 @@
 import java.awt.Dimension;
 import java.util.ArrayList;
 
-import edu.umd.cs.piccolo.PCamera;
-import edu.umd.cs.piccolo.event.PBasicInputEventHandler;
-import edu.umd.cs.piccolo.event.PInputEvent;
-import edu.umd.cs.piccolo.nodes.PPath;
-import edu.umd.cs.piccolo.util.PBounds;
+import org.piccolo2d.PCamera;
+import org.piccolo2d.event.PBasicInputEventHandler;
+import org.piccolo2d.event.PInputEvent;
+import org.piccolo2d.nodes.PPath;
+import org.piccolo2d.util.PBounds;
 
 public class PMenuBar extends PBasicInputEventHandler implements CameraFittable, Runnable {
 	// private static final long serialVersionUID = 1776018940471391776L;
diff --git a/anchorgarden/src/main/java/jaist/css/covis/pui/PMenuItem_Abstract.java b/anchorgarden/src/main/java/jaist/css/covis/pui/PMenuItem_Abstract.java
index 86fbea0..d5558e5 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/pui/PMenuItem_Abstract.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/pui/PMenuItem_Abstract.java
@@ -7,10 +7,10 @@
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 
-import edu.umd.cs.piccolo.event.PBasicInputEventHandler;
-import edu.umd.cs.piccolo.event.PInputEvent;
-import edu.umd.cs.piccolo.nodes.PPath;
-import edu.umd.cs.piccolo.nodes.PText;
+import org.piccolo2d.event.PBasicInputEventHandler;
+import org.piccolo2d.event.PInputEvent;
+import org.piccolo2d.nodes.PPath;
+import org.piccolo2d.nodes.PText;
 
 /**
  * PMenuItem実装の共通部分
diff --git a/anchorgarden/src/main/java/jaist/css/covis/pui/PMenuRoot.java b/anchorgarden/src/main/java/jaist/css/covis/pui/PMenuRoot.java
index b844d7b..3763783 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/pui/PMenuRoot.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/pui/PMenuRoot.java
@@ -4,8 +4,8 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import edu.umd.cs.piccolo.PNode;
-import edu.umd.cs.piccolo.nodes.PPath;
+import org.piccolo2d.PNode;
+import org.piccolo2d.nodes.PPath;
 
 /**
  * PMenuItemを並べて表示するための受け皿(メニュールート)
diff --git a/anchorgarden/src/main/java/jaist/css/covis/util/BUtil.java b/anchorgarden/src/main/java/jaist/css/covis/util/BUtil.java
index 6dd2b8e..82c5c49 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/util/BUtil.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/util/BUtil.java
@@ -1,6 +1,6 @@
 package jaist.css.covis.util;
 
-import edu.umd.cs.piccolo.util.PBounds;
+import org.piccolo2d.util.PBounds;
 
 /**
  * Bounds Utility Class
diff --git a/anchorgarden/src/main/java/jaist/css/covis/util/MyPCanvas.java b/anchorgarden/src/main/java/jaist/css/covis/util/MyPCanvas.java
index 1d24f15..a62ecfc 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/util/MyPCanvas.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/util/MyPCanvas.java
@@ -8,16 +8,16 @@
 import java.awt.geom.NoninvertibleTransformException;
 import java.awt.geom.Point2D;
 
-import edu.umd.cs.piccolo.PCamera;
-import edu.umd.cs.piccolo.PCanvas;
-import edu.umd.cs.piccolo.PInputManager;
-import edu.umd.cs.piccolo.event.PBasicInputEventHandler;
-import edu.umd.cs.piccolo.event.PInputEvent;
-import edu.umd.cs.piccolo.event.PInputEventFilter;
-import edu.umd.cs.piccolo.event.PPanEventHandler;
-import edu.umd.cs.piccolo.util.PBounds;
-import edu.umd.cs.piccolox.event.PSelectionEventHandler;
-import edu.umd.cs.piccolox.event.PZoomToEventHandler;
+import org.piccolo2d.PCamera;
+import org.piccolo2d.PCanvas;
+import org.piccolo2d.PInputManager;
+import org.piccolo2d.event.PBasicInputEventHandler;
+import org.piccolo2d.event.PInputEvent;
+import org.piccolo2d.event.PInputEventFilter;
+import org.piccolo2d.event.PPanEventHandler;
+import org.piccolo2d.util.PBounds;
+import org.piccolo2d.extras.event.PSelectionEventHandler;
+import org.piccolo2d.extras.event.PZoomToEventHandler;
 
 @SuppressWarnings("serial")
 
diff --git a/anchorgarden/src/main/java/jaist/css/covis/util/MyPFrame.java b/anchorgarden/src/main/java/jaist/css/covis/util/MyPFrame.java
index 5d4f73e..99a3337 100644
--- a/anchorgarden/src/main/java/jaist/css/covis/util/MyPFrame.java
+++ b/anchorgarden/src/main/java/jaist/css/covis/util/MyPFrame.java
@@ -29,7 +29,7 @@
  * Piccolo was written at the Human-Computer Interaction Laboratory www.cs.umd.edu/hcil by Jesse Grosjean
  * under the supervision of Ben Bederson. The Piccolo website is www.cs.umd.edu/hcil/piccolo.
  */
-//package edu.umd.cs.piccolox;
+//package org.piccolo2d.extras;
 
 import java.awt.DisplayMode;
 import java.awt.GraphicsDevice;
diff --git a/core/.DS_Store b/core/.DS_Store
new file mode 100644
index 0000000..ee77193
--- /dev/null
+++ b/core/.DS_Store
Binary files differ
diff --git a/core/src/main/java/org/piccolo2d/.DS_Store b/core/src/main/java/org/piccolo2d/.DS_Store
new file mode 100644
index 0000000..6bd614c
--- /dev/null
+++ b/core/src/main/java/org/piccolo2d/.DS_Store
Binary files differ