diff --git a/Makefile b/Makefile
index 244269f..e8cef22 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ BALL_TAR_GZ=UMLGraph-$(VERSION).tar.gz
ZIPBALL=UMLGraph-$(VERSION).zip
DISTDIR=UMLGraph-$(VERSION)
WEBDIR=$(UH)/dds/pubs/web/home/sw/umlgraph-mirror
-DOCLETSRCPATH=src/org/umlgraph/doclet
+DOCLETSRCPATH=src/main/java/org/umlgraph/doclet
DOCLETSRC= \
$(DOCLETSRCPATH)/ClassGraph.java \
$(DOCLETSRCPATH)/ClassInfo.java \
@@ -17,8 +17,8 @@ DOCLETSRC= \
$(DOCLETSRCPATH)/UmlGraph.java \
$(DOCLETSRCPATH)/Version.java
TESTSRC = \
- src/org/umlgraph/test/DotDiff.java \
- src/org/umlgraph/test/BasicTest.java
+ src/main/java/org/umlgraph/test/DotDiff.java \
+ src/main/java/org/umlgraph/test/BasicTest.java
PICFILE=sequence.pic
README=README.txt
LICENSE=LICENSE
diff --git a/TODO b/TODO
index 77992df..03b6ca8 100644
--- a/TODO
+++ b/TODO
@@ -10,6 +10,9 @@ State diagrams:
See state-example.dot
See also http://forrst.com/posts/State_Machine_Dont_abuse_the_if-1fE
+Note that Hierarchically nested states cannot be shown in GraphViz,
+because you can't set shape and labels in cluster, nor can they act
+as edge targets.
Add in UmlGraphDoc support for showing package dependencies.
See http://java.dzone.com/articles/reverse-engineer-source-code-u#comment-6124
diff --git a/build.xml b/build.xml
index 9d66a82..da40197 100644
--- a/build.xml
+++ b/build.xml
@@ -7,7 +7,7 @@
-