Moved some API classes into packages.

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

@@ -0,0 +1,40 @@
+package org.briarproject.api.contact;
+
+import org.briarproject.api.identity.Author;
+import org.briarproject.api.identity.AuthorId;
+
+public class Contact {
+
+	private final ContactId id;
+	private final Author author;
+	private final AuthorId localAuthorId;
+
+	public Contact(ContactId id, Author author, AuthorId localAuthorId) {
+		this.id = id;
+		this.author = author;
+		this.localAuthorId = localAuthorId;
+	}
+
+	public ContactId getId() {
+		return id;
+	}
+
+	public Author getAuthor() {
+		return author;
+	}
+
+	public AuthorId getLocalAuthorId() {
+		return localAuthorId;
+	}
+
+	@Override
+	public int hashCode() {
+		return id.hashCode();
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (o instanceof Contact) return id.equals(((Contact) o).id);
+		return false;
+	}
+}

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

@@ -0,0 +1,29 @@
+package org.briarproject.api.contact;
+
+/**
+ * Type-safe wrapper for an integer that uniquely identifies a contact within
+ * the scope of a single node.
+ */
+public class ContactId {
+
+	private final int id;
+
+	public ContactId(int id) {
+		this.id = id;
+	}
+
+	public int getInt() {
+		return id;
+	}
+
+	@Override
+	public int hashCode() {
+		return id;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (o instanceof ContactId) return id == ((ContactId) o).id;
+		return false;
+	}
+}

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;