diff --git a/lib/org/apache/http/annotations.xml b/lib/annotations/http-client/org/apache/http/annotations.xml
similarity index 100%
rename from lib/org/apache/http/annotations.xml
rename to lib/annotations/http-client/org/apache/http/annotations.xml
diff --git a/lib/org/hamcrest/annotations.xml b/lib/annotations/junit4/org/hamcrest/annotations.xml
similarity index 100%
rename from lib/org/hamcrest/annotations.xml
rename to lib/annotations/junit4/org/hamcrest/annotations.xml
diff --git a/lib/org/junit/rules/annotations.xml b/lib/annotations/junit4/org/junit/rules/annotations.xml
similarity index 100%
rename from lib/org/junit/rules/annotations.xml
rename to lib/annotations/junit4/org/junit/rules/annotations.xml
diff --git a/lib/org/junit/runner/annotations.xml b/lib/annotations/junit4/org/junit/runner/annotations.xml
similarity index 100%
rename from lib/org/junit/runner/annotations.xml
rename to lib/annotations/junit4/org/junit/runner/annotations.xml
diff --git a/lib/io/netty/bootstrap/annotations.xml b/lib/annotations/netty/io/netty/bootstrap/annotations.xml
similarity index 100%
rename from lib/io/netty/bootstrap/annotations.xml
rename to lib/annotations/netty/io/netty/bootstrap/annotations.xml
diff --git a/lib/io/netty/buffer/annotations.xml b/lib/annotations/netty/io/netty/buffer/annotations.xml
similarity index 100%
rename from lib/io/netty/buffer/annotations.xml
rename to lib/annotations/netty/io/netty/buffer/annotations.xml
diff --git a/lib/io/netty/channel/annotations.xml b/lib/annotations/netty/io/netty/channel/annotations.xml
similarity index 100%
rename from lib/io/netty/channel/annotations.xml
rename to lib/annotations/netty/io/netty/channel/annotations.xml
diff --git a/lib/org/picocontainer/annotations.xml b/lib/annotations/picocontainer/org/picocontainer/annotations.xml
similarity index 100%
rename from lib/org/picocontainer/annotations.xml
rename to lib/annotations/picocontainer/org/picocontainer/annotations.xml
diff --git a/lib/org/picocontainer/defaults/annotations.xml b/lib/annotations/picocontainer/org/picocontainer/defaults/annotations.xml
similarity index 100%
rename from lib/org/picocontainer/defaults/annotations.xml
rename to lib/annotations/picocontainer/org/picocontainer/defaults/annotations.xml