diff --git a/Cargo.toml b/Cargo.toml
index a194e582..068ff520 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,6 +23,16 @@ no-optimized-legacy-encoding = [
 	"encoding-index-tradchinese/no-optimized-legacy-encoding",
 ]
 
+[workspace]
+members = [
+    "encoding-index-singlebyte",
+    "encoding-index-korean",
+    "encoding-index-japanese",
+    "encoding-index-simpchinese",
+    "encoding-index-tradchinese",
+    "encoding_index_tests",
+]
+
 [dependencies.encoding-types]
 version = "0.2"
 path = "src/types"
@@ -37,23 +47,23 @@ path = "src/types"
 
 [dependencies.encoding-index-singlebyte]
 version = "~1.20160120.0"
-path = "src/index/singlebyte"
+path = "encoding-index-singlebyte"
 
 [dependencies.encoding-index-korean]
 version = "~1.20141219.6"
-path = "src/index/korean"
+path = "encoding-index-korean"
 
 [dependencies.encoding-index-japanese]
 version = "~1.20141219.6"
-path = "src/index/japanese"
+path = "encoding-index-japanese"
 
 [dependencies.encoding-index-simpchinese]
 version = "~1.20160120.0"
-path = "src/index/simpchinese"
+path = "encoding-index-simpchinese"
 
 [dependencies.encoding-index-tradchinese]
 version = "~1.20141219.6"
-path = "src/index/tradchinese"
+path = "encoding-index-tradchinese"
 
 [dev-dependencies]
 getopts = "*" # for examples
diff --git a/src/index/japanese/Cargo.toml b/encoding-index-japanese/Cargo.toml
similarity index 80%
rename from src/index/japanese/Cargo.toml
rename to encoding-index-japanese/Cargo.toml
index ee4d3db5..20a440cd 100644
--- a/src/index/japanese/Cargo.toml
+++ b/encoding-index-japanese/Cargo.toml
@@ -15,10 +15,9 @@ path = "lib.rs"
 [features]
 no-optimized-legacy-encoding = []
 
-[dependencies.encoding_index_tests]
-# TODO consider using dev-dependencies instead (Cargo issue #860)
+[dev-dependencies.encoding_index_tests]
 version = "0.1.5"
-path = "../tests"
+path = "../encoding_index_tests"
 
 [profile.test]
 # `test_correct_table` tests tend to be especially slow
diff --git a/src/index/japanese/jis0208.rs b/encoding-index-japanese/jis0208.rs
similarity index 100%
rename from src/index/japanese/jis0208.rs
rename to encoding-index-japanese/jis0208.rs
diff --git a/src/index/japanese/jis0212.rs b/encoding-index-japanese/jis0212.rs
similarity index 100%
rename from src/index/japanese/jis0212.rs
rename to encoding-index-japanese/jis0212.rs
diff --git a/src/index/japanese/lib.rs b/encoding-index-japanese/lib.rs
similarity index 100%
rename from src/index/japanese/lib.rs
rename to encoding-index-japanese/lib.rs
diff --git a/src/index/korean/Cargo.toml b/encoding-index-korean/Cargo.toml
similarity index 77%
rename from src/index/korean/Cargo.toml
rename to encoding-index-korean/Cargo.toml
index ac6fc21f..900c308c 100644
--- a/src/index/korean/Cargo.toml
+++ b/encoding-index-korean/Cargo.toml
@@ -15,7 +15,6 @@ path = "lib.rs"
 [features]
 no-optimized-legacy-encoding = []
 
-[dependencies.encoding_index_tests]
-# TODO consider using dev-dependencies instead (Cargo issue #860)
+[dev-dependencies.encoding_index_tests]
 version = "0.1.5"
-path = "../tests"
+path = "../encoding_index_tests"
diff --git a/src/index/korean/euc_kr.rs b/encoding-index-korean/euc_kr.rs
similarity index 100%
rename from src/index/korean/euc_kr.rs
rename to encoding-index-korean/euc_kr.rs
diff --git a/src/index/korean/lib.rs b/encoding-index-korean/lib.rs
similarity index 100%
rename from src/index/korean/lib.rs
rename to encoding-index-korean/lib.rs
diff --git a/src/index/simpchinese/Cargo.toml b/encoding-index-simpchinese/Cargo.toml
similarity index 78%
rename from src/index/simpchinese/Cargo.toml
rename to encoding-index-simpchinese/Cargo.toml
index afbbedeb..f8bac6da 100644
--- a/src/index/simpchinese/Cargo.toml
+++ b/encoding-index-simpchinese/Cargo.toml
@@ -15,7 +15,6 @@ path = "lib.rs"
 [features]
 no-optimized-legacy-encoding = []
 
-[dependencies.encoding_index_tests]
-# TODO consider using dev-dependencies instead (Cargo issue #860)
+[dev-dependencies.encoding_index_tests]
 version = "0.1.5"
-path = "../tests"
+path = "../encoding_index_tests"
diff --git a/src/index/simpchinese/gb18030.rs b/encoding-index-simpchinese/gb18030.rs
similarity index 100%
rename from src/index/simpchinese/gb18030.rs
rename to encoding-index-simpchinese/gb18030.rs
diff --git a/src/index/simpchinese/gb18030_ranges.rs b/encoding-index-simpchinese/gb18030_ranges.rs
similarity index 100%
rename from src/index/simpchinese/gb18030_ranges.rs
rename to encoding-index-simpchinese/gb18030_ranges.rs
diff --git a/src/index/simpchinese/lib.rs b/encoding-index-simpchinese/lib.rs
similarity index 100%
rename from src/index/simpchinese/lib.rs
rename to encoding-index-simpchinese/lib.rs
diff --git a/src/index/singlebyte/Cargo.toml b/encoding-index-singlebyte/Cargo.toml
similarity index 78%
rename from src/index/singlebyte/Cargo.toml
rename to encoding-index-singlebyte/Cargo.toml
index 48ef6314..06561e1c 100644
--- a/src/index/singlebyte/Cargo.toml
+++ b/encoding-index-singlebyte/Cargo.toml
@@ -15,7 +15,6 @@ path = "lib.rs"
 [features]
 no-optimized-legacy-encoding = []
 
-[dependencies.encoding_index_tests]
-# TODO consider using dev-dependencies instead (Cargo issue #860)
+[dev-dependencies.encoding_index_tests]
 version = "0.1.5"
-path = "../tests"
+path = "../encoding_index_tests"
diff --git a/src/index/singlebyte/armscii_8.rs b/encoding-index-singlebyte/armscii_8.rs
similarity index 100%
rename from src/index/singlebyte/armscii_8.rs
rename to encoding-index-singlebyte/armscii_8.rs
diff --git a/src/index/singlebyte/ibm866.rs b/encoding-index-singlebyte/ibm866.rs
similarity index 100%
rename from src/index/singlebyte/ibm866.rs
rename to encoding-index-singlebyte/ibm866.rs
diff --git a/src/index/singlebyte/index-armscii-8.txt b/encoding-index-singlebyte/index-armscii-8.txt
similarity index 100%
rename from src/index/singlebyte/index-armscii-8.txt
rename to encoding-index-singlebyte/index-armscii-8.txt
diff --git a/src/index/singlebyte/iso_8859_10.rs b/encoding-index-singlebyte/iso_8859_10.rs
similarity index 100%
rename from src/index/singlebyte/iso_8859_10.rs
rename to encoding-index-singlebyte/iso_8859_10.rs
diff --git a/src/index/singlebyte/iso_8859_13.rs b/encoding-index-singlebyte/iso_8859_13.rs
similarity index 100%
rename from src/index/singlebyte/iso_8859_13.rs
rename to encoding-index-singlebyte/iso_8859_13.rs
diff --git a/src/index/singlebyte/iso_8859_14.rs b/encoding-index-singlebyte/iso_8859_14.rs
similarity index 100%
rename from src/index/singlebyte/iso_8859_14.rs
rename to encoding-index-singlebyte/iso_8859_14.rs
diff --git a/src/index/singlebyte/iso_8859_15.rs b/encoding-index-singlebyte/iso_8859_15.rs
similarity index 100%
rename from src/index/singlebyte/iso_8859_15.rs
rename to encoding-index-singlebyte/iso_8859_15.rs
diff --git a/src/index/singlebyte/iso_8859_16.rs b/encoding-index-singlebyte/iso_8859_16.rs
similarity index 100%
rename from src/index/singlebyte/iso_8859_16.rs
rename to encoding-index-singlebyte/iso_8859_16.rs
diff --git a/src/index/singlebyte/iso_8859_2.rs b/encoding-index-singlebyte/iso_8859_2.rs
similarity index 100%
rename from src/index/singlebyte/iso_8859_2.rs
rename to encoding-index-singlebyte/iso_8859_2.rs
diff --git a/src/index/singlebyte/iso_8859_3.rs b/encoding-index-singlebyte/iso_8859_3.rs
similarity index 100%
rename from src/index/singlebyte/iso_8859_3.rs
rename to encoding-index-singlebyte/iso_8859_3.rs
diff --git a/src/index/singlebyte/iso_8859_4.rs b/encoding-index-singlebyte/iso_8859_4.rs
similarity index 100%
rename from src/index/singlebyte/iso_8859_4.rs
rename to encoding-index-singlebyte/iso_8859_4.rs
diff --git a/src/index/singlebyte/iso_8859_5.rs b/encoding-index-singlebyte/iso_8859_5.rs
similarity index 100%
rename from src/index/singlebyte/iso_8859_5.rs
rename to encoding-index-singlebyte/iso_8859_5.rs
diff --git a/src/index/singlebyte/iso_8859_6.rs b/encoding-index-singlebyte/iso_8859_6.rs
similarity index 100%
rename from src/index/singlebyte/iso_8859_6.rs
rename to encoding-index-singlebyte/iso_8859_6.rs
diff --git a/src/index/singlebyte/iso_8859_7.rs b/encoding-index-singlebyte/iso_8859_7.rs
similarity index 100%
rename from src/index/singlebyte/iso_8859_7.rs
rename to encoding-index-singlebyte/iso_8859_7.rs
diff --git a/src/index/singlebyte/iso_8859_8.rs b/encoding-index-singlebyte/iso_8859_8.rs
similarity index 100%
rename from src/index/singlebyte/iso_8859_8.rs
rename to encoding-index-singlebyte/iso_8859_8.rs
diff --git a/src/index/singlebyte/koi8_r.rs b/encoding-index-singlebyte/koi8_r.rs
similarity index 100%
rename from src/index/singlebyte/koi8_r.rs
rename to encoding-index-singlebyte/koi8_r.rs
diff --git a/src/index/singlebyte/koi8_u.rs b/encoding-index-singlebyte/koi8_u.rs
similarity index 100%
rename from src/index/singlebyte/koi8_u.rs
rename to encoding-index-singlebyte/koi8_u.rs
diff --git a/src/index/singlebyte/lib.rs b/encoding-index-singlebyte/lib.rs
similarity index 100%
rename from src/index/singlebyte/lib.rs
rename to encoding-index-singlebyte/lib.rs
diff --git a/src/index/singlebyte/macintosh.rs b/encoding-index-singlebyte/macintosh.rs
similarity index 100%
rename from src/index/singlebyte/macintosh.rs
rename to encoding-index-singlebyte/macintosh.rs
diff --git a/src/index/singlebyte/windows_1250.rs b/encoding-index-singlebyte/windows_1250.rs
similarity index 100%
rename from src/index/singlebyte/windows_1250.rs
rename to encoding-index-singlebyte/windows_1250.rs
diff --git a/src/index/singlebyte/windows_1251.rs b/encoding-index-singlebyte/windows_1251.rs
similarity index 100%
rename from src/index/singlebyte/windows_1251.rs
rename to encoding-index-singlebyte/windows_1251.rs
diff --git a/src/index/singlebyte/windows_1252.rs b/encoding-index-singlebyte/windows_1252.rs
similarity index 100%
rename from src/index/singlebyte/windows_1252.rs
rename to encoding-index-singlebyte/windows_1252.rs
diff --git a/src/index/singlebyte/windows_1253.rs b/encoding-index-singlebyte/windows_1253.rs
similarity index 100%
rename from src/index/singlebyte/windows_1253.rs
rename to encoding-index-singlebyte/windows_1253.rs
diff --git a/src/index/singlebyte/windows_1254.rs b/encoding-index-singlebyte/windows_1254.rs
similarity index 100%
rename from src/index/singlebyte/windows_1254.rs
rename to encoding-index-singlebyte/windows_1254.rs
diff --git a/src/index/singlebyte/windows_1255.rs b/encoding-index-singlebyte/windows_1255.rs
similarity index 100%
rename from src/index/singlebyte/windows_1255.rs
rename to encoding-index-singlebyte/windows_1255.rs
diff --git a/src/index/singlebyte/windows_1256.rs b/encoding-index-singlebyte/windows_1256.rs
similarity index 100%
rename from src/index/singlebyte/windows_1256.rs
rename to encoding-index-singlebyte/windows_1256.rs
diff --git a/src/index/singlebyte/windows_1257.rs b/encoding-index-singlebyte/windows_1257.rs
similarity index 100%
rename from src/index/singlebyte/windows_1257.rs
rename to encoding-index-singlebyte/windows_1257.rs
diff --git a/src/index/singlebyte/windows_1258.rs b/encoding-index-singlebyte/windows_1258.rs
similarity index 100%
rename from src/index/singlebyte/windows_1258.rs
rename to encoding-index-singlebyte/windows_1258.rs
diff --git a/src/index/singlebyte/windows_874.rs b/encoding-index-singlebyte/windows_874.rs
similarity index 100%
rename from src/index/singlebyte/windows_874.rs
rename to encoding-index-singlebyte/windows_874.rs
diff --git a/src/index/singlebyte/x_mac_cyrillic.rs b/encoding-index-singlebyte/x_mac_cyrillic.rs
similarity index 100%
rename from src/index/singlebyte/x_mac_cyrillic.rs
rename to encoding-index-singlebyte/x_mac_cyrillic.rs
diff --git a/src/index/tradchinese/Cargo.toml b/encoding-index-tradchinese/Cargo.toml
similarity index 81%
rename from src/index/tradchinese/Cargo.toml
rename to encoding-index-tradchinese/Cargo.toml
index f2b05fcf..0e000c28 100644
--- a/src/index/tradchinese/Cargo.toml
+++ b/encoding-index-tradchinese/Cargo.toml
@@ -15,10 +15,9 @@ path = "lib.rs"
 [features]
 no-optimized-legacy-encoding = []
 
-[dependencies.encoding_index_tests]
-# TODO consider using dev-dependencies instead (Cargo issue #860)
+[dev-dependencies.encoding_index_tests]
 version = "0.1.5"
-path = "../tests"
+path = "../encoding_index_tests"
 
 [profile.test]
 # `test_correct_table` tests tend to be especially slow
diff --git a/src/index/tradchinese/big5.rs b/encoding-index-tradchinese/big5.rs
similarity index 100%
rename from src/index/tradchinese/big5.rs
rename to encoding-index-tradchinese/big5.rs
diff --git a/src/index/tradchinese/lib.rs b/encoding-index-tradchinese/lib.rs
similarity index 100%
rename from src/index/tradchinese/lib.rs
rename to encoding-index-tradchinese/lib.rs
diff --git a/src/index/tests/Cargo.toml b/encoding_index_tests/Cargo.toml
similarity index 100%
rename from src/index/tests/Cargo.toml
rename to encoding_index_tests/Cargo.toml
diff --git a/src/index/tests/index_tests.rs b/encoding_index_tests/index_tests.rs
similarity index 100%
rename from src/index/tests/index_tests.rs
rename to encoding_index_tests/index_tests.rs
diff --git a/src/index/gen_index.py b/gen_index.py
similarity index 100%
rename from src/index/gen_index.py
rename to gen_index.py