74 files changed, 297 insertions, 199 deletions

diff --git a/.gitignore b/.gitignore
index 31d3d876..353b1eb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,4 @@
 **/*.rs.bk
 *~
 Cargo.lock
-core
 .gdb_history
diff --git a/Cargo.toml b/Cargo.toml
index 43343ed6..87304717 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,25 +3,19 @@ name = "sequoia"
 version = "0.1.0"
 authors = ["Neal H. Walfield <neal@gnu.org>"]
 
+[workspace]
+
 [dependencies]
-base64 = "0.8.0"
-bzip2 = "0.3.2"
-flate2 = "0.2"
-futures = "0.1"
-hyper = "0.11"
-hyper-tls = "0.1.2"
-libc = "0.2.33"
-native-tls = "0.1.4"
-nom = "3.2.0"
-num = "0.1.40"
-num-derive = "0.1.41"
-percent-encoding = "1.0.1"
-tokio-core = "0.1"
+buffered-reader = { path = "buffered-reader" }
+openpgp = { path = "openpgp" }
+sequoia-core = { path = "core" }
+sequoia-ffi = { path = "ffi" }
+sequoia-net = { path = "net" }
+sequoia-store = { path = "store" }
 
 [lib]
 name = "sequoia"
 path = "src/lib.rs"
-crate-type = ["lib", "dylib"]
 
 [[bin]]
 doc = false
diff --git a/buffered-reader/Cargo.toml b/buffered-reader/Cargo.toml
new file mode 100644
index 00000000..c7677bab
--- /dev/null
+++ b/buffered-reader/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "buffered-reader"
+version = "0.1.0"
+authors = ["Neal H. Walfield <neal@gnu.org>"]
+
+[dependencies]
+bzip2 = "0.3.2"
+flate2 = "0.2"
diff --git a/src/buffered_reader/buffered-reader-test.txt b/buffered-reader/src/buffered-reader-test.txt
index 77dbaaa8..77dbaaa8 100644
--- a/src/buffered_reader/buffered-reader-test.txt
+++ b/buffered-reader/src/buffered-reader-test.txt
diff --git a/src/buffered_reader/decompress.rs b/buffered-reader/src/decompress.rs
index 648037fc..648037fc 100644
--- a/src/buffered_reader/decompress.rs
+++ b/buffered-reader/src/decompress.rs
diff --git a/src/buffered_reader/generic.rs b/buffered-reader/src/generic.rs
index 7049a2fe..92ed6151 100644
--- a/src/buffered_reader/generic.rs
+++ b/buffered-reader/src/generic.rs
@@ -232,7 +232,7 @@ fn buffered_reader_generic_test() {
         use std::fs::File;
 
         let path : PathBuf = [env!("CARGO_MANIFEST_DIR"),
-                              "src", "buffered_reader", "buffered-reader-test.txt"]
+                              "src", "buffered-reader-test.txt"]
             .iter().collect();
         let mut f = File::open(&path).expect(&path.to_string_lossy());
         let mut bio = BufferedReaderGeneric::new(&mut f, None);
diff --git a/src/buffered_reader/buffered_reader.rs b/buffered-reader/src/lib.rs
index ebcb4dc9..951b8c71 100644
--- a/src/buffered_reader/buffered_reader.rs
+++ b/buffered-reader/src/lib.rs
@@ -1,4 +1,8 @@
-use std;
+//! An improved `BufRead` interface.
+
+extern crate flate2;
+extern crate bzip2;
+
 use std::str;
 use std::io;
 use std::io::{Error,ErrorKind};
@@ -8,13 +12,11 @@ use std::fmt;
 mod generic;
 mod memory;
 mod limitor;
-mod partial_body;
 mod decompress;
 
 pub use self::generic::BufferedReaderGeneric;
 pub use self::memory::BufferedReaderMemory;
 pub use self::limitor::BufferedReaderLimitor;
-pub use self::partial_body::BufferedReaderPartialBodyFilter;
 pub use self::decompress::BufferedReaderDeflate;
 pub use self::decompress::BufferedReaderZlib;
 pub use self::decompress::BufferedReaderBzip;
@@ -177,7 +179,7 @@ pub trait BufferedReader : io::Read + fmt::Debug {
 ///
 /// but, alas, Rust doesn't like that ("error[E0119]: conflicting
 /// implementations of trait `std::io::Read` for type `&mut _`").
-fn buffered_reader_generic_read_impl<T: BufferedReader>
+pub fn buffered_reader_generic_read_impl<T: BufferedReader>
     (bio: &mut T, buf: &mut [u8]) -> Result<usize, io::Error> {
     match bio.data_consume(buf.len()) {
         Ok(inner) => {
@@ -358,7 +360,7 @@ mod test {
             use std::fs::File;
 
             let path : PathBuf = [env!("CARGO_MANIFEST_DIR"),
-                                  "src", "buffered_reader",
+                                  "src",
                                   "buffered-reader-test.txt"]
                 .iter().collect();
 
diff --git a/src/buffered_reader/limitor.rs b/buffered-reader/src/limitor.rs
index 052ceb0d..052ceb0d 100644
--- a/src/buffered_reader/limitor.rs
+++ b/buffered-reader/src/limitor.rs
diff --git a/src/buffered_reader/memory.rs b/buffered-reader/src/memory.rs
index 327e4bcb..327e4bcb 100644
--- a/src/buffered_reader/memory.rs
+++ b/buffered-reader/src/memory.rs
diff --git a/src/buffered_reader/mod.rs b/buffered-reader/src/mod.rs
index 856a295b..856a295b 100644
--- a/src/buffered_reader/mod.rs
+++ b/buffered-reader/src/mod.rs
diff --git a/core/Cargo.toml b/core/Cargo.toml
new file mode 100644
index 00000000..034cc2fd
--- /dev/null
+++ b/core/Cargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "sequoia-core"
+version = "0.1.0"
+authors = ["Justus Winter <justus@pep-project.org>"]
+
+[dependencies]
diff --git a/core/src/lib.rs b/core/src/lib.rs
new file mode 100644
index 00000000..efddaa0b
--- /dev/null
+++ b/core/src/lib.rs
@@ -0,0 +1,103 @@
+//! Core functionality.
+
+use std::env;
+use std::fs;
+use std::io;
+use std::path::{Path, PathBuf};
+
+/// A `&Context` is required for many operations.
+///
+/// # Example
+///
+/// ```
+/// # use sequoia_core::Context;
+/// let c = Context::new("org.example.webmail").unwrap();
+/// ```
+pub struct Context {
+    domain: String,
+    home: PathBuf,
+    lib: PathBuf,
+}
+
+fn prefix() -> PathBuf {
+    /* XXX: Windows support.  */
+    PathBuf::from(option_env!("PREFIX").or(Some("/usr/local")).unwrap())
+}
+
+impl Context {
+    /// Creates a Context with reasonable defaults.
+    ///
+    /// `domain` should uniquely identify your application, it is
+    /// strongly suggested to use a reversed fully qualified domain
+    /// name that is associated with your application.
+    pub fn new(domain: &str) -> io::Result<Self> {
+        Self::configure(domain).build()
+    }
+
+    /// Creates a Context that can be configured.
+    ///
+    /// `domain` should uniquely identify your application, it is
+    /// strongly suggested to use a reversed fully qualified domain
+    /// name that is associated with your application.
+    ///
+    /// The configuration is seeded like in `Context::new`, but can be
+    /// modified.  A configuration has to be finalized using
+    /// `.build()` in order to turn it into a Context.
+    pub fn configure(domain: &str) -> Config {
+        Config(Context {
+            domain: String::from(domain),
+            home: env::home_dir().unwrap_or(env::temp_dir())
+                .join(".sequoia"),