diff --git a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java
index aee6400..86cb00f 100644
--- a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java
+++ b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java
@@ -18,7 +18,7 @@
  *
  */
 
-package gr.spinellis.umlgraph;
+package gr.spinellis.umlgraph.doclet;
 
 import com.sun.javadoc.*;
 
diff --git a/src/gr/spinellis/umlgraph/doclet/ClassInfo.java b/src/gr/spinellis/umlgraph/doclet/ClassInfo.java
index cb97e92..a103825 100644
--- a/src/gr/spinellis/umlgraph/doclet/ClassInfo.java
+++ b/src/gr/spinellis/umlgraph/doclet/ClassInfo.java
@@ -18,7 +18,7 @@
  *
  */
 
-package gr.spinellis.umlgraph;
+package gr.spinellis.umlgraph.doclet;
 
 /**
  * Class's dot-comaptible alias name (for fully qualified class names)
diff --git a/src/gr/spinellis/umlgraph/doclet/Options.java b/src/gr/spinellis/umlgraph/doclet/Options.java
index 55639a9..964a3b5 100644
--- a/src/gr/spinellis/umlgraph/doclet/Options.java
+++ b/src/gr/spinellis/umlgraph/doclet/Options.java
@@ -18,7 +18,7 @@
  *
  */
 
-package gr.spinellis.umlgraph;
+package gr.spinellis.umlgraph.doclet;
 
 import com.sun.javadoc.*;
 
diff --git a/src/gr/spinellis/umlgraph/doclet/StringUtil.java b/src/gr/spinellis/umlgraph/doclet/StringUtil.java
index 7ff451a..aa44f24 100644
--- a/src/gr/spinellis/umlgraph/doclet/StringUtil.java
+++ b/src/gr/spinellis/umlgraph/doclet/StringUtil.java
@@ -18,7 +18,7 @@
  *
  */
 
-package gr.spinellis.umlgraph;
+package gr.spinellis.umlgraph.doclet;
 
 import java.util.*;
 
diff --git a/src/gr/spinellis/umlgraph/doclet/UmlGraph.java b/src/gr/spinellis/umlgraph/doclet/UmlGraph.java
index 81f8c95..fc747fe 100644
--- a/src/gr/spinellis/umlgraph/doclet/UmlGraph.java
+++ b/src/gr/spinellis/umlgraph/doclet/UmlGraph.java
@@ -18,7 +18,7 @@
  *
  */
 
-package gr.spinellis.umlgraph;
+package gr.spinellis.umlgraph.doclet;
 
 import com.sun.javadoc.*;
 
diff --git a/src/org/umlgraph/doclet/ClassGraph.java b/src/org/umlgraph/doclet/ClassGraph.java
index aee6400..86cb00f 100644
--- a/src/org/umlgraph/doclet/ClassGraph.java
+++ b/src/org/umlgraph/doclet/ClassGraph.java
@@ -18,7 +18,7 @@
  *
  */
 
-package gr.spinellis.umlgraph;
+package gr.spinellis.umlgraph.doclet;
 
 import com.sun.javadoc.*;
 
diff --git a/src/org/umlgraph/doclet/ClassInfo.java b/src/org/umlgraph/doclet/ClassInfo.java
index cb97e92..a103825 100644
--- a/src/org/umlgraph/doclet/ClassInfo.java
+++ b/src/org/umlgraph/doclet/ClassInfo.java
@@ -18,7 +18,7 @@
  *
  */
 
-package gr.spinellis.umlgraph;
+package gr.spinellis.umlgraph.doclet;
 
 /**
  * Class's dot-comaptible alias name (for fully qualified class names)
diff --git a/src/org/umlgraph/doclet/Options.java b/src/org/umlgraph/doclet/Options.java
index 55639a9..964a3b5 100644
--- a/src/org/umlgraph/doclet/Options.java
+++ b/src/org/umlgraph/doclet/Options.java
@@ -18,7 +18,7 @@
  *
  */
 
-package gr.spinellis.umlgraph;
+package gr.spinellis.umlgraph.doclet;
 
 import com.sun.javadoc.*;
 
diff --git a/src/org/umlgraph/doclet/StringUtil.java b/src/org/umlgraph/doclet/StringUtil.java
index 7ff451a..aa44f24 100644
--- a/src/org/umlgraph/doclet/StringUtil.java
+++ b/src/org/umlgraph/doclet/StringUtil.java
@@ -18,7 +18,7 @@
  *
  */
 
-package gr.spinellis.umlgraph;
+package gr.spinellis.umlgraph.doclet;
 
 import java.util.*;
 
diff --git a/src/org/umlgraph/doclet/UmlGraph.java b/src/org/umlgraph/doclet/UmlGraph.java
index 81f8c95..fc747fe 100644
--- a/src/org/umlgraph/doclet/UmlGraph.java
+++ b/src/org/umlgraph/doclet/UmlGraph.java
@@ -18,7 +18,7 @@
  *
  */
 
-package gr.spinellis.umlgraph;
+package gr.spinellis.umlgraph.doclet;
 
 import com.sun.javadoc.*;