diff --git a/pymc_experimental/distributions/__init__.py b/pymc_experimental/distributions/__init__.py
index f06db969..f206c246 100644
--- a/pymc_experimental/distributions/__init__.py
+++ b/pymc_experimental/distributions/__init__.py
@@ -24,7 +24,7 @@
     Skellam,
 )
 from pymc_experimental.distributions.histogram_utils import histogram_approximation
-from pymc_experimental.distributions.multivariate import R2D2M2CP
+from pymc_experimental.distributions.multivariate.r2d2m2cp import R2D2M2CP
 from pymc_experimental.distributions.timeseries import DiscreteMarkovChain
 
 __all__ = [
diff --git a/pymc_experimental/distributions/multivariate/__init__.py b/pymc_experimental/distributions/multivariate/__init__.py
index 12f6b493..e69de29b 100644
--- a/pymc_experimental/distributions/multivariate/__init__.py
+++ b/pymc_experimental/distributions/multivariate/__init__.py
@@ -1,3 +0,0 @@
-from pymc_experimental.distributions.multivariate.r2d2m2cp import R2D2M2CP
-
-__all__ = ["R2D2M2CP"]
diff --git a/tests/distributions/__init__.py b/tests/distributions/__init__.py
index d4b13bfc..e69de29b 100644
--- a/tests/distributions/__init__.py
+++ b/tests/distributions/__init__.py
@@ -1,19 +0,0 @@
-#   Copyright 2022 The PyMC Developers
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-
-
-from pymc_experimental.distributions import histogram_utils
-from pymc_experimental.distributions.histogram_utils import histogram_approximation
-
-__all__ = ["histogram_utils", "histogram_approximation"]
diff --git a/tests/distributions/multivariate/__init__.py b/tests/distributions/multivariate/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/distributions/test_multivariate.py b/tests/distributions/multivariate/test_r2d2m2cp.py
similarity index 100%
rename from tests/distributions/test_multivariate.py
rename to tests/distributions/multivariate/test_r2d2m2cp.py