Moved some API classes into packages.

briar-android/src/org/briarproject/android/AndroidNotificationManagerImpl.java

@@ -13,9 +13,9 @@ import org.briarproject.android.contact.ContactListActivity;
 import org.briarproject.android.contact.ConversationActivity;
 import org.briarproject.android.forum.ForumActivity;
 import org.briarproject.android.forum.ForumListActivity;
-import org.briarproject.api.ContactId;
 import org.briarproject.api.Settings;
 import org.briarproject.api.android.AndroidNotificationManager;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DatabaseExecutor;
 import org.briarproject.api.db.DbException;

briar-android/src/org/briarproject/android/BriarService.java

@@ -10,9 +10,9 @@ import android.os.IBinder;
 import android.support.v4.app.NotificationCompat;
 
 import org.briarproject.R;
-import org.briarproject.api.ContactId;
 import org.briarproject.api.android.AndroidExecutor;
 import org.briarproject.api.android.AndroidNotificationManager;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DatabaseConfig;
 import org.briarproject.api.db.DatabaseExecutor;

briar-android/src/org/briarproject/android/DashboardActivity.java

@@ -21,7 +21,6 @@ import org.briarproject.R;
 import org.briarproject.android.contact.ContactListActivity;
 import org.briarproject.android.forum.ForumListActivity;
 import org.briarproject.android.util.LayoutUtils;
-import org.briarproject.api.LocalAuthor;
 import org.briarproject.api.TransportId;
 import org.briarproject.api.android.ReferenceManager;
 import org.briarproject.api.db.DatabaseComponent;
@@ -31,6 +30,7 @@ import org.briarproject.api.event.EventBus;
 import org.briarproject.api.event.EventListener;
 import org.briarproject.api.event.TransportDisabledEvent;
 import org.briarproject.api.event.TransportEnabledEvent;
+import org.briarproject.api.identity.LocalAuthor;
 import org.briarproject.api.plugins.Plugin;
 import org.briarproject.api.plugins.PluginManager;
 

briar-android/src/org/briarproject/android/SetupActivity.java

@@ -1,5 +1,40 @@
 package org.briarproject.android;
 
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.ScrollView;
+import android.widget.TextView;
+import android.widget.TextView.OnEditorActionListener;
+
+import org.briarproject.R;
+import org.briarproject.android.util.LayoutUtils;
+import org.briarproject.android.util.StrengthMeter;
+import org.briarproject.api.android.ReferenceManager;
+import org.briarproject.api.crypto.CryptoComponent;
+import org.briarproject.api.crypto.CryptoExecutor;
+import org.briarproject.api.crypto.KeyPair;
+import org.briarproject.api.crypto.PasswordStrengthEstimator;
+import org.briarproject.api.crypto.SecretKey;
+import org.briarproject.api.db.DatabaseConfig;
+import org.briarproject.api.identity.AuthorFactory;
+import org.briarproject.api.identity.LocalAuthor;
+import org.briarproject.util.StringUtils;
+
+import java.util.concurrent.Executor;
+import java.util.logging.Logger;
+
+import javax.inject.Inject;
+
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static android.text.InputType.TYPE_CLASS_TEXT;
 import static android.text.InputType.TYPE_TEXT_FLAG_CAP_WORDS;
@@ -16,44 +51,8 @@ import static java.util.logging.Level.INFO;
 import static org.briarproject.android.TestingConstants.PREVENT_SCREENSHOTS;
 import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
 import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP;
-import static org.briarproject.api.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
 import static org.briarproject.api.crypto.PasswordStrengthEstimator.WEAK;
-
+import static org.briarproject.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
-import java.util.concurrent.Executor;
-import java.util.logging.Logger;
-
-import javax.inject.Inject;
-
-import org.briarproject.R;
-import org.briarproject.android.util.LayoutUtils;
-import org.briarproject.android.util.StrengthMeter;
-import org.briarproject.api.AuthorFactory;
-import org.briarproject.api.LocalAuthor;
-import org.briarproject.api.android.ReferenceManager;
-import org.briarproject.api.crypto.CryptoComponent;
-import org.briarproject.api.crypto.CryptoExecutor;
-import org.briarproject.api.crypto.KeyPair;
-import org.briarproject.api.crypto.PasswordStrengthEstimator;
-import org.briarproject.api.crypto.SecretKey;
-import org.briarproject.api.db.DatabaseConfig;
-import org.briarproject.util.StringUtils;
-
-import roboguice.activity.RoboActivity;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.os.Bundle;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-import android.widget.ScrollView;
-import android.widget.TextView;
-import android.widget.TextView.OnEditorActionListener;
 
 public class SetupActivity extends BaseActivity implements OnClickListener,
 OnEditorActionListener {

briar-android/src/org/briarproject/android/contact/ContactListActivity.java

@@ -23,9 +23,8 @@ import org.briarproject.android.BriarActivity;
 import org.briarproject.android.invitation.AddContactActivity;
 import org.briarproject.android.util.HorizontalBorder;
 import org.briarproject.android.util.ListLoadingProgressBar;
-import org.briarproject.api.AuthorId;
+import org.briarproject.api.contact.Contact;
-import org.briarproject.api.Contact;
+import org.briarproject.api.contact.ContactId;
-import org.briarproject.api.ContactId;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DbException;
 import org.briarproject.api.db.NoSuchContactException;
@@ -37,6 +36,7 @@ import org.briarproject.api.event.Event;
 import org.briarproject.api.event.EventBus;
 import org.briarproject.api.event.EventListener;
 import org.briarproject.api.event.MessageAddedEvent;
+import org.briarproject.api.identity.AuthorId;
 import org.briarproject.api.plugins.ConnectionRegistry;
 import org.briarproject.api.sync.GroupId;
 import org.briarproject.api.sync.MessageHeader;

briar-android/src/org/briarproject/android/contact/ContactListItem.java

@@ -1,6 +1,6 @@
 package org.briarproject.android.contact;
 
-import org.briarproject.api.Contact;
+import org.briarproject.api.contact.Contact;
 import org.briarproject.api.sync.GroupId;
 import org.briarproject.api.sync.MessageHeader;
 

briar-android/src/org/briarproject/android/contact/ConversationActivity.java

@@ -19,10 +19,9 @@ import android.widget.TextView;
 import org.briarproject.R;
 import org.briarproject.android.BriarActivity;
 import org.briarproject.android.util.LayoutUtils;
-import org.briarproject.api.AuthorId;
-import org.briarproject.api.Contact;
-import org.briarproject.api.ContactId;
 import org.briarproject.api.android.AndroidNotificationManager;
+import org.briarproject.api.contact.Contact;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.crypto.CryptoExecutor;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DbException;
@@ -38,6 +37,7 @@ import org.briarproject.api.event.EventListener;
 import org.briarproject.api.event.MessageAddedEvent;
 import org.briarproject.api.event.MessagesAckedEvent;
 import org.briarproject.api.event.MessagesSentEvent;
+import org.briarproject.api.identity.AuthorId;
 import org.briarproject.api.plugins.ConnectionRegistry;
 import org.briarproject.api.sync.Group;
 import org.briarproject.api.sync.GroupId;

briar-android/src/org/briarproject/android/contact/ReadPrivateMessageActivity.java

@@ -17,10 +17,10 @@ import org.briarproject.android.util.AuthorView;
 import org.briarproject.android.util.ElasticHorizontalSpace;
 import org.briarproject.android.util.HorizontalBorder;
 import org.briarproject.android.util.LayoutUtils;
-import org.briarproject.api.AuthorId;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DbException;
 import org.briarproject.api.db.NoSuchMessageException;
+import org.briarproject.api.identity.AuthorId;
 import org.briarproject.api.sync.GroupId;
 import org.briarproject.api.sync.MessageId;
 import org.briarproject.util.StringUtils;
@@ -38,7 +38,7 @@ import static java.util.logging.Level.WARNING;
 import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP;
 import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP_1;
 import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP_1;
-import static org.briarproject.api.Author.Status.VERIFIED;
+import static org.briarproject.api.identity.Author.Status.VERIFIED;
 
 public class ReadPrivateMessageActivity extends BriarActivity
 implements OnClickListener {

briar-android/src/org/briarproject/android/contact/SelectContactsDialog.java

@@ -1,21 +1,21 @@
 package org.briarproject.android.contact;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.briarproject.R;
-import org.briarproject.api.Contact;
-import org.briarproject.api.ContactId;
-
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnMultiChoiceClickListener;
 
+import org.briarproject.R;
+import org.briarproject.api.contact.Contact;
+import org.briarproject.api.contact.ContactId;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 public class SelectContactsDialog implements OnMultiChoiceClickListener {
 
 	private Listener listener = null;

briar-android/src/org/briarproject/android/contact/WritePrivateMessageActivity.java

@@ -16,13 +16,13 @@ import org.briarproject.R;
 import org.briarproject.android.BriarActivity;
 import org.briarproject.android.util.CommonLayoutParams;
 import org.briarproject.android.util.LayoutUtils;
-import org.briarproject.api.AuthorId;
-import org.briarproject.api.LocalAuthor;
 import org.briarproject.api.crypto.CryptoExecutor;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DbException;
 import org.briarproject.api.db.NoSuchContactException;
 import org.briarproject.api.db.NoSuchSubscriptionException;
+import org.briarproject.api.identity.AuthorId;
+import org.briarproject.api.identity.LocalAuthor;
 import org.briarproject.api.sync.Group;
 import org.briarproject.api.sync.GroupId;
 import org.briarproject.api.sync.Message;

briar-android/src/org/briarproject/android/forum/AvailableForumsActivity.java

@@ -10,8 +10,8 @@ import android.widget.Toast;
 import org.briarproject.R;
 import org.briarproject.android.BriarActivity;
 import org.briarproject.android.util.ListLoadingProgressBar;
-import org.briarproject.api.Contact;
+import org.briarproject.api.contact.Contact;
-import org.briarproject.api.ContactId;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DbException;
 import org.briarproject.api.db.NoSuchSubscriptionException;

briar-android/src/org/briarproject/android/forum/AvailableForumsAdapter.java

@@ -9,7 +9,7 @@ import android.widget.TextView;
 
 import org.briarproject.R;
 import org.briarproject.android.util.LayoutUtils;
-import org.briarproject.api.Contact;
+import org.briarproject.api.contact.Contact;
 import org.briarproject.util.StringUtils;
 
 import java.util.ArrayList;

briar-android/src/org/briarproject/android/forum/AvailableForumsItem.java

@@ -1,6 +1,6 @@
 package org.briarproject.android.forum;
 
-import org.briarproject.api.Contact;
+import org.briarproject.api.contact.Contact;
 import org.briarproject.api.sync.Group;
 
 import java.util.Collection;

briar-android/src/org/briarproject/android/forum/ForumActivity.java

@@ -17,7 +17,6 @@ import org.briarproject.android.BriarActivity;
 import org.briarproject.android.util.ElasticHorizontalSpace;
 import org.briarproject.android.util.HorizontalBorder;
 import org.briarproject.android.util.ListLoadingProgressBar;
-import org.briarproject.api.Author;
 import org.briarproject.api.android.AndroidNotificationManager;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DbException;
@@ -28,6 +27,7 @@ import org.briarproject.api.event.EventBus;
 import org.briarproject.api.event.EventListener;
 import org.briarproject.api.event.MessageAddedEvent;
 import org.briarproject.api.event.SubscriptionRemovedEvent;
+import org.briarproject.api.identity.Author;
 import org.briarproject.api.sync.Group;
 import org.briarproject.api.sync.GroupId;
 import org.briarproject.api.sync.MessageHeader;

briar-android/src/org/briarproject/android/forum/ForumAdapter.java

@@ -13,7 +13,7 @@ import android.widget.TextView;
 import org.briarproject.R;
 import org.briarproject.android.util.AuthorView;
 import org.briarproject.android.util.LayoutUtils;
-import org.briarproject.api.Author;
+import org.briarproject.api.identity.Author;
 import org.briarproject.api.sync.MessageHeader;
 import org.briarproject.util.StringUtils;
 

briar-android/src/org/briarproject/android/forum/ForumContacts.java

@@ -1,6 +1,6 @@
 package org.briarproject.android.forum;
 
-import org.briarproject.api.Contact;
+import org.briarproject.api.contact.Contact;
 import org.briarproject.api.sync.Group;
 
 import java.util.Collection;

briar-android/src/org/briarproject/android/forum/ReadForumPostActivity.java

@@ -17,10 +17,10 @@ import org.briarproject.android.util.AuthorView;
 import org.briarproject.android.util.ElasticHorizontalSpace;
 import org.briarproject.android.util.HorizontalBorder;
 import org.briarproject.android.util.LayoutUtils;
-import org.briarproject.api.Author;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DbException;
 import org.briarproject.api.db.NoSuchMessageException;
+import org.briarproject.api.identity.Author;
 import org.briarproject.api.sync.GroupId;
 import org.briarproject.api.sync.MessageId;
 import org.briarproject.util.StringUtils;

briar-android/src/org/briarproject/android/forum/ShareForumActivity.java

@@ -15,8 +15,8 @@ import org.briarproject.android.BriarActivity;
 import org.briarproject.android.contact.SelectContactsDialog;
 import org.briarproject.android.invitation.AddContactActivity;
 import org.briarproject.android.util.LayoutUtils;
-import org.briarproject.api.Contact;
+import org.briarproject.api.contact.Contact;
-import org.briarproject.api.ContactId;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DbException;
 import org.briarproject.api.sync.GroupId;

briar-android/src/org/briarproject/android/forum/WriteForumPostActivity.java

@@ -23,14 +23,14 @@ import org.briarproject.android.identity.LocalAuthorItemComparator;
 import org.briarproject.android.identity.LocalAuthorSpinnerAdapter;
 import org.briarproject.android.util.CommonLayoutParams;
 import org.briarproject.android.util.LayoutUtils;
-import org.briarproject.api.AuthorId;
-import org.briarproject.api.LocalAuthor;
 import org.briarproject.api.crypto.CryptoComponent;
 import org.briarproject.api.crypto.CryptoExecutor;
 import org.briarproject.api.crypto.KeyParser;
 import org.briarproject.api.crypto.PrivateKey;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DbException;
+import org.briarproject.api.identity.AuthorId;
+import org.briarproject.api.identity.LocalAuthor;
 import org.briarproject.api.sync.Group;
 import org.briarproject.api.sync.GroupId;
 import org.briarproject.api.sync.Message;

briar-android/src/org/briarproject/android/identity/CreateIdentityActivity.java

@@ -1,36 +1,5 @@
 package org.briarproject.android.identity;
 
-import static android.text.InputType.TYPE_CLASS_TEXT;
-import static android.text.InputType.TYPE_TEXT_FLAG_CAP_WORDS;
-import static android.view.Gravity.CENTER;
-import static android.view.Gravity.CENTER_HORIZONTAL;
-import static android.view.View.GONE;
-import static android.view.View.VISIBLE;
-import static android.widget.LinearLayout.VERTICAL;
-import static android.widget.Toast.LENGTH_LONG;
-import static java.util.logging.Level.INFO;
-import static java.util.logging.Level.WARNING;
-import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
-import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP;
-import static org.briarproject.api.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
-
-import java.util.concurrent.Executor;
-import java.util.logging.Logger;
-
-import javax.inject.Inject;
-
-import org.briarproject.R;
-import org.briarproject.android.BriarActivity;
-import org.briarproject.android.util.LayoutUtils;
-import org.briarproject.api.AuthorFactory;
-import org.briarproject.api.LocalAuthor;
-import org.briarproject.api.crypto.CryptoComponent;
-import org.briarproject.api.crypto.CryptoExecutor;
-import org.briarproject.api.crypto.KeyPair;
-import org.briarproject.api.db.DatabaseComponent;
-import org.briarproject.api.db.DbException;
-import org.briarproject.util.StringUtils;
-
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.KeyEvent;
@@ -44,6 +13,37 @@ import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 import android.widget.Toast;
 
+import org.briarproject.R;
+import org.briarproject.android.BriarActivity;
+import org.briarproject.android.util.LayoutUtils;
+import org.briarproject.api.crypto.CryptoComponent;
+import org.briarproject.api.crypto.CryptoExecutor;
+import org.briarproject.api.crypto.KeyPair;
+import org.briarproject.api.db.DatabaseComponent;
+import org.briarproject.api.db.DbException;
+import org.briarproject.api.identity.AuthorFactory;
+import org.briarproject.api.identity.LocalAuthor;
+import org.briarproject.util.StringUtils;
+
+import java.util.concurrent.Executor;
+import java.util.logging.Logger;
+
+import javax.inject.Inject;
+
+import static android.text.InputType.TYPE_CLASS_TEXT;
+import static android.text.InputType.TYPE_TEXT_FLAG_CAP_WORDS;
+import static android.view.Gravity.CENTER;
+import static android.view.Gravity.CENTER_HORIZONTAL;
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+import static android.widget.LinearLayout.VERTICAL;
+import static android.widget.Toast.LENGTH_LONG;
+import static java.util.logging.Level.INFO;
+import static java.util.logging.Level.WARNING;
+import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
+import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP;
+import static org.briarproject.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
+
 public class CreateIdentityActivity extends BriarActivity
 implements OnEditorActionListener, OnClickListener {
 

briar-android/src/org/briarproject/android/identity/LocalAuthorItem.java

@@ -1,6 +1,6 @@
 package org.briarproject.android.identity;
 
-import org.briarproject.api.LocalAuthor;
+import org.briarproject.api.identity.LocalAuthor;
 
 public class LocalAuthorItem {
 

briar-android/src/org/briarproject/android/invitation/AddContactActivity.java

@@ -7,14 +7,14 @@ import android.widget.Toast;
 
 import org.briarproject.R;
 import org.briarproject.android.BriarActivity;
-import org.briarproject.api.AuthorId;
-import org.briarproject.api.LocalAuthor;
 import org.briarproject.api.TransportConfig;
 import org.briarproject.api.TransportId;
 import org.briarproject.api.android.ReferenceManager;
 import org.briarproject.api.crypto.CryptoComponent;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DbException;
+import org.briarproject.api.identity.AuthorId;
+import org.briarproject.api.identity.LocalAuthor;
 import org.briarproject.api.invitation.InvitationListener;
 import org.briarproject.api.invitation.InvitationState;
 import org.briarproject.api.invitation.InvitationTask;

briar-android/src/org/briarproject/android/invitation/ChooseIdentityView.java

@@ -1,24 +1,5 @@
 package org.briarproject.android.invitation;
 
-import static android.bluetooth.BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE;
-import static android.bluetooth.BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION;
-import static android.view.Gravity.CENTER;
-import static org.briarproject.android.identity.LocalAuthorItem.NEW;
-import static org.briarproject.android.invitation.AddContactActivity.REQUEST_BLUETOOTH;
-import static org.briarproject.android.invitation.AddContactActivity.REQUEST_CREATE_IDENTITY;
-import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP;
-import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP;
-
-import java.util.Collection;
-
-import org.briarproject.R;
-import org.briarproject.android.identity.CreateIdentityActivity;
-import org.briarproject.android.identity.LocalAuthorItem;
-import org.briarproject.android.identity.LocalAuthorItemComparator;
-import org.briarproject.android.identity.LocalAuthorSpinnerAdapter;
-import org.briarproject.api.AuthorId;
-import org.briarproject.api.LocalAuthor;
-
 import android.content.Context;
 import android.content.Intent;
 import android.view.LayoutInflater;
@@ -27,10 +8,25 @@ import android.view.View.OnClickListener;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.Button;
-import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import org.briarproject.R;
+import org.briarproject.android.identity.CreateIdentityActivity;
+import org.briarproject.android.identity.LocalAuthorItem;
+import org.briarproject.android.identity.LocalAuthorItemComparator;
+import org.briarproject.android.identity.LocalAuthorSpinnerAdapter;
+import org.briarproject.api.identity.AuthorId;
+import org.briarproject.api.identity.LocalAuthor;
+
+import java.util.Collection;
+
+import static android.bluetooth.BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE;
+import static android.bluetooth.BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION;
+import static org.briarproject.android.identity.LocalAuthorItem.NEW;
+import static org.briarproject.android.invitation.AddContactActivity.REQUEST_BLUETOOTH;
+import static org.briarproject.android.invitation.AddContactActivity.REQUEST_CREATE_IDENTITY;
+
 class ChooseIdentityView extends AddContactView
 implements OnItemSelectedListener, OnClickListener {
 

briar-android/src/org/briarproject/android/util/AuthorView.java

@@ -1,15 +1,15 @@
 package org.briarproject.android.util;
 
-import static android.text.TextUtils.TruncateAt.END;
-
-import org.briarproject.R;
-import org.briarproject.api.Author;
-
 import android.content.Context;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import org.briarproject.R;
+import org.briarproject.api.identity.Author;
+
+import static android.text.TextUtils.TruncateAt.END;
+
 public class AuthorView extends RelativeLayout {
 
 	public AuthorView(Context ctx) {

briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java

@@ -1,18 +1,25 @@
 package org.briarproject.plugins.droidtooth;
 
-import static android.bluetooth.BluetoothAdapter.ACTION_SCAN_MODE_CHANGED;
+import android.bluetooth.BluetoothAdapter;
-import static android.bluetooth.BluetoothAdapter.ACTION_STATE_CHANGED;
+import android.bluetooth.BluetoothDevice;
-import static android.bluetooth.BluetoothAdapter.EXTRA_SCAN_MODE;
+import android.bluetooth.BluetoothServerSocket;
-import static android.bluetooth.BluetoothAdapter.EXTRA_STATE;
+import android.bluetooth.BluetoothSocket;
-import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE;
+import android.content.BroadcastReceiver;
-import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE;
+import android.content.Context;
-import static android.bluetooth.BluetoothAdapter.SCAN_MODE_NONE;
+import android.content.Intent;
-import static android.bluetooth.BluetoothAdapter.STATE_OFF;
+import android.content.IntentFilter;
-import static android.bluetooth.BluetoothAdapter.STATE_ON;
+
-import static android.bluetooth.BluetoothDevice.EXTRA_DEVICE;
+import org.briarproject.api.TransportId;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import org.briarproject.api.TransportProperties;
-import static java.util.logging.Level.INFO;
+import org.briarproject.api.android.AndroidExecutor;
-import static java.util.logging.Level.WARNING;
+import org.briarproject.api.contact.ContactId;
+import org.briarproject.api.crypto.PseudoRandom;
+import org.briarproject.api.plugins.duplex.DuplexPlugin;
+import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
+import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
+import org.briarproject.api.system.Clock;
+import org.briarproject.util.LatchedReference;
+import org.briarproject.util.StringUtils;
 
 import java.io.IOException;
 import java.security.SecureRandom;
@@ -29,26 +36,19 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
-import org.briarproject.api.ContactId;
+import static android.bluetooth.BluetoothAdapter.ACTION_SCAN_MODE_CHANGED;
-import org.briarproject.api.TransportId;
+import static android.bluetooth.BluetoothAdapter.ACTION_STATE_CHANGED;
-import org.briarproject.api.TransportProperties;
+import static android.bluetooth.BluetoothAdapter.EXTRA_SCAN_MODE;
-import org.briarproject.api.android.AndroidExecutor;
+import static android.bluetooth.BluetoothAdapter.EXTRA_STATE;
-import org.briarproject.api.crypto.PseudoRandom;
+import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE;
-import org.briarproject.api.plugins.duplex.DuplexPlugin;
+import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE;
-import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
+import static android.bluetooth.BluetoothAdapter.SCAN_MODE_NONE;
-import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
+import static android.bluetooth.BluetoothAdapter.STATE_OFF;
-import org.briarproject.api.system.Clock;
+import static android.bluetooth.BluetoothAdapter.STATE_ON;
-import org.briarproject.util.LatchedReference;
+import static android.bluetooth.BluetoothDevice.EXTRA_DEVICE;
-import org.briarproject.util.StringUtils;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
+import static java.util.logging.Level.INFO;
-import android.bluetooth.BluetoothAdapter;
+import static java.util.logging.Level.WARNING;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothServerSocket;
-import android.bluetooth.BluetoothSocket;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
 
 class DroidtoothPlugin implements DuplexPlugin {
 

briar-android/src/org/briarproject/plugins/tor/TorPlugin.java

@@ -11,10 +11,10 @@ import android.os.FileObserver;
 import net.freehaven.tor.control.EventHandler;
 import net.freehaven.tor.control.TorControlConnection;
 
-import org.briarproject.api.ContactId;
 import org.briarproject.api.TransportConfig;
 import org.briarproject.api.TransportId;
 import org.briarproject.api.TransportProperties;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.crypto.PseudoRandom;
 import org.briarproject.api.event.Event;
 import org.briarproject.api.event.EventListener;

briar-api/src/org/briarproject/api/android/AndroidNotificationManager.java

@@ -1,6 +1,6 @@
 package org.briarproject.api.android;
 
-import org.briarproject.api.ContactId;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.lifecycle.Service;
 import org.briarproject.api.sync.GroupId;
 

briar-api/src/org/briarproject/api/contact/Contact.java

@@ -1,4 +1,7 @@
-package org.briarproject.api;
+package org.briarproject.api.contact;
+
+import org.briarproject.api.identity.Author;
+import org.briarproject.api.identity.AuthorId;
 
 public class Contact {
 

briar-api/src/org/briarproject/api/contact/ContactId.java

@@ -1,4 +1,4 @@
-package org.briarproject.api;
+package org.briarproject.api.contact;
 
 /**
  * Type-safe wrapper for an integer that uniquely identifies a contact within

briar-api/src/org/briarproject/api/contact/ContactManager.java

@@ -1,10 +1,8 @@
 package org.briarproject.api.contact;
 
-import org.briarproject.api.Author;
-import org.briarproject.api.AuthorId;
-import org.briarproject.api.Contact;
-import org.briarproject.api.ContactId;
 import org.briarproject.api.db.DbException;
+import org.briarproject.api.identity.Author;
+import org.briarproject.api.identity.AuthorId;
 
 import java.util.Collection;
 

briar-api/src/org/briarproject/api/db/DatabaseComponent.java

@@ -1,14 +1,14 @@
 package org.briarproject.api.db;
 
-import org.briarproject.api.Author;
-import org.briarproject.api.AuthorId;
-import org.briarproject.api.Contact;
-import org.briarproject.api.ContactId;
-import org.briarproject.api.LocalAuthor;
 import org.briarproject.api.Settings;
 import org.briarproject.api.TransportConfig;
 import org.briarproject.api.TransportId;
 import org.briarproject.api.TransportProperties;
+import org.briarproject.api.contact.Contact;
+import org.briarproject.api.contact.ContactId;
+import org.briarproject.api.identity.Author;
+import org.briarproject.api.identity.AuthorId;
+import org.briarproject.api.identity.LocalAuthor;
 import org.briarproject.api.sync.Ack;
 import org.briarproject.api.sync.Group;
 import org.briarproject.api.sync.GroupId;

briar-api/src/org/briarproject/api/event/ContactAddedEvent.java

@@ -1,6 +1,6 @@
 package org.briarproject.api.event;
 
-import org.briarproject.api.ContactId;
+import org.briarproject.api.contact.ContactId;
 
 /** An event that is broadcast when a contact is added. */
 public class ContactAddedEvent extends Event {

briar-api/src/org/briarproject/api/event/ContactConnectedEvent.java

@@ -1,6 +1,6 @@
 package org.briarproject.api.event;
 
-import org.briarproject.api.ContactId;
+import org.briarproject.api.contact.ContactId;
 
 /**
  * An event that is broadcast when a contact connects that was not previously

briar-api/src/org/briarproject/api/event/ContactDisconnectedEvent.java

@@ -1,6 +1,6 @@
 package org.briarproject.api.event;
 
-import org.briarproject.api.ContactId;
+import org.briarproject.api.contact.ContactId;
 
 /**
  * An event that is broadcast when a contact disconnects and is no longer

briar-api/src/org/briarproject/api/event/ContactRemovedEvent.java

@@ -1,6 +1,6 @@
 package org.briarproject.api.event;
 
-import org.briarproject.api.ContactId;
+import org.briarproject.api.contact.ContactId;
 
 /** An event that is broadcast when a contact is removed. */
 public class ContactRemovedEvent extends Event {

briar-api/src/org/briarproject/api/event/LocalAuthorAddedEvent.java

@@ -1,6 +1,6 @@
 package org.briarproject.api.event;
 
-import org.briarproject.api.AuthorId;
+import org.briarproject.api.identity.AuthorId;
 
 /** An event that is broadcast when a local pseudonym is added. */
 public class LocalAuthorAddedEvent extends Event {

briar-api/src/org/briarproject/api/event/LocalAuthorRemovedEvent.java

@@ -1,6 +1,6 @@
 package org.briarproject.api.event;
 
-import org.briarproject.api.AuthorId;
+import org.briarproject.api.identity.AuthorId;
 
 /** An event that is broadcast when a local pseudonym is removed. */
 public class LocalAuthorRemovedEvent extends Event {

briar-api/src/org/briarproject/api/event/LocalSubscriptionsUpdatedEvent.java

@@ -1,8 +1,8 @@
 package org.briarproject.api.event;
 
-import java.util.Collection;
+import org.briarproject.api.contact.ContactId;
 
-import org.briarproject.api.ContactId;
+import java.util.Collection;
 
 /**
  * An event that is broadcast when the set of subscriptions visible to one or

briar-api/src/org/briarproject/api/event/MessageAddedEvent.java

@@ -1,6 +1,6 @@
 package org.briarproject.api.event;
 
-import org.briarproject.api.ContactId;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.sync.Group;
 
 /** An event that is broadcast when a message is added to the database. */

briar-api/src/org/briarproject/api/event/MessageRequestedEvent.java

@@ -1,6 +1,6 @@
 package org.briarproject.api.event;
 
-import org.briarproject.api.ContactId;
+import org.briarproject.api.contact.ContactId;
 
 /** An event that is broadcast when a message is requested by a contact. */
 public class MessageRequestedEvent extends Event {

briar-api/src/org/briarproject/api/event/MessageToAckEvent.java

@@ -1,6 +1,6 @@
 package org.briarproject.api.event;
 
-import org.briarproject.api.ContactId;
+import org.briarproject.api.contact.ContactId;
 
 /**
  * An event that is broadcast when a message is received from or offered by a

briar-api/src/org/briarproject/api/event/MessageToRequestEvent.java

@@ -1,6 +1,6 @@
 package org.briarproject.api.event;
 
-import org.briarproject.api.ContactId;
+import org.briarproject.api.contact.ContactId;
 
 /**
  * An event that is broadcast when a message is offered by a contact and needs

briar-api/src/org/briarproject/api/event/MessagesAckedEvent.java

@@ -1,6 +1,6 @@
 package org.briarproject.api.event;
 
-import org.briarproject.api.ContactId;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.sync.MessageId;
 
 import java.util.Collection;

briar-api/src/org/briarproject/api/event/MessagesSentEvent.java

@@ -1,6 +1,6 @@
 package org.briarproject.api.event;
 
-import org.briarproject.api.ContactId;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.sync.MessageId;
 
 import java.util.Collection;

briar-api/src/org/briarproject/api/event/RemoteSubscriptionsUpdatedEvent.java

@@ -1,6 +1,6 @@
 package org.briarproject.api.event;
 
-import org.briarproject.api.ContactId;
+import org.briarproject.api.contact.ContactId;
 
 /**  An event that is broadcast when a contact's subscriptions are updated. */
 public class RemoteSubscriptionsUpdatedEvent extends Event {

briar-api/src/org/briarproject/api/event/RemoteTransportsUpdatedEvent.java

@@ -1,7 +1,7 @@
 package org.briarproject.api.event;
 
-import org.briarproject.api.ContactId;
 import org.briarproject.api.TransportId;
+import org.briarproject.api.contact.ContactId;
 
 /**
  * An event that is broadcast when a contact's remote transport properties

briar-api/src/org/briarproject/api/forum/ForumManager.java

@@ -1,7 +1,7 @@
 package org.briarproject.api.forum;
 
-import org.briarproject.api.Contact;
+import org.briarproject.api.contact.Contact;
-import org.briarproject.api.ContactId;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.db.DbException;
 import org.briarproject.api.sync.Group;
 import org.briarproject.api.sync.GroupId;

briar-api/src/org/briarproject/api/identity/Author.java

@@ -1,13 +1,11 @@
-package org.briarproject.api;
+package org.briarproject.api.identity;
-
-import static org.briarproject.api.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
 
 import java.io.UnsupportedEncodingException;
 
 /** A pseudonym for a user. */
 public class Author {
 
-	public enum Status { ANONYMOUS, UNKNOWN, UNVERIFIED, VERIFIED };
+	public enum Status { ANONYMOUS, UNKNOWN, UNVERIFIED, VERIFIED }
 
 	private final AuthorId id;
 	private final String name;
@@ -20,7 +18,7 @@ public class Author {
 		} catch (UnsupportedEncodingException e) {
 			throw new RuntimeException(e);
 		}
-		if (length == 0 || length > MAX_AUTHOR_NAME_LENGTH)
+		if (length == 0 || length > AuthorConstants.MAX_AUTHOR_NAME_LENGTH)
 			throw new IllegalArgumentException();
 		this.id = id;
 		this.name = name;

briar-api/src/org/briarproject/api/identity/AuthorConstants.java

@@ -1,4 +1,4 @@
-package org.briarproject.api;
+package org.briarproject.api.identity;
 
 public interface AuthorConstants {
 

briar-api/src/org/briarproject/api/identity/AuthorFactory.java

@@ -1,4 +1,4 @@
-package org.briarproject.api;
+package org.briarproject.api.identity;
 
 public interface AuthorFactory {
 

briar-api/src/org/briarproject/api/identity/AuthorId.java

@@ -1,4 +1,6 @@
-package org.briarproject.api;
+package org.briarproject.api.identity;
+
+import org.briarproject.api.UniqueId;
 
 import java.util.Arrays;
 

briar-api/src/org/briarproject/api/identity/IdentityManager.java

@@ -1,7 +1,5 @@
 package org.briarproject.api.identity;
 
-import org.briarproject.api.AuthorId;
-import org.briarproject.api.LocalAuthor;
 import org.briarproject.api.db.DbException;
 
 import java.util.Collection;

briar-api/src/org/briarproject/api/identity/LocalAuthor.java

@@ -1,4 +1,4 @@
-package org.briarproject.api;
+package org.briarproject.api.identity;
 
 /** A pseudonym for the local user. */
 public class LocalAuthor extends Author {

briar-api/src/org/briarproject/api/invitation/InvitationTaskFactory.java

@@ -1,6 +1,6 @@
 package org.briarproject.api.invitation;
 
-import org.briarproject.api.AuthorId;
+import org.briarproject.api.identity.AuthorId;
 
 /** Creates tasks for exchanging invitations with remote peers. */
 public interface InvitationTaskFactory {

briar-api/src/org/briarproject/api/messaging/MessagingManager.java

@@ -1,6 +1,6 @@
 package org.briarproject.api.messaging;
 
-import org.briarproject.api.ContactId;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.db.DbException;
 import org.briarproject.api.sync.Group;
 import org.briarproject.api.sync.GroupId;

briar-api/src/org/briarproject/api/plugins/ConnectionManager.java

@@ -1,7 +1,7 @@
 package org.briarproject.api.plugins;
 
-import org.briarproject.api.ContactId;
 import org.briarproject.api.TransportId;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
 
 public interface ConnectionManager {

briar-api/src/org/briarproject/api/plugins/ConnectionRegistry.java

@@ -1,9 +1,9 @@
 package org.briarproject.api.plugins;
 
-import java.util.Collection;
-
-import org.briarproject.api.ContactId;
 import org.briarproject.api.TransportId;
+import org.briarproject.api.contact.ContactId;
+
+import java.util.Collection;
 
 /**
  * Keeps track of which contacts are currently connected by which transports.

briar-api/src/org/briarproject/api/plugins/Plugin.java

@@ -1,11 +1,11 @@
 package org.briarproject.api.plugins;
 
+import org.briarproject.api.TransportId;
+import org.briarproject.api.contact.ContactId;
+
 import java.io.IOException;
 import java.util.Collection;
 
-import org.briarproject.api.ContactId;
-import org.briarproject.api.TransportId;
-
 public interface Plugin {
 
 	/** Returns the plugin's transport identifier. */

briar-api/src/org/briarproject/api/plugins/PluginCallback.java

@@ -1,10 +1,10 @@
 package org.briarproject.api.plugins;
 
-import java.util.Map;
-
-import org.briarproject.api.ContactId;
 import org.briarproject.api.TransportConfig;
 import org.briarproject.api.TransportProperties;
+import org.briarproject.api.contact.ContactId;
+
+import java.util.Map;
 
 /**
  * An interface through which a transport plugin interacts with the rest of

briar-api/src/org/briarproject/api/plugins/duplex/DuplexPlugin.java

@@ -1,6 +1,6 @@
 package org.briarproject.api.plugins.duplex;
 
-import org.briarproject.api.ContactId;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.crypto.PseudoRandom;
 import org.briarproject.api.plugins.Plugin;
 

briar-api/src/org/briarproject/api/plugins/duplex/DuplexPluginCallback.java

@@ -1,6 +1,6 @@
 package org.briarproject.api.plugins.duplex;
 
-import org.briarproject.api.ContactId;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.plugins.PluginCallback;
 
 /**

briar-api/src/org/briarproject/api/plugins/simplex/SimplexPlugin.java

@@ -1,6 +1,6 @@
 package org.briarproject.api.plugins.simplex;
 
-import org.briarproject.api.ContactId;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.plugins.Plugin;
 import org.briarproject.api.plugins.TransportConnectionReader;
 import org.briarproject.api.plugins.TransportConnectionWriter;

briar-api/src/org/briarproject/api/plugins/simplex/SimplexPluginCallback.java

@@ -1,6 +1,6 @@
 package org.briarproject.api.plugins.simplex;
 
-import org.briarproject.api.ContactId;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.plugins.PluginCallback;
 import org.briarproject.api.plugins.TransportConnectionReader;
 import org.briarproject.api.plugins.TransportConnectionWriter;

briar-api/src/org/briarproject/api/sync/Message.java

@@ -1,6 +1,6 @@
 package org.briarproject.api.sync;
 
-import org.briarproject.api.Author;
+import org.briarproject.api.identity.Author;
 
 public interface Message {
 
@@ -20,7 +20,7 @@ public interface Message {
 	Group getGroup();
 
 	/**
-	 * Returns the message's {@link org.briarproject.api.Author Author}, or null
+	 * Returns the message's {@link Author Author}, or null
 	 * if this is an anonymous message.
 	 */
 	Author getAuthor();

briar-api/src/org/briarproject/api/sync/MessageFactory.java

@@ -1,7 +1,7 @@
 package org.briarproject.api.sync;
 
-import org.briarproject.api.Author;
 import org.briarproject.api.crypto.PrivateKey;
+import org.briarproject.api.identity.Author;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;

briar-api/src/org/briarproject/api/sync/MessageHeader.java

@@ -1,6 +1,6 @@
 package org.briarproject.api.sync;
 
-import org.briarproject.api.Author;
+import org.briarproject.api.identity.Author;
 
 public class MessageHeader {
 

briar-api/src/org/briarproject/api/sync/MessagingSessionFactory.java

@@ -1,7 +1,7 @@
 package org.briarproject.api.sync;
 
-import org.briarproject.api.ContactId;
 import org.briarproject.api.TransportId;
+import org.briarproject.api.contact.ContactId;
 
 import java.io.InputStream;
 import java.io.OutputStream;

briar-api/src/org/briarproject/api/sync/UnverifiedMessage.java

@@ -1,6 +1,6 @@
 package org.briarproject.api.sync;
 
-import org.briarproject.api.Author;
+import org.briarproject.api.identity.Author;
 
 /** A {@link Message} that has not yet had its signatures (if any) verified. */
 public class UnverifiedMessage {
@@ -45,7 +45,7 @@ public class UnverifiedMessage {
 	}
 
 	/**
-	 * Returns the message's {@link org.briarproject.api.Author Author}, or null
+	 * Returns the message's {@link Author Author}, or null
 	 * if this is an anonymous message.
 	 */
 	public Author getAuthor() {

briar-api/src/org/briarproject/api/transport/KeyManager.java

@@ -1,7 +1,7 @@
 package org.briarproject.api.transport;
 
-import org.briarproject.api.ContactId;
 import org.briarproject.api.TransportId;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.db.DbException;
 import org.briarproject.api.lifecycle.Service;
 

briar-api/src/org/briarproject/api/transport/StreamContext.java

@@ -1,7 +1,7 @@
 package org.briarproject.api.transport;
 
-import org.briarproject.api.ContactId;
 import org.briarproject.api.TransportId;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.crypto.SecretKey;
 
 public class StreamContext {

briar-core/src/org/briarproject/db/Database.java

@@ -1,15 +1,15 @@
 package org.briarproject.db;
 
-import org.briarproject.api.Author;
-import org.briarproject.api.AuthorId;
-import org.briarproject.api.Contact;
-import org.briarproject.api.ContactId;
-import org.briarproject.api.LocalAuthor;
 import org.briarproject.api.Settings;
 import org.briarproject.api.TransportConfig;
 import org.briarproject.api.TransportId;
 import org.briarproject.api.TransportProperties;
+import org.briarproject.api.contact.Contact;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.db.DbException;
+import org.briarproject.api.identity.Author;
+import org.briarproject.api.identity.AuthorId;
+import org.briarproject.api.identity.LocalAuthor;
 import org.briarproject.api.sync.Group;
 import org.briarproject.api.sync.GroupId;
 import org.briarproject.api.sync.Message;

briar-core/src/org/briarproject/db/DatabaseComponentImpl.java

@@ -1,14 +1,11 @@
 package org.briarproject.db;
 
-import org.briarproject.api.Author;
-import org.briarproject.api.AuthorId;
-import org.briarproject.api.Contact;
-import org.briarproject.api.ContactId;
-import org.briarproject.api.LocalAuthor;
 import org.briarproject.api.Settings;
 import org.briarproject.api.TransportConfig;
 import org.briarproject.api.TransportId;
 import org.briarproject.api.TransportProperties;
+import org.briarproject.api.contact.Contact;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.db.ContactExistsException;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DbException;
@@ -38,6 +35,9 @@ import org.briarproject.api.event.SubscriptionAddedEvent;
 import org.briarproject.api.event.SubscriptionRemovedEvent;
 import org.briarproject.api.event.TransportAddedEvent;
 import org.briarproject.api.event.TransportRemovedEvent;
+import org.briarproject.api.identity.Author;
+import org.briarproject.api.identity.AuthorId;
+import org.briarproject.api.identity.LocalAuthor;
 import org.briarproject.api.lifecycle.ShutdownManager;
 import org.briarproject.api.sync.Ack;
 import org.briarproject.api.sync.Group;

briar-core/src/org/briarproject/db/JdbcDatabase.java

@@ -1,17 +1,17 @@
 package org.briarproject.db;
 
-import org.briarproject.api.Author;
-import org.briarproject.api.AuthorId;
-import org.briarproject.api.Contact;
-import org.briarproject.api.ContactId;
-import org.briarproject.api.LocalAuthor;
 import org.briarproject.api.Settings;
 import org.briarproject.api.TransportConfig;
 import org.briarproject.api.TransportId;
 import org.briarproject.api.TransportProperties;
+import org.briarproject.api.contact.Contact;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.crypto.SecretKey;
 import org.briarproject.api.db.DbClosedException;
 import org.briarproject.api.db.DbException;
+import org.briarproject.api.identity.Author;
+import org.briarproject.api.identity.AuthorId;
+import org.briarproject.api.identity.LocalAuthor;
 import org.briarproject.api.sync.Group;
 import org.briarproject.api.sync.GroupId;
 import org.briarproject.api.sync.Message;
@@ -52,9 +52,9 @@ import java.util.logging.Logger;
 import static java.sql.Types.BINARY;
 import static java.sql.Types.VARCHAR;
 import static java.util.logging.Level.WARNING;
-import static org.briarproject.api.Author.Status.ANONYMOUS;
+import static org.briarproject.api.identity.Author.Status.ANONYMOUS;
-import static org.briarproject.api.Author.Status.UNKNOWN;
+import static org.briarproject.api.identity.Author.Status.UNKNOWN;
-import static org.briarproject.api.Author.Status.VERIFIED;
+import static org.briarproject.api.identity.Author.Status.VERIFIED;
 import static org.briarproject.api.sync.MessagingConstants.MAX_SUBSCRIPTIONS;
 import static org.briarproject.db.ExponentialBackoff.calculateExpiry;
 

briar-core/src/org/briarproject/invitation/AliceConnector.java

@@ -1,8 +1,5 @@
 package org.briarproject.invitation;
 
-import org.briarproject.api.Author;
-import org.briarproject.api.AuthorFactory;
-import org.briarproject.api.LocalAuthor;
 import org.briarproject.api.TransportId;
 import org.briarproject.api.TransportProperties;
 import org.briarproject.api.crypto.CryptoComponent;
@@ -14,6 +11,9 @@ import org.briarproject.api.data.Writer;
 import org.briarproject.api.data.WriterFactory;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DbException;
+import org.briarproject.api.identity.Author;
+import org.briarproject.api.identity.AuthorFactory;
+import org.briarproject.api.identity.LocalAuthor;
 import org.briarproject.api.plugins.ConnectionManager;
 import org.briarproject.api.plugins.duplex.DuplexPlugin;
 import org.briarproject.api.plugins.duplex.DuplexTransportConnection;

briar-core/src/org/briarproject/invitation/BobConnector.java

@@ -1,8 +1,5 @@
 package org.briarproject.invitation;
 
-import org.briarproject.api.Author;
-import org.briarproject.api.AuthorFactory;
-import org.briarproject.api.LocalAuthor;
 import org.briarproject.api.TransportId;
 import org.briarproject.api.TransportProperties;
 import org.briarproject.api.crypto.CryptoComponent;
@@ -14,6 +11,9 @@ import org.briarproject.api.data.Writer;
 import org.briarproject.api.data.WriterFactory;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DbException;
+import org.briarproject.api.identity.Author;
+import org.briarproject.api.identity.AuthorFactory;
+import org.briarproject.api.identity.LocalAuthor;
 import org.briarproject.api.plugins.ConnectionManager;
 import org.briarproject.api.plugins.duplex.DuplexPlugin;
 import org.briarproject.api.plugins.duplex.DuplexTransportConnection;

briar-core/src/org/briarproject/invitation/Connector.java

@@ -1,12 +1,9 @@
 package org.briarproject.invitation;
 
-import org.briarproject.api.Author;
-import org.briarproject.api.AuthorFactory;
-import org.briarproject.api.ContactId;
 import org.briarproject.api.FormatException;
-import org.briarproject.api.LocalAuthor;
 import org.briarproject.api.TransportId;
 import org.briarproject.api.TransportProperties;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.crypto.CryptoComponent;
 import org.briarproject.api.crypto.KeyPair;
 import org.briarproject.api.crypto.KeyParser;
@@ -20,6 +17,9 @@ import org.briarproject.api.data.Writer;
 import org.briarproject.api.data.WriterFactory;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DbException;
+import org.briarproject.api.identity.Author;
+import org.briarproject.api.identity.AuthorFactory;
+import org.briarproject.api.identity.LocalAuthor;
 import org.briarproject.api.plugins.ConnectionManager;
 import org.briarproject.api.plugins.duplex.DuplexPlugin;
 import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
@@ -43,12 +43,12 @@ import java.util.logging.Logger;
 
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
-import static org.briarproject.api.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
-import static org.briarproject.api.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
-import static org.briarproject.api.AuthorConstants.MAX_SIGNATURE_LENGTH;
 import static org.briarproject.api.TransportPropertyConstants.MAX_PROPERTIES_PER_TRANSPORT;
 import static org.briarproject.api.TransportPropertyConstants.MAX_PROPERTY_LENGTH;
 import static org.briarproject.api.TransportPropertyConstants.MAX_TRANSPORT_ID_LENGTH;
+import static org.briarproject.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
+import static org.briarproject.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
+import static org.briarproject.api.identity.AuthorConstants.MAX_SIGNATURE_LENGTH;
 import static org.briarproject.api.invitation.InvitationConstants.CONNECTION_TIMEOUT;
 import static org.briarproject.api.transport.TransportConstants.MAX_CLOCK_DIFFERENCE;
 

briar-core/src/org/briarproject/invitation/ConnectorGroup.java

@@ -1,9 +1,5 @@
 package org.briarproject.invitation;
 
-import org.briarproject.api.Author;
-import org.briarproject.api.AuthorFactory;
-import org.briarproject.api.AuthorId;
-import org.briarproject.api.LocalAuthor;
 import org.briarproject.api.TransportId;
 import org.briarproject.api.TransportProperties;
 import org.briarproject.api.crypto.CryptoComponent;
@@ -12,6 +8,10 @@ import org.briarproject.api.data.ReaderFactory;
 import org.briarproject.api.data.WriterFactory;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DbException;
+import org.briarproject.api.identity.Author;
+import org.briarproject.api.identity.AuthorFactory;
+import org.briarproject.api.identity.AuthorId;
+import org.briarproject.api.identity.LocalAuthor;
 import org.briarproject.api.invitation.InvitationListener;
 import org.briarproject.api.invitation.InvitationState;
 import org.briarproject.api.invitation.InvitationTask;

briar-core/src/org/briarproject/invitation/InvitationTaskFactoryImpl.java

@@ -1,11 +1,11 @@
 package org.briarproject.invitation;
 
-import org.briarproject.api.AuthorFactory;
-import org.briarproject.api.AuthorId;
 import org.briarproject.api.crypto.CryptoComponent;
 import org.briarproject.api.data.ReaderFactory;
 import org.briarproject.api.data.WriterFactory;
 import org.briarproject.api.db.DatabaseComponent;
+import org.briarproject.api.identity.AuthorFactory;
+import org.briarproject.api.identity.AuthorId;
 import org.briarproject.api.invitation.InvitationTask;
 import org.briarproject.api.invitation.InvitationTaskFactory;
 import org.briarproject.api.plugins.ConnectionManager;

briar-core/src/org/briarproject/plugins/ConnectionManagerImpl.java

@@ -1,7 +1,7 @@
 package org.briarproject.plugins;
 
-import org.briarproject.api.ContactId;
 import org.briarproject.api.TransportId;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.db.DbException;
 import org.briarproject.api.lifecycle.IoExecutor;
 import org.briarproject.api.plugins.ConnectionManager;

briar-core/src/org/briarproject/plugins/ConnectionRegistryImpl.java

@@ -1,6 +1,13 @@
 package org.briarproject.plugins;
 
-import static java.util.logging.Level.INFO;
+import com.google.inject.Inject;
+
+import org.briarproject.api.TransportId;
+import org.briarproject.api.contact.ContactId;
+import org.briarproject.api.event.ContactConnectedEvent;
+import org.briarproject.api.event.ContactDisconnectedEvent;
+import org.briarproject.api.event.EventBus;
+import org.briarproject.api.plugins.ConnectionRegistry;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -12,14 +19,7 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Logger;
 
-import org.briarproject.api.ContactId;
+import static java.util.logging.Level.INFO;
-import org.briarproject.api.TransportId;
-import org.briarproject.api.event.ContactConnectedEvent;
-import org.briarproject.api.event.ContactDisconnectedEvent;
-import org.briarproject.api.event.EventBus;
-import org.briarproject.api.plugins.ConnectionRegistry;
-
-import com.google.inject.Inject;
 
 class ConnectionRegistryImpl implements ConnectionRegistry {
 
@@ -109,7 +109,8 @@ class ConnectionRegistryImpl implements ConnectionRegistry {
 			Map<ContactId, Integer> m = connections.get(t);
 			if (m == null) return Collections.emptyList();
 			List<ContactId> ids = new ArrayList<ContactId>(m.keySet());
-			if (LOG.isLoggable(INFO)) LOG.info(ids.size() + " contacts connected");
+			if (LOG.isLoggable(INFO))
+				LOG.info(ids.size() + " contacts connected");
 			return Collections.unmodifiableList(ids);
 		} finally {
 			lock.unlock();

briar-core/src/org/briarproject/plugins/PluginManagerImpl.java

@@ -1,9 +1,9 @@
 package org.briarproject.plugins;
 
-import org.briarproject.api.ContactId;
 import org.briarproject.api.TransportConfig;
 import org.briarproject.api.TransportId;
 import org.briarproject.api.TransportProperties;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DbException;
 import org.briarproject.api.event.EventBus;

briar-core/src/org/briarproject/plugins/file/FilePlugin.java

@@ -1,6 +1,6 @@
 package org.briarproject.plugins.file;
 
-import org.briarproject.api.ContactId;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.plugins.TransportConnectionReader;
 import org.briarproject.api.plugins.TransportConnectionWriter;
 import org.briarproject.api.plugins.simplex.SimplexPlugin;

briar-core/src/org/briarproject/plugins/tcp/TcpPlugin.java

@@ -1,7 +1,12 @@
 package org.briarproject.plugins.tcp;
 
-import static java.util.logging.Level.INFO;
+import org.briarproject.api.TransportProperties;
-import static java.util.logging.Level.WARNING;
+import org.briarproject.api.contact.ContactId;
+import org.briarproject.api.crypto.PseudoRandom;
+import org.briarproject.api.plugins.duplex.DuplexPlugin;
+import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
+import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
+import org.briarproject.util.StringUtils;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -20,13 +25,8 @@ import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 
-import org.briarproject.api.ContactId;
+import static java.util.logging.Level.INFO;
-import org.briarproject.api.TransportProperties;
+import static java.util.logging.Level.WARNING;
-import org.briarproject.api.crypto.PseudoRandom;
-import org.briarproject.api.plugins.duplex.DuplexPlugin;
-import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
-import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
-import org.briarproject.util.StringUtils;
 
 abstract class TcpPlugin implements DuplexPlugin {
 
@@ -91,7 +91,6 @@ abstract class TcpPlugin implements DuplexPlugin {
 						if (LOG.isLoggable(INFO))
 							LOG.info("Failed to bind " + addr);
 						tryToClose(ss);
-						continue;
 					}
 				}
 				if (ss == null || !ss.isBound()) {

briar-core/src/org/briarproject/sync/AuthorFactoryImpl.java

@@ -1,13 +1,13 @@
 package org.briarproject.sync;
 
-import org.briarproject.api.Author;
-import org.briarproject.api.AuthorFactory;
-import org.briarproject.api.AuthorId;
-import org.briarproject.api.LocalAuthor;
 import org.briarproject.api.crypto.CryptoComponent;
 import org.briarproject.api.crypto.MessageDigest;
 import org.briarproject.api.data.Writer;
 import org.briarproject.api.data.WriterFactory;
+import org.briarproject.api.identity.Author;
+import org.briarproject.api.identity.AuthorFactory;
+import org.briarproject.api.identity.AuthorId;
+import org.briarproject.api.identity.LocalAuthor;
 import org.briarproject.api.system.Clock;
 
 import java.io.ByteArrayOutputStream;

briar-core/src/org/briarproject/sync/AuthorReader.java

@@ -1,17 +1,17 @@
 package org.briarproject.sync;
 
-import org.briarproject.api.Author;
-import org.briarproject.api.AuthorId;
 import org.briarproject.api.FormatException;
 import org.briarproject.api.crypto.CryptoComponent;
 import org.briarproject.api.crypto.MessageDigest;
 import org.briarproject.api.data.ObjectReader;
 import org.briarproject.api.data.Reader;
+import org.briarproject.api.identity.Author;
+import org.briarproject.api.identity.AuthorId;
 
 import java.io.IOException;
 
-import static org.briarproject.api.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
+import static org.briarproject.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
-import static org.briarproject.api.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
+import static org.briarproject.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
 
 class AuthorReader implements ObjectReader<Author> {
 

briar-core/src/org/briarproject/sync/DuplexOutgoingSession.java

@@ -1,7 +1,7 @@
 package org.briarproject.sync;
 
-import org.briarproject.api.ContactId;
 import org.briarproject.api.TransportId;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DbException;
 import org.briarproject.api.event.ContactRemovedEvent;

briar-core/src/org/briarproject/sync/IncomingSession.java

@@ -1,8 +1,8 @@
 package org.briarproject.sync;
 
-import org.briarproject.api.ContactId;
 import org.briarproject.api.FormatException;
 import org.briarproject.api.TransportId;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DbException;
 import org.briarproject.api.event.ContactRemovedEvent;

briar-core/src/org/briarproject/sync/MessageFactoryImpl.java

@@ -1,6 +1,5 @@
 package org.briarproject.sync;
 
-import org.briarproject.api.Author;
 import org.briarproject.api.crypto.CryptoComponent;
 import org.briarproject.api.crypto.MessageDigest;
 import org.briarproject.api.crypto.PrivateKey;
@@ -8,6 +7,7 @@ import org.briarproject.api.crypto.Signature;
 import org.briarproject.api.data.Consumer;
 import org.briarproject.api.data.Writer;
 import org.briarproject.api.data.WriterFactory;
+import org.briarproject.api.identity.Author;
 import org.briarproject.api.sync.Group;
 import org.briarproject.api.sync.Message;
 import org.briarproject.api.sync.MessageFactory;
@@ -21,7 +21,7 @@ import java.security.SecureRandom;
 
 import javax.inject.Inject;
 
-import static org.briarproject.api.AuthorConstants.MAX_SIGNATURE_LENGTH;
+import static org.briarproject.api.identity.AuthorConstants.MAX_SIGNATURE_LENGTH;
 import static org.briarproject.api.sync.MessagingConstants.MAX_BODY_LENGTH;
 import static org.briarproject.api.sync.MessagingConstants.MAX_CONTENT_TYPE_LENGTH;
 import static org.briarproject.api.sync.MessagingConstants.MAX_PAYLOAD_LENGTH;
@@ -78,7 +78,7 @@ class MessageFactoryImpl implements MessageFactory {
 		Consumer signingConsumer = null;
 		if (privateKey != null) {
 			signature.initSign(privateKey);
-			signingConsumer = new org.briarproject.sync.SigningConsumer(signature);
+			signingConsumer = new SigningConsumer(signature);
 			w.addConsumer(signingConsumer);
 		}
 		// Write the message
@@ -109,7 +109,7 @@ class MessageFactoryImpl implements MessageFactory {
 		// Hash the message, including the signature, to get the message ID
 		w.removeConsumer(digestingConsumer);
 		MessageId id = new MessageId(messageDigest.digest());
-		return new org.briarproject.sync.MessageImpl(id, parent, group, author, contentType,
+		return new MessageImpl(id, parent, group, author, contentType,
 				timestamp, out.toByteArray(), bodyStart, body.length);
 	}
 

briar-core/src/org/briarproject/sync/MessageImpl.java

@@ -1,6 +1,6 @@
 package org.briarproject.sync;
 
-import org.briarproject.api.Author;
+import org.briarproject.api.identity.Author;
 import org.briarproject.api.sync.Group;
 import org.briarproject.api.sync.Message;
 import org.briarproject.api.sync.MessageId;

briar-core/src/org/briarproject/sync/MessageReader.java

@@ -1,17 +1,17 @@
 package org.briarproject.sync;
 
-import org.briarproject.api.Author;
 import org.briarproject.api.FormatException;
 import org.briarproject.api.UniqueId;
 import org.briarproject.api.data.ObjectReader;
 import org.briarproject.api.data.Reader;
+import org.briarproject.api.identity.Author;
 import org.briarproject.api.sync.Group;
 import org.briarproject.api.sync.MessageId;
 import org.briarproject.api.sync.UnverifiedMessage;
 
 import java.io.IOException;
 
-import static org.briarproject.api.AuthorConstants.MAX_SIGNATURE_LENGTH;
+import static org.briarproject.api.identity.AuthorConstants.MAX_SIGNATURE_LENGTH;
 import static org.briarproject.api.sync.MessagingConstants.MAX_BODY_LENGTH;
 import static org.briarproject.api.sync.MessagingConstants.MAX_CONTENT_TYPE_LENGTH;
 import static org.briarproject.api.sync.MessagingConstants.MAX_PAYLOAD_LENGTH;

briar-core/src/org/briarproject/sync/MessageVerifierImpl.java

@@ -1,11 +1,11 @@
 package org.briarproject.sync;
 
-import org.briarproject.api.Author;
 import org.briarproject.api.crypto.CryptoComponent;
 import org.briarproject.api.crypto.KeyParser;
 import org.briarproject.api.crypto.MessageDigest;
 import org.briarproject.api.crypto.PublicKey;
 import org.briarproject.api.crypto.Signature;
+import org.briarproject.api.identity.Author;
 import org.briarproject.api.sync.Message;
 import org.briarproject.api.sync.MessageId;
 import org.briarproject.api.sync.MessageVerifier;

briar-core/src/org/briarproject/sync/MessagingModule.java

@@ -3,10 +3,10 @@ package org.briarproject.sync;
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
 
-import org.briarproject.api.Author;
-import org.briarproject.api.AuthorFactory;
 import org.briarproject.api.crypto.CryptoComponent;
 import org.briarproject.api.data.ObjectReader;
+import org.briarproject.api.identity.Author;
+import org.briarproject.api.identity.AuthorFactory;
 import org.briarproject.api.sync.Group;
 import org.briarproject.api.sync.GroupFactory;
 import org.briarproject.api.sync.MessageFactory;
@@ -47,7 +47,7 @@ public class MessagingModule extends AbstractModule {
 	ObjectReader<UnverifiedMessage> getMessageReader(
 			ObjectReader<Group> groupReader,
 			ObjectReader<Author> authorReader) {
-		return new org.briarproject.sync.MessageReader(groupReader, authorReader);
+		return new MessageReader(groupReader, authorReader);
 	}
 
 	@Provides

briar-core/src/org/briarproject/sync/MessagingSessionFactoryImpl.java

@@ -1,7 +1,7 @@
 package org.briarproject.sync;
 
-import org.briarproject.api.ContactId;
 import org.briarproject.api.TransportId;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.crypto.CryptoExecutor;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DatabaseExecutor;

briar-core/src/org/briarproject/sync/SimplexOutgoingSession.java

@@ -1,7 +1,7 @@
 package org.briarproject.sync;
 
-import org.briarproject.api.ContactId;
 import org.briarproject.api.TransportId;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DbException;
 import org.briarproject.api.event.ContactRemovedEvent;

briar-core/src/org/briarproject/transport/KeyManagerImpl.java

@@ -1,7 +1,7 @@
 package org.briarproject.transport;
 
-import org.briarproject.api.ContactId;
 import org.briarproject.api.TransportId;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.crypto.CryptoComponent;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DatabaseExecutor;

briar-core/src/org/briarproject/transport/TransportKeyManager.java

@@ -1,8 +1,8 @@
 package org.briarproject.transport;
 
 import org.briarproject.api.Bytes;
-import org.briarproject.api.ContactId;
 import org.briarproject.api.TransportId;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.crypto.CryptoComponent;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DbException;

briar-desktop/src/org/briarproject/plugins/bluetooth/BluetoothPlugin.java

@@ -1,8 +1,16 @@
 package org.briarproject.plugins.bluetooth;
 
-import static java.util.logging.Level.INFO;
+import org.briarproject.api.TransportId;
-import static java.util.logging.Level.WARNING;
+import org.briarproject.api.TransportProperties;
-import static javax.bluetooth.DiscoveryAgent.GIAC;
+import org.briarproject.api.contact.ContactId;
+import org.briarproject.api.crypto.PseudoRandom;
+import org.briarproject.api.plugins.duplex.DuplexPlugin;
+import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
+import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
+import org.briarproject.api.system.Clock;
+import org.briarproject.util.LatchedReference;
+import org.briarproject.util.OsUtils;
+import org.briarproject.util.StringUtils;
 
 import java.io.IOException;
 import java.security.SecureRandom;
@@ -21,17 +29,9 @@ import javax.microedition.io.Connector;
 import javax.microedition.io.StreamConnection;
 import javax.microedition.io.StreamConnectionNotifier;
 
-import org.briarproject.api.ContactId;
+import static java.util.logging.Level.INFO;
-import org.briarproject.api.TransportId;
+import static java.util.logging.Level.WARNING;
-import org.briarproject.api.TransportProperties;
+import static javax.bluetooth.DiscoveryAgent.GIAC;
-import org.briarproject.api.crypto.PseudoRandom;
-import org.briarproject.api.plugins.duplex.DuplexPlugin;
-import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
-import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
-import org.briarproject.api.system.Clock;
-import org.briarproject.util.LatchedReference;
-import org.briarproject.util.OsUtils;
-import org.briarproject.util.StringUtils;
 
 class BluetoothPlugin implements DuplexPlugin {
 

briar-desktop/src/org/briarproject/plugins/file/RemovableDrivePlugin.java

@@ -1,7 +1,7 @@
 package org.briarproject.plugins.file;
 
-import org.briarproject.api.ContactId;
 import org.briarproject.api.TransportId;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.plugins.simplex.SimplexPluginCallback;
 
 import java.io.File;

briar-desktop/src/org/briarproject/plugins/modem/ModemPlugin.java

@@ -1,7 +1,15 @@
 package org.briarproject.plugins.modem;
 
-import static java.util.logging.Level.INFO;
+import org.briarproject.api.TransportId;
-import static java.util.logging.Level.WARNING;
+import org.briarproject.api.TransportProperties;
+import org.briarproject.api.contact.ContactId;
+import org.briarproject.api.crypto.PseudoRandom;
+import org.briarproject.api.plugins.TransportConnectionReader;
+import org.briarproject.api.plugins.TransportConnectionWriter;
+import org.briarproject.api.plugins.duplex.DuplexPlugin;
+import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
+import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
+import org.briarproject.util.StringUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -11,16 +19,8 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
 
-import org.briarproject.api.ContactId;
+import static java.util.logging.Level.INFO;
-import org.briarproject.api.TransportId;
+import static java.util.logging.Level.WARNING;
-import org.briarproject.api.TransportProperties;
-import org.briarproject.api.crypto.PseudoRandom;
-import org.briarproject.api.plugins.TransportConnectionReader;
-import org.briarproject.api.plugins.TransportConnectionWriter;
-import org.briarproject.api.plugins.duplex.DuplexPlugin;
-import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
-import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
-import org.briarproject.util.StringUtils;
 
 class ModemPlugin implements DuplexPlugin, Modem.Callback {
 
@@ -195,7 +195,7 @@ class ModemPlugin implements DuplexPlugin, Modem.Callback {
 		private class Reader implements TransportConnectionReader {
 
 			public long getMaxLatency() {
-				return maxLatency;
+				return ModemPlugin.this.getMaxLatency();
 			}
 
 			public InputStream getInputStream() throws IOException {
@@ -211,11 +211,11 @@ class ModemPlugin implements DuplexPlugin, Modem.Callback {
 		private class Writer implements TransportConnectionWriter {
 
 			public int getMaxLatency() {
-				return getMaxLatency();
+				return ModemPlugin.this.getMaxLatency();
 			}
 
 			public int getMaxIdleTime() {
-				return getMaxIdleTime();
+				return ModemPlugin.this.getMaxIdleTime();
 			}
 
 			public long getCapacity() {

briar-tests/src/org/briarproject/ProtocolIntegrationTest.java

@@ -3,14 +3,14 @@ package org.briarproject;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 
-import org.briarproject.api.Author;
-import org.briarproject.api.AuthorFactory;
-import org.briarproject.api.ContactId;
 import org.briarproject.api.TransportId;
 import org.briarproject.api.TransportProperties;
+import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.crypto.CryptoComponent;
 import org.briarproject.api.crypto.KeyPair;
 import org.briarproject.api.crypto.SecretKey;
+import org.briarproject.api.identity.Author;
+import org.briarproject.api.identity.AuthorFactory;
 import org.briarproject.api.sync.Ack;
 import org.briarproject.api.sync.Group;
 import org.briarproject.api.sync.GroupFactory;