diff --git a/.gitignore b/java/.gitignore
similarity index 100%
rename from .gitignore
rename to java/.gitignore
diff --git a/.gitmodules b/java/.gitmodules
similarity index 100%
rename from .gitmodules
rename to java/.gitmodules
diff --git a/.travis.yml b/java/.travis.yml
similarity index 100%
rename from .travis.yml
rename to java/.travis.yml
diff --git a/LICENSE b/java/LICENSE
similarity index 100%
rename from LICENSE
rename to java/LICENSE
diff --git a/README.md b/java/README.md
similarity index 100%
rename from README.md
rename to java/README.md
diff --git a/Rakefile b/java/Rakefile
similarity index 100%
rename from Rakefile
rename to java/Rakefile
diff --git a/TODO b/java/TODO
similarity index 100%
rename from TODO
rename to java/TODO
diff --git a/docs/api/allclasses-frame.html b/java/docs/api/allclasses-frame.html
similarity index 100%
rename from docs/api/allclasses-frame.html
rename to java/docs/api/allclasses-frame.html
diff --git a/docs/api/allclasses-noframe.html b/java/docs/api/allclasses-noframe.html
similarity index 100%
rename from docs/api/allclasses-noframe.html
rename to java/docs/api/allclasses-noframe.html
diff --git a/docs/api/com/twitter/Autolink.html b/java/docs/api/com/twitter/Autolink.html
similarity index 100%
rename from docs/api/com/twitter/Autolink.html
rename to java/docs/api/com/twitter/Autolink.html
diff --git a/docs/api/com/twitter/Extractor.Entity.html b/java/docs/api/com/twitter/Extractor.Entity.html
similarity index 100%
rename from docs/api/com/twitter/Extractor.Entity.html
rename to java/docs/api/com/twitter/Extractor.Entity.html
diff --git a/docs/api/com/twitter/Extractor.html b/java/docs/api/com/twitter/Extractor.html
similarity index 100%
rename from docs/api/com/twitter/Extractor.html
rename to java/docs/api/com/twitter/Extractor.html
diff --git a/docs/api/com/twitter/HitHighlighter.html b/java/docs/api/com/twitter/HitHighlighter.html
similarity index 100%
rename from docs/api/com/twitter/HitHighlighter.html
rename to java/docs/api/com/twitter/HitHighlighter.html
diff --git a/docs/api/com/twitter/Regex.html b/java/docs/api/com/twitter/Regex.html
similarity index 100%
rename from docs/api/com/twitter/Regex.html
rename to java/docs/api/com/twitter/Regex.html
diff --git a/docs/api/com/twitter/class-use/Autolink.html b/java/docs/api/com/twitter/class-use/Autolink.html
similarity index 100%
rename from docs/api/com/twitter/class-use/Autolink.html
rename to java/docs/api/com/twitter/class-use/Autolink.html
diff --git a/docs/api/com/twitter/class-use/Extractor.Entity.html b/java/docs/api/com/twitter/class-use/Extractor.Entity.html
similarity index 100%
rename from docs/api/com/twitter/class-use/Extractor.Entity.html
rename to java/docs/api/com/twitter/class-use/Extractor.Entity.html
diff --git a/docs/api/com/twitter/class-use/Extractor.html b/java/docs/api/com/twitter/class-use/Extractor.html
similarity index 100%
rename from docs/api/com/twitter/class-use/Extractor.html
rename to java/docs/api/com/twitter/class-use/Extractor.html
diff --git a/docs/api/com/twitter/class-use/HitHighlighter.html b/java/docs/api/com/twitter/class-use/HitHighlighter.html
similarity index 100%
rename from docs/api/com/twitter/class-use/HitHighlighter.html
rename to java/docs/api/com/twitter/class-use/HitHighlighter.html
diff --git a/docs/api/com/twitter/class-use/Regex.html b/java/docs/api/com/twitter/class-use/Regex.html
similarity index 100%
rename from docs/api/com/twitter/class-use/Regex.html
rename to java/docs/api/com/twitter/class-use/Regex.html
diff --git a/docs/api/com/twitter/package-frame.html b/java/docs/api/com/twitter/package-frame.html
similarity index 100%
rename from docs/api/com/twitter/package-frame.html
rename to java/docs/api/com/twitter/package-frame.html
diff --git a/docs/api/com/twitter/package-summary.html b/java/docs/api/com/twitter/package-summary.html
similarity index 100%
rename from docs/api/com/twitter/package-summary.html
rename to java/docs/api/com/twitter/package-summary.html
diff --git a/docs/api/com/twitter/package-tree.html b/java/docs/api/com/twitter/package-tree.html
similarity index 100%
rename from docs/api/com/twitter/package-tree.html
rename to java/docs/api/com/twitter/package-tree.html
diff --git a/docs/api/com/twitter/package-use.html b/java/docs/api/com/twitter/package-use.html
similarity index 100%
rename from docs/api/com/twitter/package-use.html
rename to java/docs/api/com/twitter/package-use.html
diff --git a/docs/api/com/twitter/regex/Spaces.html b/java/docs/api/com/twitter/regex/Spaces.html
similarity index 100%
rename from docs/api/com/twitter/regex/Spaces.html
rename to java/docs/api/com/twitter/regex/Spaces.html
diff --git a/docs/api/com/twitter/regex/class-use/Spaces.html b/java/docs/api/com/twitter/regex/class-use/Spaces.html
similarity index 100%
rename from docs/api/com/twitter/regex/class-use/Spaces.html
rename to java/docs/api/com/twitter/regex/class-use/Spaces.html
diff --git a/docs/api/com/twitter/regex/package-frame.html b/java/docs/api/com/twitter/regex/package-frame.html
similarity index 100%
rename from docs/api/com/twitter/regex/package-frame.html
rename to java/docs/api/com/twitter/regex/package-frame.html
diff --git a/docs/api/com/twitter/regex/package-summary.html b/java/docs/api/com/twitter/regex/package-summary.html
similarity index 100%
rename from docs/api/com/twitter/regex/package-summary.html
rename to java/docs/api/com/twitter/regex/package-summary.html
diff --git a/docs/api/com/twitter/regex/package-tree.html b/java/docs/api/com/twitter/regex/package-tree.html
similarity index 100%
rename from docs/api/com/twitter/regex/package-tree.html
rename to java/docs/api/com/twitter/regex/package-tree.html
diff --git a/docs/api/com/twitter/regex/package-use.html b/java/docs/api/com/twitter/regex/package-use.html
similarity index 100%
rename from docs/api/com/twitter/regex/package-use.html
rename to java/docs/api/com/twitter/regex/package-use.html
diff --git a/docs/api/constant-values.html b/java/docs/api/constant-values.html
similarity index 100%
rename from docs/api/constant-values.html
rename to java/docs/api/constant-values.html
diff --git a/docs/api/deprecated-list.html b/java/docs/api/deprecated-list.html
similarity index 100%
rename from docs/api/deprecated-list.html
rename to java/docs/api/deprecated-list.html
diff --git a/docs/api/help-doc.html b/java/docs/api/help-doc.html
similarity index 100%
rename from docs/api/help-doc.html
rename to java/docs/api/help-doc.html
diff --git a/docs/api/index-all.html b/java/docs/api/index-all.html
similarity index 100%
rename from docs/api/index-all.html
rename to java/docs/api/index-all.html
diff --git a/docs/api/index.html b/java/docs/api/index.html
similarity index 100%
rename from docs/api/index.html
rename to java/docs/api/index.html
diff --git a/docs/api/overview-frame.html b/java/docs/api/overview-frame.html
similarity index 100%
rename from docs/api/overview-frame.html
rename to java/docs/api/overview-frame.html
diff --git a/docs/api/overview-summary.html b/java/docs/api/overview-summary.html
similarity index 100%
rename from docs/api/overview-summary.html
rename to java/docs/api/overview-summary.html
diff --git a/docs/api/overview-tree.html b/java/docs/api/overview-tree.html
similarity index 100%
rename from docs/api/overview-tree.html
rename to java/docs/api/overview-tree.html
diff --git a/docs/api/package-list b/java/docs/api/package-list
similarity index 100%
rename from docs/api/package-list
rename to java/docs/api/package-list
diff --git a/docs/api/resources/inherit.gif b/java/docs/api/resources/inherit.gif
similarity index 100%
rename from docs/api/resources/inherit.gif
rename to java/docs/api/resources/inherit.gif
diff --git a/docs/api/stylesheet.css b/java/docs/api/stylesheet.css
similarity index 100%
rename from docs/api/stylesheet.css
rename to java/docs/api/stylesheet.css
diff --git a/pom.xml b/java/pom.xml
similarity index 100%
rename from pom.xml
rename to java/pom.xml
diff --git a/src/com/twitter/Autolink.java b/java/src/com/twitter/Autolink.java
similarity index 100%
rename from src/com/twitter/Autolink.java
rename to java/src/com/twitter/Autolink.java
diff --git a/src/com/twitter/Extractor.java b/java/src/com/twitter/Extractor.java
similarity index 100%
rename from src/com/twitter/Extractor.java
rename to java/src/com/twitter/Extractor.java
diff --git a/src/com/twitter/HitHighlighter.java b/java/src/com/twitter/HitHighlighter.java
similarity index 100%
rename from src/com/twitter/HitHighlighter.java
rename to java/src/com/twitter/HitHighlighter.java
diff --git a/src/com/twitter/Regex.java b/java/src/com/twitter/Regex.java
similarity index 100%
rename from src/com/twitter/Regex.java
rename to java/src/com/twitter/Regex.java
diff --git a/src/com/twitter/Validator.java b/java/src/com/twitter/Validator.java
similarity index 100%
rename from src/com/twitter/Validator.java
rename to java/src/com/twitter/Validator.java
diff --git a/tests/com/twitter/AutolinkTest.java b/java/tests/com/twitter/AutolinkTest.java
similarity index 100%
rename from tests/com/twitter/AutolinkTest.java
rename to java/tests/com/twitter/AutolinkTest.java
diff --git a/tests/com/twitter/Benchmark.java b/java/tests/com/twitter/Benchmark.java
similarity index 100%
rename from tests/com/twitter/Benchmark.java
rename to java/tests/com/twitter/Benchmark.java
diff --git a/tests/com/twitter/ConformanceTest.java b/java/tests/com/twitter/ConformanceTest.java
similarity index 100%
rename from tests/com/twitter/ConformanceTest.java
rename to java/tests/com/twitter/ConformanceTest.java
diff --git a/tests/com/twitter/ExtractorTest.java b/java/tests/com/twitter/ExtractorTest.java
similarity index 100%
rename from tests/com/twitter/ExtractorTest.java
rename to java/tests/com/twitter/ExtractorTest.java
diff --git a/tests/com/twitter/RegexTest.java b/java/tests/com/twitter/RegexTest.java
similarity index 100%
rename from tests/com/twitter/RegexTest.java
rename to java/tests/com/twitter/RegexTest.java
diff --git a/tests/com/twitter/ValidatorTest.java b/java/tests/com/twitter/ValidatorTest.java
similarity index 100%
rename from tests/com/twitter/ValidatorTest.java
rename to java/tests/com/twitter/ValidatorTest.java
diff --git a/test-data/twitter-text-conformance b/test-data/twitter-text-conformance
deleted file mode 160000
index be88d01a5..000000000
--- a/test-data/twitter-text-conformance
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit be88d01a567c82bc625f8991cd825dc100e01321