diff --git a/spacy/lang/__init__.py b/spacy/lang/__init__.py
index ace90644cb3..e69de29bb2d 100644
--- a/spacy/lang/__init__.py
+++ b/spacy/lang/__init__.py
@@ -1,4 +0,0 @@
-from .punctuation import *
-from .tag_map import TAG_MAP
-from .entity_rules import ENTITY_RULES
-from .tokenizer_exceptions import BASE_EXCEPTIONS, TOKEN_MATCH
diff --git a/spacy/tests/de/__init__.py b/spacy/tests/lang/__init__.py
similarity index 100%
rename from spacy/tests/de/__init__.py
rename to spacy/tests/lang/__init__.py
diff --git a/spacy/tests/en/__init__.py b/spacy/tests/lang/bn/__init__.py
similarity index 100%
rename from spacy/tests/en/__init__.py
rename to spacy/tests/lang/bn/__init__.py
diff --git a/spacy/tests/es/__init__.py b/spacy/tests/lang/de/__init__.py
similarity index 100%
rename from spacy/tests/es/__init__.py
rename to spacy/tests/lang/de/__init__.py
diff --git a/spacy/tests/fi/__init__.py b/spacy/tests/lang/en/__init__.py
similarity index 100%
rename from spacy/tests/fi/__init__.py
rename to spacy/tests/lang/en/__init__.py
diff --git a/spacy/tests/he/__init__.py b/spacy/tests/lang/es/__init__.py
similarity index 100%
rename from spacy/tests/he/__init__.py
rename to spacy/tests/lang/es/__init__.py
diff --git a/spacy/tests/hu/__init__.py b/spacy/tests/lang/fi/__init__.py
similarity index 100%
rename from spacy/tests/hu/__init__.py
rename to spacy/tests/lang/fi/__init__.py
diff --git a/spacy/tests/nb/__init__.py b/spacy/tests/lang/fr/__init__.py
similarity index 100%
rename from spacy/tests/nb/__init__.py
rename to spacy/tests/lang/fr/__init__.py
diff --git a/spacy/tests/sv/__init__.py b/spacy/tests/lang/he/__init__.py
similarity index 100%
rename from spacy/tests/sv/__init__.py
rename to spacy/tests/lang/he/__init__.py
diff --git a/spacy/tests/regression/test_issue768.py b/spacy/tests/regression/test_issue768.py
index ff34decba51..a5feb447d78 100644
--- a/spacy/tests/regression/test_issue768.py
+++ b/spacy/tests/regression/test_issue768.py
@@ -3,9 +3,10 @@
 
 from ...language import Language
 from ...attrs import LANG
-from ...fr.stop_words import STOP_WORDS
-from ...fr.tokenizer_exceptions import TOKENIZER_EXCEPTIONS
-from ...language_data.punctuation import TOKENIZER_INFIXES, ALPHA
+from ...lang.fr.stop_words import STOP_WORDS
+from ...lang.fr.tokenizer_exceptions import TOKENIZER_EXCEPTIONS
+from ...lang.punctuation import TOKENIZER_INFIXES
+from ...lang.char_classes import ALPHA
 from ...util import update_exc
 
 import pytest
diff --git a/spacy/tests/regression/test_issue910.py b/spacy/tests/regression/test_issue910.py
index 3790d429bb3..4505b500e98 100644
--- a/spacy/tests/regression/test_issue910.py
+++ b/spacy/tests/regression/test_issue910.py
@@ -12,7 +12,7 @@
 import pathlib
 from ...gold import GoldParse
 from ...pipeline import EntityRecognizer
-from ...en import English
+from ...lang.en import English
 
 try:
     unicode