diff --git a/apps/addressbook/java/src/addressbook/AddressBook.java b/apps/addressbook/java/src/net/i2p/addressbook/AddressBook.java
similarity index 99%
rename from apps/addressbook/java/src/addressbook/AddressBook.java
rename to apps/addressbook/java/src/net/i2p/addressbook/AddressBook.java
index d90bf0f13..6249cadaa 100644
--- a/apps/addressbook/java/src/addressbook/AddressBook.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/AddressBook.java
@@ -19,7 +19,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package addressbook;
+package net.i2p.addressbook;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/apps/addressbook/java/src/addressbook/ConfigParser.java b/apps/addressbook/java/src/net/i2p/addressbook/ConfigParser.java
similarity index 99%
rename from apps/addressbook/java/src/addressbook/ConfigParser.java
rename to apps/addressbook/java/src/net/i2p/addressbook/ConfigParser.java
index 7fbb214f0..be74de990 100644
--- a/apps/addressbook/java/src/addressbook/ConfigParser.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/ConfigParser.java
@@ -19,7 +19,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package addressbook;
+package net.i2p.addressbook;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/apps/addressbook/java/src/addressbook/Daemon.java b/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java
similarity index 99%
rename from apps/addressbook/java/src/addressbook/Daemon.java
rename to apps/addressbook/java/src/net/i2p/addressbook/Daemon.java
index a8a9a2da6..34b550df6 100644
--- a/apps/addressbook/java/src/addressbook/Daemon.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java
@@ -19,7 +19,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package addressbook;
+package net.i2p.addressbook;
 
 import java.io.File;
 import java.util.HashMap;
diff --git a/apps/addressbook/java/src/addressbook/DaemonThread.java b/apps/addressbook/java/src/net/i2p/addressbook/DaemonThread.java
similarity index 98%
rename from apps/addressbook/java/src/addressbook/DaemonThread.java
rename to apps/addressbook/java/src/net/i2p/addressbook/DaemonThread.java
index fb869d807..b5afaaa2f 100644
--- a/apps/addressbook/java/src/addressbook/DaemonThread.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/DaemonThread.java
@@ -19,7 +19,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package addressbook;
+package net.i2p.addressbook;
 
 /**
  * A thread that waits five minutes, then runs the addressbook daemon.  
diff --git a/apps/addressbook/java/src/addressbook/Log.java b/apps/addressbook/java/src/net/i2p/addressbook/Log.java
similarity index 98%
rename from apps/addressbook/java/src/addressbook/Log.java
rename to apps/addressbook/java/src/net/i2p/addressbook/Log.java
index f608b20e2..a1ba1a2fc 100644
--- a/apps/addressbook/java/src/addressbook/Log.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/Log.java
@@ -19,7 +19,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package addressbook;
+package net.i2p.addressbook;
 
 import java.io.BufferedWriter;
 import java.io.File;
diff --git a/apps/addressbook/java/src/addressbook/Servlet.java b/apps/addressbook/java/src/net/i2p/addressbook/Servlet.java
similarity index 98%
rename from apps/addressbook/java/src/addressbook/Servlet.java
rename to apps/addressbook/java/src/net/i2p/addressbook/Servlet.java
index 34af69c1c..8f26788e4 100644
--- a/apps/addressbook/java/src/addressbook/Servlet.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/Servlet.java
@@ -19,7 +19,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package addressbook;
+package net.i2p.addressbook;
 
 import javax.servlet.GenericServlet;
 import javax.servlet.ServletConfig;
diff --git a/apps/addressbook/java/src/addressbook/Subscription.java b/apps/addressbook/java/src/net/i2p/addressbook/Subscription.java
similarity index 99%
rename from apps/addressbook/java/src/addressbook/Subscription.java
rename to apps/addressbook/java/src/net/i2p/addressbook/Subscription.java
index 1847535a9..a97635b12 100644
--- a/apps/addressbook/java/src/addressbook/Subscription.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/Subscription.java
@@ -19,7 +19,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package addressbook;
+package net.i2p.addressbook;
 
 /**
  * A subscription to a remote address book.
diff --git a/apps/addressbook/java/src/addressbook/SubscriptionIterator.java b/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionIterator.java
similarity index 98%
rename from apps/addressbook/java/src/addressbook/SubscriptionIterator.java
rename to apps/addressbook/java/src/net/i2p/addressbook/SubscriptionIterator.java
index 2c3e13b73..b033181e0 100644
--- a/apps/addressbook/java/src/addressbook/SubscriptionIterator.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionIterator.java
@@ -19,7 +19,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package addressbook;
+package net.i2p.addressbook;
 
 import java.util.Iterator;
 import java.util.List;
diff --git a/apps/addressbook/java/src/addressbook/SubscriptionList.java b/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionList.java
similarity index 99%
rename from apps/addressbook/java/src/addressbook/SubscriptionList.java
rename to apps/addressbook/java/src/net/i2p/addressbook/SubscriptionList.java
index 77597eef6..ac5d3236d 100644
--- a/apps/addressbook/java/src/addressbook/SubscriptionList.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionList.java
@@ -19,7 +19,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package addressbook;
+package net.i2p.addressbook;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/apps/addressbook/web.xml b/apps/addressbook/web.xml
index 22d0d7d23..0c3548c68 100644
--- a/apps/addressbook/web.xml
+++ b/apps/addressbook/web.xml
@@ -6,11 +6,11 @@
 <web-app>
 	<servlet>
 		<servlet-name>addressbook</servlet-name>
-		<servlet-class>addressbook.Servlet</servlet-class>
+		<servlet-class>net.i2p.addressbook.Servlet</servlet-class>
 		<init-param>
 		    <param-name>home</param-name>
 		    <param-value>./addressbook</param-value>
 		</init-param>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
-</web-app>
\ No newline at end of file
+</web-app>