diff --git a/demo/Demo.java b/demo/XidDemo.java
similarity index 99%
rename from demo/Demo.java
rename to demo/XidDemo.java
index aab625c..b453616 100644
--- a/demo/Demo.java
+++ b/demo/XidDemo.java
@@ -1,6 +1,6 @@
 import java.util.*;
 import java.io.*;
-import xid.*;
+import fr.devinsy.xid.*;
 
 /**
  *
diff --git a/dotest~ b/dotest~
deleted file mode 100755
index 6d16f52..0000000
--- a/dotest~
+++ /dev/null
@@ -1 +0,0 @@
-$JAVA_HOME/bin/java -classpath lib/activation.jar:lib/log4j-1.2.14.jar:lib/mail.jar:servlet-api.jar:dist/xid.jar:dist/test.jar xid.Test
diff --git a/dodemo b/rundemo
similarity index 100%
rename from dodemo
rename to rundemo
diff --git a/dotest b/runtest
similarity index 100%
rename from dotest
rename to runtest