diff --git a/.travis.yml b/.travis.yml
index 2486ff1..5738de3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,13 +8,13 @@ before_install:
   - curl -O http://static.rust-lang.org/dist/rust-nightly-x86_64-unknown-linux-gnu.tar.gz
   - curl -O http://static.rust-lang.org/cargo-dist/cargo-nightly-linux.tar.gz
   - tar xfz rust-nightly-x86_64-unknown-linux-gnu.tar.gz
-  - (cd rust-nightly-x86_64-unknown-linux-gnu/ && sudo ./install.sh --prefix=/usr)
   - tar xfz cargo-nightly-linux.tar.gz
-  - sudo cp -R cargo-nightly/* /usr
+  - (cd rust-nightly-x86_64-unknown-linux-gnu/ && sudo ./install.sh)
+  - (cd cargo-nightly/ && sudo ./install.sh)
 script:
   - cargo build
   - cargo test
-  - rustdoc src/chrono/lib.rs
+  - rustdoc src/lib.rs
 branches:
   only:
     - master
diff --git a/Cargo.toml b/Cargo.toml
index e90c25d..2c5a814 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,4 +7,3 @@ authors = ["Kang Seonghoon <public+rust@mearie.org>"]
 [[lib]]
 
 name = "chrono"
-path = "src/chrono/lib.rs"
diff --git a/src/chrono/date.rs b/src/date.rs
similarity index 100%
rename from src/chrono/date.rs
rename to src/date.rs
diff --git a/src/chrono/datetime.rs b/src/datetime.rs
similarity index 100%
rename from src/chrono/datetime.rs
rename to src/datetime.rs
diff --git a/src/chrono/duration.rs b/src/duration.rs
similarity index 100%
rename from src/chrono/duration.rs
rename to src/duration.rs
diff --git a/src/chrono/lib.rs b/src/lib.rs
similarity index 100%
rename from src/chrono/lib.rs
rename to src/lib.rs
diff --git a/src/chrono/time.rs b/src/time.rs
similarity index 100%
rename from src/chrono/time.rs
rename to src/time.rs