diff --git a/.gitignore b/.gitignore
index 1377554e..8b75e7bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
+/target
+Cargo.lock
+
 *.swp
diff --git a/.travis.yml b/.travis.yml
index 24fa6c73..28ec6fc8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,6 @@ rust:
 before_script:
   - rustup component add rustfmt
 script:
-  - cd $TRAVIS_BUILD_DIR/core/lib/
   - cargo fmt -- --check --verbose
   - cargo build --verbose --all
   - cargo test --verbose --all
@@ -14,6 +13,6 @@ script:
 notifications:
   email: false
 
-# before_cache:
-#  - rm -rf "$TRAVIS_HOME/.cargo/registry/src"
-#cache: cargo
+before_cache:
+  - rm -rf "$TRAVIS_HOME/.cargo/registry/src"
+cache: cargo
diff --git a/core/lib/Cargo.toml b/Cargo.toml
similarity index 100%
rename from core/lib/Cargo.toml
rename to Cargo.toml
diff --git a/core/lib/.gitignore b/core/lib/.gitignore
deleted file mode 100644
index 96ef6c0b..00000000
--- a/core/lib/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target
-Cargo.lock
diff --git a/core/lib/examples/parse_descriptor.rs b/examples/parse_descriptor.rs
similarity index 100%
rename from core/lib/examples/parse_descriptor.rs
rename to examples/parse_descriptor.rs
diff --git a/core/lib/examples/psbt.rs b/examples/psbt.rs
similarity index 100%
rename from core/lib/examples/psbt.rs
rename to examples/psbt.rs
diff --git a/core/lib/src/database/keyvalue.rs b/src/database/keyvalue.rs
similarity index 100%
rename from core/lib/src/database/keyvalue.rs
rename to src/database/keyvalue.rs
diff --git a/core/lib/src/database/mod.rs b/src/database/mod.rs
similarity index 100%
rename from core/lib/src/database/mod.rs
rename to src/database/mod.rs
diff --git a/core/lib/src/descriptor/error.rs b/src/descriptor/error.rs
similarity index 100%
rename from core/lib/src/descriptor/error.rs
rename to src/descriptor/error.rs
diff --git a/core/lib/src/descriptor/extended_key.rs b/src/descriptor/extended_key.rs
similarity index 100%
rename from core/lib/src/descriptor/extended_key.rs
rename to src/descriptor/extended_key.rs
diff --git a/core/lib/src/descriptor/mod.rs b/src/descriptor/mod.rs
similarity index 100%
rename from core/lib/src/descriptor/mod.rs
rename to src/descriptor/mod.rs
diff --git a/core/lib/src/error.rs b/src/error.rs
similarity index 100%
rename from core/lib/src/error.rs
rename to src/error.rs
diff --git a/core/lib/src/lib.rs b/src/lib.rs
similarity index 100%
rename from core/lib/src/lib.rs
rename to src/lib.rs
diff --git a/core/lib/src/psbt.rs b/src/psbt.rs
similarity index 100%
rename from core/lib/src/psbt.rs
rename to src/psbt.rs
diff --git a/core/lib/src/signer.rs b/src/signer.rs
similarity index 100%
rename from core/lib/src/signer.rs
rename to src/signer.rs
diff --git a/core/lib/src/types.rs b/src/types.rs
similarity index 100%
rename from core/lib/src/types.rs
rename to src/types.rs