diff --git a/csrank/__init__.py b/csrank/__init__.py
index 7729e98e..7f066bfb 100644
--- a/csrank/__init__.py
+++ b/csrank/__init__.py
@@ -1,12 +1,3 @@
 __version__ = "1.1.0"
 
-# We should re-evaluate if we really want to re-export everything here and then
-# use __all__ properly.
-
-from .choicefunction import *  # noqa
-from .core import *  # noqa
-from .dataset_reader import *  # noqa
-from .discretechoice import *  # noqa
-from .objectranking import *  # noqa
-from .tunable import Tunable  # noqa
-from .tuning import ParameterOptimizer  # noqa
+__all__ = ["choicefunction", "discretechoice", "objectranking"]
diff --git a/csrank/tests/test_fate.py b/csrank/tests/test_fate.py
index 1242e5e1..b99b4272 100644
--- a/csrank/tests/test_fate.py
+++ b/csrank/tests/test_fate.py
@@ -5,8 +5,8 @@
 from keras.regularizers import l2
 import numpy as np
 
-from csrank import FATENetworkCore
-from csrank import FATEObjectRanker
+from csrank.core import FATENetworkCore
+from csrank.objectranking import FATEObjectRanker
 from csrank.tests.test_ranking import optimizer
 
 
diff --git a/csrank/tests/test_ranking.py b/csrank/tests/test_ranking.py
index 69186f73..0ca4085c 100644
--- a/csrank/tests/test_ranking.py
+++ b/csrank/tests/test_ranking.py
@@ -5,7 +5,6 @@
 import pytest
 import tensorflow as tf
 
-from csrank import PairedCombinatorialLogit
 from csrank.constants import CMPNET
 from csrank.constants import ERR
 from csrank.constants import FATE_RANKER
@@ -15,6 +14,7 @@
 from csrank.constants import LISTNET
 from csrank.constants import RANKNET
 from csrank.constants import RANKSVM
+from csrank.discretechoice import PairedCombinatorialLogit
 from csrank.metrics_np import zero_one_accuracy_np
 from csrank.metrics_np import zero_one_rank_loss_for_scores_ties_np
 from csrank.objectranking import *
diff --git a/csrank/tests/test_util.py b/csrank/tests/test_util.py
index d4bd74e5..5d680384 100644
--- a/csrank/tests/test_util.py
+++ b/csrank/tests/test_util.py
@@ -3,7 +3,7 @@
 import pytest
 import tensorflow as tf
 
-from csrank import SyntheticIterator
+from csrank.dataset_reader import SyntheticIterator
 from csrank.tensorflow_util import tensorify
 from csrank.tuning import check_learner_class