diff --git a/artiq/__init__.py b/artiq/__init__.py
index ebdb62601..7e6404c1e 100644
--- a/artiq/__init__.py
+++ b/artiq/__init__.py
@@ -1,4 +1,2 @@
-from artiq.language.core import *
-from artiq.language.experiment import Experiment
-from artiq.language.db import *
-from artiq.language.units import *
+from artiq import language
+from artiq.language import *
diff --git a/artiq/language/__init__.py b/artiq/language/__init__.py
index e69de29bb..ebdb62601 100644
--- a/artiq/language/__init__.py
+++ b/artiq/language/__init__.py
@@ -0,0 +1,4 @@
+from artiq.language.core import *
+from artiq.language.experiment import Experiment
+from artiq.language.db import *
+from artiq.language.units import *