reorganised test files. Ant build works and all junit tests passed.

.gitignore

@@ -1 +1,2 @@
 /out
+.project

build.xml

@@ -13,7 +13,7 @@
       <classpath path="lib/junit-4.8.2.jar"/>
       <classpath path="lib/slf4j-api-1.6.1.jar"/>
       <classpath path="lib/slf4j-simple-1.6.1.jar"/>
-      <classpath path="lib/hamcrest-all-1.3.0RC2.jar"/>
+
     </javac>
   </target>
 
@@ -30,7 +30,8 @@
       <classpath path="lib/junit-4.8.2.jar:out"/>
       <classpath path="lib/slf4j-api-1.6.1.jar:out"/>
       <classpath path="lib/slf4j-simple-1.6.1.jar:out"/>
-      <batchtest>
+    	<classpath path="lib/hamcrest-all-1.3.0RC2.jar"/>  
+    <batchtest>
 	    <fileset dir="tests"><include name="**/*.java"/></fileset>
         <formatter type="brief" usefile="no"/> 
       </batchtest>

docs/allclasses-frame.html

@@ -37,7 +37,9 @@
 <BR>
 <A HREF="com/google/bitcoin/core/DiskBlockStore.html" title="class in com.google.bitcoin.core" target="classFrame">DiskBlockStore</A>
 <BR>
-<A HREF="com/google/bitcoin/core/DnsDiscovery.html" title="class in com.google.bitcoin.core" target="classFrame">DnsDiscovery</A>
+<A HREF="com/google/bitcoin/network/peerdiscovery/DnsDiscovery.html" title="class in com.google.bitcoin.network.peerdiscovery" target="classFrame">DnsDiscovery</A>
+<BR>
+<A HREF="com/google/bitcoin/core/DumpedPrivateKey.html" title="class in com.google.bitcoin.core" target="classFrame">DumpedPrivateKey</A>
 <BR>
 <A HREF="com/google/bitcoin/core/ECKey.html" title="class in com.google.bitcoin.core" target="classFrame">ECKey</A>
 <BR>
@@ -51,7 +53,7 @@
 <BR>
 <A HREF="com/google/bitcoin/core/InventoryMessage.html" title="class in com.google.bitcoin.core" target="classFrame">InventoryMessage</A>
 <BR>
-<A HREF="com/google/bitcoin/core/IrcDiscovery.html" title="class in com.google.bitcoin.core" target="classFrame">IrcDiscovery</A>
+<A HREF="com/google/bitcoin/network/peerdiscovery/IrcDiscovery.html" title="class in com.google.bitcoin.network.peerdiscovery" target="classFrame">IrcDiscovery</A>
 <BR>
 <A HREF="com/google/bitcoin/core/MemoryBlockStore.html" title="class in com.google.bitcoin.core" target="classFrame">MemoryBlockStore</A>
 <BR>
@@ -65,9 +67,11 @@
 <BR>
 <A HREF="com/google/bitcoin/core/PeerAddress.html" title="class in com.google.bitcoin.core" target="classFrame">PeerAddress</A>
 <BR>
-<A HREF="com/google/bitcoin/core/PeerDiscovery.html" title="interface in com.google.bitcoin.core" target="classFrame"><I>PeerDiscovery</I></A>
+<A HREF="com/google/bitcoin/network/peerdiscovery/PeerDiscovery.html" title="interface in com.google.bitcoin.network.peerdiscovery" target="classFrame"><I>PeerDiscovery</I></A>
+<BR>
+<A HREF="com/google/bitcoin/network/peerdiscovery/PeerDiscoveryException.html" title="class in com.google.bitcoin.network.peerdiscovery" target="classFrame">PeerDiscoveryException</A>
 <BR>
-<A HREF="com/google/bitcoin/core/PeerDiscoveryException.html" title="class in com.google.bitcoin.core" target="classFrame">PeerDiscoveryException</A>
+<A HREF="com/google/bitcoin/network/peerdiscovery/PNSeedPeers.html" title="class in com.google.bitcoin.network.peerdiscovery" target="classFrame">PNSeedPeers</A>
 <BR>
 <A HREF="com/google/bitcoin/core/ProtocolException.html" title="class in com.google.bitcoin.core" target="classFrame">ProtocolException</A>
 <BR>
@@ -77,6 +81,8 @@
 <BR>
 <A HREF="com/google/bitcoin/core/Sha256Hash.html" title="class in com.google.bitcoin.core" target="classFrame">Sha256Hash</A>
 <BR>
+<A HREF="com/google/bitcoin/network/peerdiscovery/SinglePeerAddressDiscovery.html" title="interface in com.google.bitcoin.network.peerdiscovery" target="classFrame"><I>SinglePeerAddressDiscovery</I></A>
+<BR>
 <A HREF="com/google/bitcoin/core/StoredBlock.html" title="class in com.google.bitcoin.core" target="classFrame">StoredBlock</A>
 <BR>
 <A HREF="com/google/bitcoin/core/Transaction.html" title="class in com.google.bitcoin.core" target="classFrame">Transaction</A>
@@ -97,6 +103,8 @@
 <BR>
 <A HREF="com/google/bitcoin/core/VerificationException.html" title="class in com.google.bitcoin.core" target="classFrame">VerificationException</A>
 <BR>
+<A HREF="com/google/bitcoin/core/VersionedChecksummedBytes.html" title="class in com.google.bitcoin.core" target="classFrame">VersionedChecksummedBytes</A>
+<BR>
 <A HREF="com/google/bitcoin/core/VersionMessage.html" title="class in com.google.bitcoin.core" target="classFrame">VersionMessage</A>
 <BR>
 <A HREF="com/google/bitcoin/core/Wallet.html" title="class in com.google.bitcoin.core" target="classFrame">Wallet</A>

docs/allclasses-noframe.html

@@ -37,7 +37,9 @@
 <BR>
 <A HREF="com/google/bitcoin/core/DiskBlockStore.html" title="class in com.google.bitcoin.core">DiskBlockStore</A>
 <BR>
-<A HREF="com/google/bitcoin/core/DnsDiscovery.html" title="class in com.google.bitcoin.core">DnsDiscovery</A>
+<A HREF="com/google/bitcoin/network/peerdiscovery/DnsDiscovery.html" title="class in com.google.bitcoin.network.peerdiscovery">DnsDiscovery</A>
+<BR>
+<A HREF="com/google/bitcoin/core/DumpedPrivateKey.html" title="class in com.google.bitcoin.core">DumpedPrivateKey</A>
 <BR>
 <A HREF="com/google/bitcoin/core/ECKey.html" title="class in com.google.bitcoin.core">ECKey</A>
 <BR>
@@ -51,7 +53,7 @@
 <BR>
 <A HREF="com/google/bitcoin/core/InventoryMessage.html" title="class in com.google.bitcoin.core">InventoryMessage</A>
 <BR>
-<A HREF="com/google/bitcoin/core/IrcDiscovery.html" title="class in com.google.bitcoin.core">IrcDiscovery</A>
+<A HREF="com/google/bitcoin/network/peerdiscovery/IrcDiscovery.html" title="class in com.google.bitcoin.network.peerdiscovery">IrcDiscovery</A>
 <BR>
 <A HREF="com/google/bitcoin/core/MemoryBlockStore.html" title="class in com.google.bitcoin.core">MemoryBlockStore</A>
 <BR>
@@ -65,9 +67,11 @@
 <BR>
 <A HREF="com/google/bitcoin/core/PeerAddress.html" title="class in com.google.bitcoin.core">PeerAddress</A>
 <BR>
-<A HREF="com/google/bitcoin/core/PeerDiscovery.html" title="interface in com.google.bitcoin.core"><I>PeerDiscovery</I></A>
+<A HREF="com/google/bitcoin/network/peerdiscovery/PeerDiscovery.html" title="interface in com.google.bitcoin.network.peerdiscovery"><I>PeerDiscovery</I></A>
+<BR>
+<A HREF="com/google/bitcoin/network/peerdiscovery/PeerDiscoveryException.html" title="class in com.google.bitcoin.network.peerdiscovery">PeerDiscoveryException</A>
 <BR>
-<A HREF="com/google/bitcoin/core/PeerDiscoveryException.html" title="class in com.google.bitcoin.core">PeerDiscoveryException</A>
+<A HREF="com/google/bitcoin/network/peerdiscovery/PNSeedPeers.html" title="class in com.google.bitcoin.network.peerdiscovery">PNSeedPeers</A>
 <BR>
 <A HREF="com/google/bitcoin/core/ProtocolException.html" title="class in com.google.bitcoin.core">ProtocolException</A>
 <BR>
@@ -77,6 +81,8 @@
 <BR>
 <A HREF="com/google/bitcoin/core/Sha256Hash.html" title="class in com.google.bitcoin.core">Sha256Hash</A>
 <BR>
+<A HREF="com/google/bitcoin/network/peerdiscovery/SinglePeerAddressDiscovery.html" title="interface in com.google.bitcoin.network.peerdiscovery"><I>SinglePeerAddressDiscovery</I></A>
+<BR>
 <A HREF="com/google/bitcoin/core/StoredBlock.html" title="class in com.google.bitcoin.core">StoredBlock</A>
 <BR>
 <A HREF="com/google/bitcoin/core/Transaction.html" title="class in com.google.bitcoin.core">Transaction</A>
@@ -97,6 +103,8 @@
 <BR>
 <A HREF="com/google/bitcoin/core/VerificationException.html" title="class in com.google.bitcoin.core">VerificationException</A>
 <BR>
+<A HREF="com/google/bitcoin/core/VersionedChecksummedBytes.html" title="class in com.google.bitcoin.core">VersionedChecksummedBytes</A>
+<BR>
 <A HREF="com/google/bitcoin/core/VersionMessage.html" title="class in com.google.bitcoin.core">VersionMessage</A>
 <BR>
 <A HREF="com/google/bitcoin/core/Wallet.html" title="class in com.google.bitcoin.core">Wallet</A>

docs/com/google/bitcoin/core/Address.html

@@ -35,7 +35,8 @@
 <A NAME="navbar_top_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../com/google/bitcoin/core/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
@@ -72,7 +73,7 @@
 </TR>
 <TR>
 <TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#fields_inherited_from_class_com.google.bitcoin.core.VersionedChecksummedBytes">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
 <TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
 DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
 </TR>
@@ -89,11 +90,12 @@ <H2>
 Class Address</H2>
 <PRE>
 java.lang.Object
-  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.google.bitcoin.core.Address</B>
+  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../com/google/bitcoin/core/VersionedChecksummedBytes.html" title="class in com.google.bitcoin.core">com.google.bitcoin.core.VersionedChecksummedBytes</A>
+      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.google.bitcoin.core.Address</B>
 </PRE>
 <HR>
 <DL>
-<DT><PRE>public class <B>Address</B><DT>extends java.lang.Object</DL>
+<DT><PRE>public class <B>Address</B><DT>extends <A HREF="../../../../com/google/bitcoin/core/VersionedChecksummedBytes.html" title="class in com.google.bitcoin.core">VersionedChecksummedBytes</A></DL>
 </PRE>
 
 <P>
@@ -117,7 +119,25 @@ <H2>
 <HR>
 
 <P>
+<!-- =========== FIELD SUMMARY =========== -->
 
+<A NAME="field_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Field Summary</B></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;<A NAME="fields_inherited_from_class_com.google.bitcoin.core.VersionedChecksummedBytes"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left"><B>Fields inherited from class com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/VersionedChecksummedBytes.html" title="class in com.google.bitcoin.core">VersionedChecksummedBytes</A></B></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><A HREF="../../../../com/google/bitcoin/core/VersionedChecksummedBytes.html#bytes">bytes</A>, <A HREF="../../../../com/google/bitcoin/core/VersionedChecksummedBytes.html#version">version</A></CODE></TD>
+</TR>
+</TABLE>
+&nbsp;
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 
 <A NAME="constructor_summary"><!-- --></A>
@@ -152,35 +172,20 @@ <H2>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/Address.html#equals(java.lang.Object)">equals</A></B>(java.lang.Object&nbsp;o)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;byte[]</CODE></FONT></TD>
 <TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/Address.html#getHash160()">getHash160</A></B>()</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The (big endian) 20 byte hash that is the core of a BitCoin address.</TD>
 </TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/Address.html#hashCode()">hashCode</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TABLE>
+&nbsp;<A NAME="methods_inherited_from_class_com.google.bitcoin.core.VersionedChecksummedBytes"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left"><B>Methods inherited from class com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/VersionedChecksummedBytes.html" title="class in com.google.bitcoin.core">VersionedChecksummedBytes</A></B></TH>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/Address.html#toString()">toString</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+<TD><CODE><A HREF="../../../../com/google/bitcoin/core/VersionedChecksummedBytes.html#equals(java.lang.Object)">equals</A>, <A HREF="../../../../com/google/bitcoin/core/VersionedChecksummedBytes.html#getVersion()">getVersion</A>, <A HREF="../../../../com/google/bitcoin/core/VersionedChecksummedBytes.html#hashCode()">hashCode</A>, <A HREF="../../../../com/google/bitcoin/core/VersionedChecksummedBytes.html#toString()">toString</A></CODE></TD>
 </TR>
 </TABLE>
 &nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
@@ -256,48 +261,6 @@ <H2>
 </DL>
 </DD>
 </DL>
-<HR>
-
-<A NAME="equals(java.lang.Object)"><!-- --></A><H3>
-equals</H3>
-<PRE>
-public boolean <B>equals</B>(java.lang.Object&nbsp;o)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE>equals</CODE> in class <CODE>java.lang.Object</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="hashCode()"><!-- --></A><H3>
-hashCode</H3>
-<PRE>
-public int <B>hashCode</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE>hashCode</CODE> in class <CODE>java.lang.Object</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="toString()"><!-- --></A><H3>
-toString</H3>
-<PRE>
-public java.lang.String <B>toString</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Overrides:</B><DD><CODE>toString</CODE> in class <CODE>java.lang.Object</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
 <!-- ========= END OF CLASS DATA ========= -->
 <HR>
 
@@ -311,7 +274,8 @@ <H2>
 <A NAME="navbar_bottom_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../com/google/bitcoin/core/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
@@ -348,7 +312,7 @@ <H2>
 </TR>
 <TR>
 <TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#fields_inherited_from_class_com.google.bitcoin.core.VersionedChecksummedBytes">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
 <TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
 DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
 </TR>

docs/com/google/bitcoin/core/AddressFormatException.html

@@ -35,7 +35,8 @@
 <A NAME="navbar_top_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../com/google/bitcoin/core/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
@@ -197,7 +198,8 @@ <H2>
 <A NAME="navbar_bottom_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../com/google/bitcoin/core/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>