diff --git a/.appveyor.yml b/.appveyor.yml
new file mode 100644
index 000000000..c54fc1d39
--- /dev/null
+++ b/.appveyor.yml
@@ -0,0 +1,16 @@
+environment:
+  matrix:
+  - TARGET: x86_64-pc-windows-msvc
+install:
+  - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
+  - rustup-init.exe -y --default-host x86_64-pc-windows-msvc
+  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
+  - if NOT "%TARGET%" == "x86_64-pc-windows-msvc" rustup target add %TARGET%
+
+  - rustc -V
+  - cargo -V
+
+build: false
+
+test_script:
+  - cargo test --target %TARGET%
diff --git a/.travis.yml b/.travis.yml
index 05b8cbea9..3efeda746 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,22 +1,23 @@
----
 language: rust
 sudo: false
 
-rust:
-  - stable
-  - beta
-  - nightly
+matrix:
+  include:
+    - rust: stable
+    - os: osx
+    - rust: beta
+    - rust: nightly
 
-before_script:
-  - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
+    - rust: nightly
+      before_script:
+        - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
+      script:
+        - cargo doc --no-deps --all-features
+      after_success:
+        - travis-cargo doc-upload
 
 script:
-  - cargo build
   - cargo test
-  - cargo doc --no-deps
-
-after_success:
-  - travis-cargo --only nightly doc-upload --branch new-crate
 
 env:
   global:
@@ -25,6 +26,3 @@ env:
 notifications:
   email:
     on_success: never
-
-os:
-  - linux
diff --git a/README.md b/README.md
index d3edbc855..be19ecc6c 100644
--- a/README.md
+++ b/README.md
@@ -1,34 +1,20 @@
-# tokio-core
+# tokio
 
-Core I/O and event loop abstraction for asynchronous I/O in Rust built on
-`futures` and `mio`.
+A work-in-progress rearchitecting of the [tokio-core] crate in line with
+[tokio-rs/tokio-rfcs#3][rfc]
 
-[![Build Status](https://travis-ci.org/tokio-rs/tokio-core.svg?branch=master)](https://travis-ci.org/tokio-rs/tokio-core)
-[![Build status](https://ci.appveyor.com/api/projects/status/caxmxbg8181kk9mq/branch/master?svg=true)](https://ci.appveyor.com/project/carllerche/tokio-core)
+[tokio-core]: https://github.com/tokio-rs/tokio-core
+[rfc]: https://github.com/tokio-rs/tokio-rfcs/pull/3
 
-[Documentation](https://docs.rs/tokio-core)
+[![Build Status](https://travis-ci.org/tokio-rs/tokio.svg?branch=new-crate)](https://travis-ci.org/tokio-rs/tokio)
+[![Build status](https://ci.appveyor.com/api/projects/status/uxiinkgipvy6ehrj/branch/new-crate?svg=true)](https://ci.appveyor.com/project/alexcrichton/tokio/branch/new-crate)
 
-[Tutorial](https://tokio.rs/)
+[Documentation](https://tokio-rs.github.io/tokio)
 
 ## Usage
 
-First, add this to your `Cargo.toml`:
-
-```toml
-[dependencies]
-tokio-core = "0.1"
-```
-
-Next, add this to your crate:
-
-```rust
-extern crate tokio;
-```
-
-You can find extensive documentation and examples about how to use this crate
-online at [https://tokio.rs](https://tokio.rs) as well as the `examples` folder
-in this repository. The [API documentation](https://docs.rs/tokio-core) is also
-a great place to get started for the nitty-gritty.
+This project is a **work in progress**, more information will be added here as
+it progresses.
 
 # License
 
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index 75c11da0d..000000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-environment:
-  matrix:
-  - TARGET: x86_64-pc-windows-msvc
-install:
-  - curl -sSf -o rustup-init.exe https://win.rustup.rs/
-  - rustup-init.exe -y --default-host %TARGET%
-  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
-  - rustc -V
-  - cargo -V
-
-build: false
-
-test_script:
-  - cargo build
-  - cargo test