Refactor:

* Rename package i2p.bote.io to i2p.bote.fileencryption
 * Move DHT packets to the DHT package
 * Move relay packets to their own package
 * Move ExpirationThread to i2p.bote.service
 * Rename RelayPacketTest to RelayRequestTest

src/i2p/bote/I2PBote.java

@@ -26,6 +26,10 @@ import i2p.bote.addressbook.AddressBook;
 import i2p.bote.email.Email;
 import i2p.bote.email.EmailIdentity;
 import i2p.bote.email.Identities;
+import i2p.bote.fileencryption.DerivedKey;
+import i2p.bote.fileencryption.FileEncryptionUtil;
+import i2p.bote.fileencryption.PasswordCache;
+import i2p.bote.fileencryption.PasswordException;
 import i2p.bote.folder.EmailFolder;
 import i2p.bote.folder.EmailPacketFolder;
 import i2p.bote.folder.IncompleteEmailFolder;
@@ -34,10 +38,6 @@ import i2p.bote.folder.MessageIdCache;
 import i2p.bote.folder.Outbox;
 import i2p.bote.folder.RelayPacketFolder;
 import i2p.bote.folder.TrashFolder;
-import i2p.bote.io.DerivedKey;
-import i2p.bote.io.FileEncryptionUtil;
-import i2p.bote.io.PasswordCache;
-import i2p.bote.io.PasswordException;
 import i2p.bote.migration.Migrator;
 import i2p.bote.network.BanList;
 import i2p.bote.network.BannedPeer;
@@ -49,9 +49,10 @@ import i2p.bote.network.NetworkStatusSource;
 import i2p.bote.network.RelayPacketHandler;
 import i2p.bote.network.RelayPeer;
 import i2p.bote.network.kademlia.KademliaDHT;
-import i2p.bote.packet.EncryptedEmailPacket;
-import i2p.bote.packet.IndexPacket;
+import i2p.bote.packet.dht.EncryptedEmailPacket;
+import i2p.bote.packet.dht.IndexPacket;
 import i2p.bote.service.EmailChecker;
+import i2p.bote.service.ExpirationThread;
 import i2p.bote.service.I2PBoteThread;
 import i2p.bote.service.OutboxListener;
 import i2p.bote.service.OutboxProcessor;

src/i2p/bote/addressbook/AddressBook.java

@@ -23,12 +23,12 @@ package i2p.bote.addressbook;
 
 import i2p.bote.Util;
 import i2p.bote.email.EmailDestination;
-import i2p.bote.io.DerivedKey;
-import i2p.bote.io.EncryptedInputStream;
-import i2p.bote.io.EncryptedOutputStream;
-import i2p.bote.io.FileEncryptionUtil;
-import i2p.bote.io.PasswordException;
-import i2p.bote.io.PasswordHolder;
+import i2p.bote.fileencryption.DerivedKey;
+import i2p.bote.fileencryption.EncryptedInputStream;
+import i2p.bote.fileencryption.EncryptedOutputStream;
+import i2p.bote.fileencryption.FileEncryptionUtil;
+import i2p.bote.fileencryption.PasswordException;
+import i2p.bote.fileencryption.PasswordHolder;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

src/i2p/bote/email/AddressDisplayFilter.java

@@ -23,7 +23,7 @@ package i2p.bote.email;
 
 import i2p.bote.addressbook.AddressBook;
 import i2p.bote.addressbook.Contact;
-import i2p.bote.io.PasswordException;
+import i2p.bote.fileencryption.PasswordException;
 
 /**
  * This class is used for adding/replacing names in email addresses with

src/i2p/bote/email/Email.java

@@ -26,10 +26,10 @@ import i2p.bote.UniqueId;
 import i2p.bote.Util;
 import i2p.bote.crypto.CryptoFactory;
 import i2p.bote.crypto.CryptoImplementation;
-import i2p.bote.io.EncryptedInputStream;
-import i2p.bote.io.PasswordHolder;
-import i2p.bote.io.PasswordException;
-import i2p.bote.packet.UnencryptedEmailPacket;
+import i2p.bote.fileencryption.EncryptedInputStream;
+import i2p.bote.fileencryption.PasswordException;
+import i2p.bote.fileencryption.PasswordHolder;
+import i2p.bote.packet.dht.UnencryptedEmailPacket;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;

src/i2p/bote/email/Identities.java

@@ -22,12 +22,12 @@
 package i2p.bote.email;
 
 import i2p.bote.Util;
-import i2p.bote.io.DerivedKey;
-import i2p.bote.io.EncryptedInputStream;
-import i2p.bote.io.EncryptedOutputStream;
-import i2p.bote.io.FileEncryptionUtil;
-import i2p.bote.io.PasswordException;
-import i2p.bote.io.PasswordHolder;
+import i2p.bote.fileencryption.DerivedKey;
+import i2p.bote.fileencryption.EncryptedInputStream;
+import i2p.bote.fileencryption.EncryptedOutputStream;
+import i2p.bote.fileencryption.FileEncryptionUtil;
+import i2p.bote.fileencryption.PasswordException;
+import i2p.bote.fileencryption.PasswordHolder;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

src/i2p/bote/fileencryption/DerivedKey.java

@@ -19,7 +19,7 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.io;
+package i2p.bote.fileencryption;
 
 import i2p.bote.Util;
 

src/i2p/bote/fileencryption/EncryptedInputStream.java

@@ -19,12 +19,12 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.io;
+package i2p.bote.fileencryption;
 
-import static i2p.bote.io.FileEncryptionConstants.BLOCK_SIZE;
-import static i2p.bote.io.FileEncryptionConstants.SALT_LENGTH;
-import static i2p.bote.io.FileEncryptionConstants.START_OF_FILE;
-import static i2p.bote.io.FileEncryptionConstants.FORMAT_VERSION;
+import static i2p.bote.fileencryption.FileEncryptionConstants.BLOCK_SIZE;
+import static i2p.bote.fileencryption.FileEncryptionConstants.FORMAT_VERSION;
+import static i2p.bote.fileencryption.FileEncryptionConstants.SALT_LENGTH;
+import static i2p.bote.fileencryption.FileEncryptionConstants.START_OF_FILE;
 import i2p.bote.Util;
 
 import java.io.ByteArrayInputStream;

src/i2p/bote/fileencryption/EncryptedOutputStream.java

@@ -19,12 +19,12 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.io;
+package i2p.bote.fileencryption;
 
-import static i2p.bote.io.FileEncryptionConstants.BLOCK_SIZE;
-import static i2p.bote.io.FileEncryptionConstants.FORMAT_VERSION;
-import static i2p.bote.io.FileEncryptionConstants.NUM_ITERATIONS;
-import static i2p.bote.io.FileEncryptionConstants.START_OF_FILE;
+import static i2p.bote.fileencryption.FileEncryptionConstants.BLOCK_SIZE;
+import static i2p.bote.fileencryption.FileEncryptionConstants.FORMAT_VERSION;
+import static i2p.bote.fileencryption.FileEncryptionConstants.NUM_ITERATIONS;
+import static i2p.bote.fileencryption.FileEncryptionConstants.START_OF_FILE;
 
 import java.io.ByteArrayOutputStream;
 import java.io.FilterOutputStream;

src/i2p/bote/fileencryption/FileEncryptionConstants.java

@@ -19,7 +19,7 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.io;
+package i2p.bote.fileencryption;
 
 import java.util.Random;
 

src/i2p/bote/fileencryption/FileEncryptionUtil.java

@@ -19,11 +19,11 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.io;
+package i2p.bote.fileencryption;
 
-import static i2p.bote.io.FileEncryptionConstants.DEFAULT_PASSWORD;
-import static i2p.bote.io.FileEncryptionConstants.KEY_LENGTH;
-import static i2p.bote.io.FileEncryptionConstants.PASSWORD_FILE_PLAIN_TEXT;
+import static i2p.bote.fileencryption.FileEncryptionConstants.DEFAULT_PASSWORD;
+import static i2p.bote.fileencryption.FileEncryptionConstants.KEY_LENGTH;
+import static i2p.bote.fileencryption.FileEncryptionConstants.PASSWORD_FILE_PLAIN_TEXT;
 import i2p.bote.Util;
 
 import java.io.File;

src/i2p/bote/fileencryption/PasswordCache.java

@@ -19,10 +19,10 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.io;
+package i2p.bote.fileencryption;
 
-import static i2p.bote.io.FileEncryptionConstants.NUM_ITERATIONS;
-import static i2p.bote.io.FileEncryptionConstants.SALT_LENGTH;
+import static i2p.bote.fileencryption.FileEncryptionConstants.NUM_ITERATIONS;
+import static i2p.bote.fileencryption.FileEncryptionConstants.SALT_LENGTH;
 import i2p.bote.Configuration;
 import i2p.bote.Util;
 import i2p.bote.service.I2PBoteThread;

src/i2p/bote/fileencryption/PasswordException.java

@@ -19,7 +19,7 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.io;
+package i2p.bote.fileencryption;
 
 /**
  * This exception is thrown when a password is invalid or missing.

src/i2p/bote/fileencryption/PasswordHolder.java

@@ -19,7 +19,7 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.io;
+package i2p.bote.fileencryption;
 
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;

src/i2p/bote/folder/DeletionAwareDhtFolder.java

@@ -23,9 +23,9 @@ package i2p.bote.folder;
 
 import i2p.bote.UniqueId;
 import i2p.bote.packet.DataPacket;
-import i2p.bote.packet.DeleteRequest;
-import i2p.bote.packet.DeletionInfoPacket;
 import i2p.bote.packet.MalformedPacketException;
+import i2p.bote.packet.dht.DeleteRequest;
+import i2p.bote.packet.dht.DeletionInfoPacket;
 import i2p.bote.packet.dht.DhtStorablePacket;
 
 import java.io.File;

src/i2p/bote/folder/EmailFolder.java

@@ -27,11 +27,11 @@ import i2p.bote.email.AddressDisplayFilter;
 import i2p.bote.email.Email;
 import i2p.bote.email.EmailAttribute;
 import i2p.bote.email.EmailMetadata;
-import i2p.bote.io.DerivedKey;
-import i2p.bote.io.EncryptedOutputStream;
-import i2p.bote.io.FileEncryptionUtil;
-import i2p.bote.io.PasswordException;
-import i2p.bote.io.PasswordHolder;
+import i2p.bote.fileencryption.DerivedKey;
+import i2p.bote.fileencryption.EncryptedOutputStream;
+import i2p.bote.fileencryption.FileEncryptionUtil;
+import i2p.bote.fileencryption.PasswordException;
+import i2p.bote.fileencryption.PasswordHolder;
 
 import java.io.BufferedOutputStream;
 import java.io.File;

src/i2p/bote/folder/EmailPacketFolder.java

@@ -24,12 +24,12 @@ package i2p.bote.folder;
 import i2p.bote.UniqueId;
 import i2p.bote.network.PacketListener;
 import i2p.bote.packet.CommunicationPacket;
-import i2p.bote.packet.DeleteRequest;
-import i2p.bote.packet.DeletionInfoPacket;
-import i2p.bote.packet.DeletionRecord;
-import i2p.bote.packet.EmailPacketDeleteRequest;
-import i2p.bote.packet.EncryptedEmailPacket;
+import i2p.bote.packet.dht.DeleteRequest;
+import i2p.bote.packet.dht.DeletionInfoPacket;
+import i2p.bote.packet.dht.DeletionRecord;
 import i2p.bote.packet.dht.DhtStorablePacket;
+import i2p.bote.packet.dht.EmailPacketDeleteRequest;
+import i2p.bote.packet.dht.EncryptedEmailPacket;
 
 import java.io.File;
 import java.util.Iterator;

src/i2p/bote/folder/Folder.java

@@ -22,7 +22,7 @@
 package i2p.bote.folder;
 
 import i2p.bote.Util;
-import i2p.bote.io.PasswordException;
+import i2p.bote.fileencryption.PasswordException;
 
 import java.io.File;
 import java.io.FilenameFilter;

src/i2p/bote/folder/IncompleteEmailFolder.java

@@ -26,7 +26,7 @@ import i2p.bote.email.Email;
 import i2p.bote.packet.DataPacket;
 import i2p.bote.packet.I2PBotePacket;
 import i2p.bote.packet.MalformedPacketException;
-import i2p.bote.packet.UnencryptedEmailPacket;
+import i2p.bote.packet.dht.UnencryptedEmailPacket;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;

src/i2p/bote/folder/IndexPacketFolder.java

@@ -24,13 +24,13 @@ package i2p.bote.folder;
 import i2p.bote.UniqueId;
 import i2p.bote.network.PacketListener;
 import i2p.bote.packet.CommunicationPacket;
-import i2p.bote.packet.DeleteRequest;
-import i2p.bote.packet.DeletionInfoPacket;
-import i2p.bote.packet.DeletionRecord;
-import i2p.bote.packet.IndexPacket;
-import i2p.bote.packet.IndexPacketDeleteRequest;
-import i2p.bote.packet.IndexPacketEntry;
+import i2p.bote.packet.dht.DeleteRequest;
+import i2p.bote.packet.dht.DeletionInfoPacket;
+import i2p.bote.packet.dht.DeletionRecord;
 import i2p.bote.packet.dht.DhtStorablePacket;
+import i2p.bote.packet.dht.IndexPacket;
+import i2p.bote.packet.dht.IndexPacketDeleteRequest;
+import i2p.bote.packet.dht.IndexPacketEntry;
 
 import java.io.File;
 import java.util.Collection;

src/i2p/bote/folder/Outbox.java

@@ -25,7 +25,7 @@ import static i2p.bote.Util._;
 import i2p.bote.email.AddressDisplayFilter;
 import i2p.bote.email.Email;
 import i2p.bote.email.EmailAttribute;
-import i2p.bote.io.PasswordHolder;
+import i2p.bote.fileencryption.PasswordHolder;
 
 import java.io.File;
 import java.util.Collections;

src/i2p/bote/folder/RelayPacketFolder.java

@@ -22,7 +22,7 @@
 package i2p.bote.folder;
 
 import i2p.bote.packet.MalformedPacketException;
-import i2p.bote.packet.RelayRequest;
+import i2p.bote.packet.relay.RelayRequest;
 
 import java.io.File;
 import java.io.FilenameFilter;

src/i2p/bote/folder/TrashFolder.java

@@ -21,7 +21,7 @@
 
 package i2p.bote.folder;
 
-import i2p.bote.io.PasswordHolder;
+import i2p.bote.fileencryption.PasswordHolder;
 
 import java.io.File;
 

src/i2p/bote/migration/MigrateTo026.java

@@ -23,10 +23,10 @@ package i2p.bote.migration;
 
 import i2p.bote.Configuration;
 import i2p.bote.Util;
-import i2p.bote.io.EncryptedOutputStream;
-import i2p.bote.io.FileEncryptionConstants;
-import i2p.bote.io.PasswordCache;
-import i2p.bote.io.PasswordException;
+import i2p.bote.fileencryption.EncryptedOutputStream;
+import i2p.bote.fileencryption.FileEncryptionConstants;
+import i2p.bote.fileencryption.PasswordCache;
+import i2p.bote.fileencryption.PasswordException;
 
 import java.io.File;
 import java.io.FileInputStream;

src/i2p/bote/network/CheckEmailTask.java

@@ -27,13 +27,13 @@ import i2p.bote.email.EmailIdentity;
 import i2p.bote.folder.EmailPacketFolder;
 import i2p.bote.folder.IncompleteEmailFolder;
 import i2p.bote.folder.IndexPacketFolder;
-import i2p.bote.packet.EmailPacketDeleteRequest;
-import i2p.bote.packet.EncryptedEmailPacket;
-import i2p.bote.packet.IndexPacket;
-import i2p.bote.packet.IndexPacketDeleteRequest;
-import i2p.bote.packet.IndexPacketEntry;
-import i2p.bote.packet.UnencryptedEmailPacket;
 import i2p.bote.packet.dht.DhtStorablePacket;
+import i2p.bote.packet.dht.EmailPacketDeleteRequest;
+import i2p.bote.packet.dht.EncryptedEmailPacket;
+import i2p.bote.packet.dht.IndexPacket;
+import i2p.bote.packet.dht.IndexPacketDeleteRequest;
+import i2p.bote.packet.dht.IndexPacketEntry;
+import i2p.bote.packet.dht.UnencryptedEmailPacket;
 import i2p.bote.service.RelayPeerManager;
 
 import java.security.GeneralSecurityException;

src/i2p/bote/network/RelayPacketHandler.java

@@ -25,9 +25,9 @@ import i2p.bote.Util;
 import i2p.bote.folder.RelayPacketFolder;
 import i2p.bote.packet.CommunicationPacket;
 import i2p.bote.packet.MalformedPacketException;
-import i2p.bote.packet.RelayRequest;
 import i2p.bote.packet.dht.DhtStorablePacket;
 import i2p.bote.packet.dht.StoreRequest;
+import i2p.bote.packet.relay.RelayRequest;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

src/i2p/bote/network/kademlia/KademliaDHT.java

@@ -36,10 +36,10 @@ import i2p.bote.network.PeerFileAnchor;
 import i2p.bote.network.kademlia.SBucket.BucketSection;
 import i2p.bote.packet.CommunicationPacket;
 import i2p.bote.packet.DataPacket;
-import i2p.bote.packet.DeleteRequest;
 import i2p.bote.packet.PeerList;
 import i2p.bote.packet.ResponsePacket;
 import i2p.bote.packet.StatusCode;
+import i2p.bote.packet.dht.DeleteRequest;
 import i2p.bote.packet.dht.DhtStorablePacket;
 import i2p.bote.packet.dht.FindClosePeersPacket;
 import i2p.bote.packet.dht.RetrieveRequest;

src/i2p/bote/network/kademlia/ReplicateThread.java

@@ -28,7 +28,7 @@ import i2p.bote.network.I2PPacketDispatcher;
 import i2p.bote.network.I2PSendQueue;
 import i2p.bote.network.PacketListener;
 import i2p.bote.packet.CommunicationPacket;
-import i2p.bote.packet.DeleteRequest;
+import i2p.bote.packet.dht.DeleteRequest;
 import i2p.bote.packet.dht.DhtStorablePacket;
 import i2p.bote.packet.dht.StoreRequest;
 import i2p.bote.service.I2PBoteThread;

src/i2p/bote/packet/I2PBotePacket.java

@@ -23,9 +23,17 @@ package i2p.bote.packet;
 
 import i2p.bote.I2PBote;
 import i2p.bote.Util;
+import i2p.bote.packet.dht.DeletionInfoPacket;
+import i2p.bote.packet.dht.EmailPacketDeleteRequest;
+import i2p.bote.packet.dht.EncryptedEmailPacket;
 import i2p.bote.packet.dht.FindClosePeersPacket;
+import i2p.bote.packet.dht.IndexPacket;
+import i2p.bote.packet.dht.IndexPacketDeleteRequest;
 import i2p.bote.packet.dht.RetrieveRequest;
 import i2p.bote.packet.dht.StoreRequest;
+import i2p.bote.packet.dht.UnencryptedEmailPacket;
+import i2p.bote.packet.relay.PeerListRequest;
+import i2p.bote.packet.relay.RelayRequest;
 
 import java.io.File;
 import java.io.FileInputStream;

src/i2p/bote/packet/dht/DeleteRequest.java

@@ -19,7 +19,10 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.packet;
+package i2p.bote.packet.dht;
+
+import i2p.bote.packet.CommunicationPacket;
+import i2p.bote.packet.I2PBotePacket;
 
 import java.util.Collection;
 

src/i2p/bote/packet/dht/DeletionInfoPacket.java

@@ -19,9 +19,11 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.packet;
+package i2p.bote.packet.dht;
 
 import i2p.bote.UniqueId;
+import i2p.bote.packet.DataPacket;
+import i2p.bote.packet.TypeCode;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;

src/i2p/bote/packet/dht/DeletionRecord.java

@@ -19,7 +19,7 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.packet;
+package i2p.bote.packet.dht;
 
 import i2p.bote.UniqueId;
 import net.i2p.data.Hash;

src/i2p/bote/packet/dht/EmailPacketDeleteRequest.java

@@ -19,9 +19,11 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.packet;
+package i2p.bote.packet.dht;
 
 import i2p.bote.UniqueId;
+import i2p.bote.packet.I2PBotePacket;
+import i2p.bote.packet.TypeCode;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

src/i2p/bote/packet/dht/EncryptedEmailPacket.java

@@ -19,13 +19,13 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.packet;
+package i2p.bote.packet.dht;
 
 import i2p.bote.crypto.CryptoFactory;
 import i2p.bote.crypto.CryptoImplementation;
 import i2p.bote.email.EmailDestination;
 import i2p.bote.email.EmailIdentity;
-import i2p.bote.packet.dht.DhtStorablePacket;
+import i2p.bote.packet.TypeCode;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;

src/i2p/bote/packet/dht/IndexPacket.java

@@ -19,10 +19,10 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.packet;
+package i2p.bote.packet.dht;
 
 import i2p.bote.email.EmailDestination;
-import i2p.bote.packet.dht.DhtStorablePacket;
+import i2p.bote.packet.TypeCode;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;

src/i2p/bote/packet/dht/IndexPacketDeleteRequest.java

@@ -19,9 +19,11 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.packet;
+package i2p.bote.packet.dht;
 
 import i2p.bote.UniqueId;
+import i2p.bote.packet.I2PBotePacket;
+import i2p.bote.packet.TypeCode;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;

src/i2p/bote/packet/dht/IndexPacketEntry.java

@@ -19,7 +19,7 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.packet;
+package i2p.bote.packet.dht;
 
 import net.i2p.data.Hash;
 

src/i2p/bote/packet/dht/UnencryptedEmailPacket.java

@@ -19,10 +19,12 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.packet;
+package i2p.bote.packet.dht;
 
 import i2p.bote.UniqueId;
 import i2p.bote.Util;
+import i2p.bote.packet.DataPacket;
+import i2p.bote.packet.TypeCode;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;

src/i2p/bote/packet/relay/PeerListRequest.java

@@ -19,7 +19,10 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.packet;
+package i2p.bote.packet.relay;
+
+import i2p.bote.packet.CommunicationPacket;
+import i2p.bote.packet.TypeCode;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

src/i2p/bote/packet/relay/RelayRequest.java

@@ -19,9 +19,13 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.packet;
+package i2p.bote.packet.relay;
 
 import i2p.bote.Util;
+import i2p.bote.packet.CommunicationPacket;
+import i2p.bote.packet.I2PBotePacket;
+import i2p.bote.packet.MalformedPacketException;
+import i2p.bote.packet.TypeCode;
 import i2p.bote.service.RelayPeerManager;
 
 import java.io.ByteArrayOutputStream;

src/i2p/bote/packet/relay/ReturnChain.java

@@ -19,7 +19,7 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.packet;
+package i2p.bote.packet.relay;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

src/i2p/bote/service/EmailChecker.java

@@ -25,10 +25,10 @@ import i2p.bote.Configuration;
 import i2p.bote.Util;
 import i2p.bote.email.EmailIdentity;
 import i2p.bote.email.Identities;
+import i2p.bote.fileencryption.PasswordException;
 import i2p.bote.folder.EmailPacketFolder;
 import i2p.bote.folder.IncompleteEmailFolder;
 import i2p.bote.folder.IndexPacketFolder;
-import i2p.bote.io.PasswordException;
 import i2p.bote.network.CheckEmailTask;
 import i2p.bote.network.DHT;
 import i2p.bote.network.I2PSendQueue;

src/i2p/bote/service/ExpirationThread.java

@@ -19,10 +19,9 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote;
+package i2p.bote.service;
 
 import i2p.bote.folder.ExpirationListener;
-import i2p.bote.service.I2PBoteThread;
 
 import java.util.ArrayList;
 import java.util.Collections;

src/i2p/bote/service/OutboxProcessor.java

@@ -27,19 +27,19 @@ import i2p.bote.I2PBote;
 import i2p.bote.email.Email;
 import i2p.bote.email.EmailDestination;
 import i2p.bote.email.EmailIdentity;
+import i2p.bote.fileencryption.PasswordException;
 import i2p.bote.folder.Outbox;
 import i2p.bote.folder.RelayPacketFolder;
-import i2p.bote.io.PasswordException;
 import i2p.bote.network.DHT;
 import i2p.bote.network.DhtException;
 import i2p.bote.network.NetworkStatusSource;
-import i2p.bote.packet.EncryptedEmailPacket;
 import i2p.bote.packet.I2PBotePacket;
-import i2p.bote.packet.IndexPacket;
-import i2p.bote.packet.RelayRequest;
-import i2p.bote.packet.UnencryptedEmailPacket;
 import i2p.bote.packet.dht.DhtStorablePacket;
+import i2p.bote.packet.dht.EncryptedEmailPacket;
+import i2p.bote.packet.dht.IndexPacket;
 import i2p.bote.packet.dht.StoreRequest;
+import i2p.bote.packet.dht.UnencryptedEmailPacket;
+import i2p.bote.packet.relay.RelayRequest;
 
 import java.security.GeneralSecurityException;
 import java.util.ArrayList;

src/i2p/bote/service/RelayPacketSender.java

@@ -28,9 +28,9 @@ import i2p.bote.folder.PacketFolder;
 import i2p.bote.network.I2PSendQueue;
 import i2p.bote.network.PacketListener;
 import i2p.bote.packet.CommunicationPacket;
-import i2p.bote.packet.RelayRequest;
 import i2p.bote.packet.ResponsePacket;
 import i2p.bote.packet.StatusCode;
+import i2p.bote.packet.relay.RelayRequest;
 
 import java.util.Iterator;
 import java.util.concurrent.CountDownLatch;

src/i2p/bote/service/RelayPeerManager.java

@@ -31,7 +31,7 @@ import i2p.bote.network.RelayPeer;
 import i2p.bote.packet.CommunicationPacket;
 import i2p.bote.packet.DataPacket;
 import i2p.bote.packet.PeerList;
-import i2p.bote.packet.PeerListRequest;
+import i2p.bote.packet.relay.PeerListRequest;
 
 import java.io.BufferedWriter;
 import java.io.File;

src/i2p/bote/web/JSPHelper.java

@@ -34,10 +34,10 @@ import i2p.bote.email.EmailAttribute;
 import i2p.bote.email.EmailDestination;
 import i2p.bote.email.EmailIdentity;
 import i2p.bote.email.Identities;
+import i2p.bote.fileencryption.FileEncryptionUtil;
+import i2p.bote.fileencryption.PasswordException;
 import i2p.bote.folder.EmailFolder;
 import i2p.bote.folder.TrashFolder;
-import i2p.bote.io.FileEncryptionUtil;
-import i2p.bote.io.PasswordException;
 import i2p.bote.network.NetworkStatus;
 
 import java.io.File;

src/i2p/bote/web/RequirePasswordTag.java

@@ -21,7 +21,7 @@
 
 package i2p.bote.web;
 
-import i2p.bote.io.PasswordException;
+import i2p.bote.fileencryption.PasswordException;
 
 import javax.servlet.jsp.el.ELException;
 import javax.servlet.jsp.tagext.BodyTagSupport;

src/i2p/bote/web/SendEmailTag.java

@@ -25,7 +25,7 @@ import static i2p.bote.Util._;
 import i2p.bote.I2PBote;
 import i2p.bote.email.Attachment;
 import i2p.bote.email.Email;
-import i2p.bote.io.PasswordException;
+import i2p.bote.fileencryption.PasswordException;
 
 import java.io.File;
 import java.io.IOException;

test/i2p/bote/AllTests.java

@@ -25,29 +25,29 @@ import i2p.bote.crypto.CryptoImplementationTest;
 import i2p.bote.email.EmailIdentityTest;
 import i2p.bote.email.EmailMetadataTest;
 import i2p.bote.email.EmailTest;
+import i2p.bote.fileencryption.EncryptedStreamTest;
+import i2p.bote.fileencryption.FileEncryptionUtilTest;
+import i2p.bote.fileencryption.PasswordCacheTest;
 import i2p.bote.folder.EmailFolderTest;
 import i2p.bote.folder.EmailPacketFolderTest;
 import i2p.bote.folder.FolderTest;
 import i2p.bote.folder.IncompleteEmailFolderTest;
 import i2p.bote.folder.IndexPacketFolderTest;
 import i2p.bote.folder.RelayPacketFolderTest;
-import i2p.bote.io.EncryptedStreamTest;
-import i2p.bote.io.FileEncryptionUtilTest;
-import i2p.bote.io.PasswordCacheTest;
 import i2p.bote.network.kademlia.BucketManagerTest;
 import i2p.bote.network.kademlia.KBucketTest;
-import i2p.bote.packet.EmailPacketDeleteRequestTest;
-import i2p.bote.packet.EncryptedEmailPacketTest;
 import i2p.bote.packet.I2PBotePacketTest;
-import i2p.bote.packet.IndexPacketDeleteRequestTest;
-import i2p.bote.packet.IndexPacketTest;
 import i2p.bote.packet.PeerListTest;
-import i2p.bote.packet.RelayPacketTest;
 import i2p.bote.packet.ResponsePacketTest;
-import i2p.bote.packet.ReturnChainTest;
-import i2p.bote.packet.UnencryptedEmailPacketTest;
+import i2p.bote.packet.dht.EmailPacketDeleteRequestTest;
+import i2p.bote.packet.dht.EncryptedEmailPacketTest;
 import i2p.bote.packet.dht.FindClosePeersPacketTest;
+import i2p.bote.packet.dht.IndexPacketDeleteRequestTest;
+import i2p.bote.packet.dht.IndexPacketTest;
 import i2p.bote.packet.dht.StoreRequestTest;
+import i2p.bote.packet.dht.UnencryptedEmailPacketTest;
+import i2p.bote.packet.relay.RelayRequestTest;
+import i2p.bote.packet.relay.ReturnChainTest;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
@@ -67,7 +67,7 @@ import org.junit.runners.Suite;
     IndexPacketTest.class,
     PeerListTest.class,
     IndexPacketDeleteRequestTest.class,
-    RelayPacketTest.class,
+    RelayRequestTest.class,
     ReturnChainTest.class,
     
     // Folders

test/i2p/bote/TestUtil.java

@@ -24,7 +24,7 @@ package i2p.bote;
 import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertTrue;
 import i2p.bote.email.Email;
-import i2p.bote.io.PasswordCache;
+import i2p.bote.fileencryption.PasswordCache;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;

test/i2p/bote/email/EmailTest.java

@@ -25,7 +25,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import i2p.bote.packet.I2PBotePacket;
-import i2p.bote.packet.UnencryptedEmailPacket;
+import i2p.bote.packet.dht.UnencryptedEmailPacket;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

test/i2p/bote/fileencryption/EncryptedStreamTest.java

@@ -19,10 +19,13 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.io;
+package i2p.bote.fileencryption;
 
 import static org.junit.Assert.assertEquals;
 import i2p.bote.Util;
+import i2p.bote.fileencryption.DerivedKey;
+import i2p.bote.fileencryption.EncryptedInputStream;
+import i2p.bote.fileencryption.EncryptedOutputStream;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

test/i2p/bote/fileencryption/FileEncryptionTestUtil.java

@@ -19,7 +19,11 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.io;
+package i2p.bote.fileencryption;
+
+import i2p.bote.fileencryption.DerivedKey;
+import i2p.bote.fileencryption.FileEncryptionConstants;
+import i2p.bote.fileencryption.FileEncryptionUtil;
 
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;

test/i2p/bote/fileencryption/FileEncryptionUtilTest.java

@@ -19,12 +19,15 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.io;
+package i2p.bote.fileencryption;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import i2p.bote.Util;
+import i2p.bote.fileencryption.EncryptedInputStream;
+import i2p.bote.fileencryption.EncryptedOutputStream;
+import i2p.bote.fileencryption.FileEncryptionUtil;
 
 import java.io.File;
 import java.io.FileInputStream;

test/i2p/bote/fileencryption/PasswordCacheTest.java

@@ -19,7 +19,7 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.io;
+package i2p.bote.fileencryption;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -27,6 +27,10 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import i2p.bote.Configuration;
 import i2p.bote.TestUtil;
+import i2p.bote.fileencryption.DerivedKey;
+import i2p.bote.fileencryption.FileEncryptionConstants;
+import i2p.bote.fileencryption.FileEncryptionUtil;
+import i2p.bote.fileencryption.PasswordCache;
 
 import java.io.File;
 import java.io.IOException;

test/i2p/bote/folder/EmailFolderTest.java

@@ -24,8 +24,8 @@ package i2p.bote.folder;
 import static org.junit.Assert.assertEquals;
 import i2p.bote.TestUtil;
 import i2p.bote.email.Email;
-import i2p.bote.io.PasswordCache;
-import i2p.bote.io.PasswordException;
+import i2p.bote.fileencryption.PasswordCache;
+import i2p.bote.fileencryption.PasswordException;
 
 import java.io.File;
 import java.io.IOException;

test/i2p/bote/folder/EmailPacketFolderTest.java

@@ -27,15 +27,15 @@ import static org.junit.Assert.assertTrue;
 import i2p.bote.UniqueId;
 import i2p.bote.email.EmailDestination;
 import i2p.bote.packet.DataPacket;
-import i2p.bote.packet.DeleteRequest;
-import i2p.bote.packet.DeletionInfoPacket;
-import i2p.bote.packet.DeletionRecord;
-import i2p.bote.packet.EmailPacketDeleteRequest;
-import i2p.bote.packet.EncryptedEmailPacket;
 import i2p.bote.packet.I2PBotePacket;
 import i2p.bote.packet.MalformedPacketException;
 import i2p.bote.packet.TypeCode;
-import i2p.bote.packet.UnencryptedEmailPacket;
+import i2p.bote.packet.dht.DeleteRequest;
+import i2p.bote.packet.dht.DeletionInfoPacket;
+import i2p.bote.packet.dht.DeletionRecord;
+import i2p.bote.packet.dht.EmailPacketDeleteRequest;
+import i2p.bote.packet.dht.EncryptedEmailPacket;
+import i2p.bote.packet.dht.UnencryptedEmailPacket;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;

test/i2p/bote/folder/FolderTest.java

@@ -26,9 +26,9 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import i2p.bote.UniqueId;
 import i2p.bote.email.EmailDestination;
-import i2p.bote.packet.EncryptedEmailPacket;
 import i2p.bote.packet.I2PBotePacket;
-import i2p.bote.packet.UnencryptedEmailPacket;
+import i2p.bote.packet.dht.EncryptedEmailPacket;
+import i2p.bote.packet.dht.UnencryptedEmailPacket;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;

test/i2p/bote/folder/IncompleteEmailFolderTest.java

@@ -25,9 +25,9 @@ import static org.junit.Assert.assertTrue;
 import i2p.bote.TestUtil;
 import i2p.bote.email.Email;
 import i2p.bote.email.EmailIdentity;
-import i2p.bote.io.PasswordCache;
+import i2p.bote.fileencryption.PasswordCache;
 import i2p.bote.packet.I2PBotePacket;
-import i2p.bote.packet.UnencryptedEmailPacket;
+import i2p.bote.packet.dht.UnencryptedEmailPacket;
 
 import java.io.File;
 import java.util.Collection;

test/i2p/bote/folder/IndexPacketFolderTest.java

@@ -28,17 +28,17 @@ import static org.junit.Assert.fail;
 import i2p.bote.UniqueId;
 import i2p.bote.email.EmailDestination;
 import i2p.bote.packet.DataPacket;
-import i2p.bote.packet.DeleteRequest;
-import i2p.bote.packet.DeletionInfoPacket;
-import i2p.bote.packet.DeletionRecord;
-import i2p.bote.packet.EncryptedEmailPacket;
 import i2p.bote.packet.I2PBotePacket;
-import i2p.bote.packet.IndexPacket;
-import i2p.bote.packet.IndexPacketDeleteRequest;
-import i2p.bote.packet.IndexPacketEntry;
 import i2p.bote.packet.MalformedPacketException;
-import i2p.bote.packet.UnencryptedEmailPacket;
+import i2p.bote.packet.dht.DeleteRequest;
+import i2p.bote.packet.dht.DeletionInfoPacket;
+import i2p.bote.packet.dht.DeletionRecord;
 import i2p.bote.packet.dht.DhtStorablePacket;
+import i2p.bote.packet.dht.EncryptedEmailPacket;
+import i2p.bote.packet.dht.IndexPacket;
+import i2p.bote.packet.dht.IndexPacketDeleteRequest;
+import i2p.bote.packet.dht.IndexPacketEntry;
+import i2p.bote.packet.dht.UnencryptedEmailPacket;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;

test/i2p/bote/folder/RelayPacketFolderTest.java

@@ -25,11 +25,11 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import i2p.bote.UniqueId;
 import i2p.bote.email.EmailDestination;
-import i2p.bote.packet.EncryptedEmailPacket;
 import i2p.bote.packet.I2PBotePacket;
-import i2p.bote.packet.RelayRequest;
-import i2p.bote.packet.UnencryptedEmailPacket;
+import i2p.bote.packet.dht.EncryptedEmailPacket;
 import i2p.bote.packet.dht.StoreRequest;
+import i2p.bote.packet.dht.UnencryptedEmailPacket;
+import i2p.bote.packet.relay.RelayRequest;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;

test/i2p/bote/packet/ResponsePacketTest.java

@@ -24,6 +24,8 @@ package i2p.bote.packet;
 import static junit.framework.Assert.assertTrue;
 import i2p.bote.UniqueId;
 import i2p.bote.email.EmailDestination;
+import i2p.bote.packet.dht.EncryptedEmailPacket;
+import i2p.bote.packet.dht.UnencryptedEmailPacket;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

test/i2p/bote/packet/dht/EmailPacketDeleteRequestTest.java

@@ -19,7 +19,7 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.packet;
+package i2p.bote.packet.dht;
 
 import static junit.framework.Assert.assertTrue;
 import i2p.bote.UniqueId;

test/i2p/bote/packet/dht/EncryptedEmailPacketTest.java

@@ -19,16 +19,17 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.packet;
+package i2p.bote.packet.dht;
 
+import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.assertEquals;
 import i2p.bote.UniqueId;
 import i2p.bote.crypto.ECDH521_ECDSA521;
 import i2p.bote.crypto.ElGamal2048_DSA1024;
 import i2p.bote.email.EmailDestination;
 import i2p.bote.email.EmailIdentity;
+import i2p.bote.packet.I2PBotePacket;
 
 import java.io.ByteArrayInputStream;
 import java.lang.reflect.Field;

test/i2p/bote/packet/dht/IndexPacketDeleteRequestTest.java

@@ -19,7 +19,7 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.packet;
+package i2p.bote.packet.dht;
 
 import static org.junit.Assert.assertEquals;
 import i2p.bote.UniqueId;

test/i2p/bote/packet/dht/IndexPacketTest.java

@@ -19,12 +19,13 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.packet;
+package i2p.bote.packet.dht;
 
 import static junit.framework.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
 import i2p.bote.UniqueId;
 import i2p.bote.email.EmailIdentity;
+import i2p.bote.packet.I2PBotePacket;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

test/i2p/bote/packet/dht/StoreRequestTest.java

@@ -25,9 +25,7 @@ import static junit.framework.Assert.assertTrue;
 import i2p.bote.UniqueId;
 import i2p.bote.email.EmailDestination;
 import i2p.bote.email.EmailIdentity;
-import i2p.bote.packet.EncryptedEmailPacket;
 import i2p.bote.packet.I2PBotePacket;
-import i2p.bote.packet.UnencryptedEmailPacket;
 
 import java.io.ByteArrayInputStream;
 import java.util.Arrays;

test/i2p/bote/packet/dht/UnencryptedEmailPacketTest.java

@@ -19,11 +19,11 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.packet;
+package i2p.bote.packet.dht;
 
 import static junit.framework.Assert.assertTrue;
-
 import i2p.bote.UniqueId;
+import i2p.bote.packet.I2PBotePacket;
 
 import java.io.ByteArrayInputStream;
 import java.util.Arrays;

test/i2p/bote/packet/relay/RelayRequestTest.java

@@ -19,7 +19,7 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.packet;
+package i2p.bote.packet.relay;
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertTrue;
@@ -27,6 +27,9 @@ import static junit.framework.Assert.fail;
 import i2p.bote.email.EmailDestination;
 import i2p.bote.network.I2PSendQueue;
 import i2p.bote.network.RelayPeer;
+import i2p.bote.packet.CommunicationPacket;
+import i2p.bote.packet.MalformedPacketException;
+import i2p.bote.packet.dht.IndexPacket;
 import i2p.bote.packet.dht.StoreRequest;
 import i2p.bote.service.RelayPeerManager;
 
@@ -55,7 +58,7 @@ import org.junit.Test;
 /**
  * A unit test for {@link RelayRequest}.
  */
-public class RelayPacketTest {
+public class RelayRequestTest {
     private StoreRequest storeRequest;
     private RelayRequest relayRequestSingle;   // a single RelayRequest
     private RelayRequest relayRequestMulti;   // multiple nested RelayRequests

test/i2p/bote/packet/relay/ReturnChainTest.java

@@ -19,7 +19,7 @@
  * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package i2p.bote.packet;
+package i2p.bote.packet.relay;
 
 import static org.junit.Assert.assertTrue;