diff --git a/extra/db/sqlite/test.db b/extra/db/sqlite/test.db
deleted file mode 100644
index e483c47cea..0000000000
Binary files a/extra/db/sqlite/test.db and /dev/null differ
diff --git a/core/io/encodings/ascii/ascii.factor b/extra/io/encodings/ascii/ascii.factor
similarity index 100%
rename from core/io/encodings/ascii/ascii.factor
rename to extra/io/encodings/ascii/ascii.factor
diff --git a/core/io/encodings/ascii/authors.txt b/extra/io/encodings/ascii/authors.txt
similarity index 100%
rename from core/io/encodings/ascii/authors.txt
rename to extra/io/encodings/ascii/authors.txt
diff --git a/extra/io/encodings/ascii/summary.txt b/extra/io/encodings/ascii/summary.txt
new file mode 100644
index 0000000000..8c54de7680
--- /dev/null
+++ b/extra/io/encodings/ascii/summary.txt
@@ -0,0 +1 @@
+ASCII encoding for streams
diff --git a/core/io/encodings/latin1/tags.txt b/extra/io/encodings/ascii/tags.txt
similarity index 100%
rename from core/io/encodings/latin1/tags.txt
rename to extra/io/encodings/ascii/tags.txt
diff --git a/core/io/encodings/latin1/authors.txt b/extra/io/encodings/latin1/authors.txt
similarity index 100%
rename from core/io/encodings/latin1/authors.txt
rename to extra/io/encodings/latin1/authors.txt
diff --git a/core/io/encodings/latin1/latin1-docs.factor b/extra/io/encodings/latin1/latin1-docs.factor
similarity index 100%
rename from core/io/encodings/latin1/latin1-docs.factor
rename to extra/io/encodings/latin1/latin1-docs.factor
diff --git a/core/io/encodings/latin1/latin1.factor b/extra/io/encodings/latin1/latin1.factor
similarity index 100%
rename from core/io/encodings/latin1/latin1.factor
rename to extra/io/encodings/latin1/latin1.factor
diff --git a/core/io/encodings/latin1/summary.txt b/extra/io/encodings/latin1/summary.txt
similarity index 100%
rename from core/io/encodings/latin1/summary.txt
rename to extra/io/encodings/latin1/summary.txt
diff --git a/core/io/encodings/utf16/tags.txt b/extra/io/encodings/latin1/tags.txt
similarity index 100%
rename from core/io/encodings/utf16/tags.txt
rename to extra/io/encodings/latin1/tags.txt
diff --git a/core/io/encodings/utf16/.utf16.factor.swo b/extra/io/encodings/utf16/.utf16.factor.swo
similarity index 100%
rename from core/io/encodings/utf16/.utf16.factor.swo
rename to extra/io/encodings/utf16/.utf16.factor.swo
diff --git a/core/io/encodings/utf16/authors.txt b/extra/io/encodings/utf16/authors.txt
similarity index 100%
rename from core/io/encodings/utf16/authors.txt
rename to extra/io/encodings/utf16/authors.txt
diff --git a/core/io/encodings/utf16/summary.txt b/extra/io/encodings/utf16/summary.txt
similarity index 100%
rename from core/io/encodings/utf16/summary.txt
rename to extra/io/encodings/utf16/summary.txt
diff --git a/extra/io/encodings/utf16/tags.txt b/extra/io/encodings/utf16/tags.txt
new file mode 100644
index 0000000000..8e27be7d61
--- /dev/null
+++ b/extra/io/encodings/utf16/tags.txt
@@ -0,0 +1 @@
+text
diff --git a/core/io/encodings/utf16/utf16-docs.factor b/extra/io/encodings/utf16/utf16-docs.factor
similarity index 100%
rename from core/io/encodings/utf16/utf16-docs.factor
rename to extra/io/encodings/utf16/utf16-docs.factor
diff --git a/core/io/encodings/utf16/utf16-tests.factor b/extra/io/encodings/utf16/utf16-tests.factor
similarity index 100%
rename from core/io/encodings/utf16/utf16-tests.factor
rename to extra/io/encodings/utf16/utf16-tests.factor
diff --git a/core/io/encodings/utf16/utf16.factor b/extra/io/encodings/utf16/utf16.factor
similarity index 100%
rename from core/io/encodings/utf16/utf16.factor
rename to extra/io/encodings/utf16/utf16.factor