diff --git a/batbench/__init__.py b/batbench/__init__.py
index 99ef8cd..3dc1f76 100644
--- a/batbench/__init__.py
+++ b/batbench/__init__.py
@@ -1,8 +1 @@
-from .backends import *
-from .benchmarks import *
-from .result import *
-from .tuners import *
-from .manager.manager import *
-from .manager.experiment_manager import *
-
 __version__ = "0.1.0"
diff --git a/batbench/backends/cuda_kernel_runner/cuda_kernel_runner.py b/batbench/backends/cuda_kernel_runner/cuda_kernel_runner.py
index 6013b45..b92018f 100644
--- a/batbench/backends/cuda_kernel_runner/cuda_kernel_runner.py
+++ b/batbench/backends/cuda_kernel_runner/cuda_kernel_runner.py
@@ -4,7 +4,7 @@
 import logging
 
 import cupy as cp
-from batbench.config_space import ConfigSpace
+from batbench.config_space.config_space import ConfigSpace
 from batbench.util import get_kernel_path
 
 from .arg_handler import ArgHandler
diff --git a/batbench/benchmarks/dedisp/dedispersion.py b/batbench/benchmarks/dedisp/dedispersion.py
index 9a76a3b..68c608c 100644
--- a/batbench/benchmarks/dedisp/dedispersion.py
+++ b/batbench/benchmarks/dedisp/dedispersion.py
@@ -2,7 +2,7 @@
 import numpy as np
 
 from batbench.backends.kernelbackend.kerneltuner_runner import KernelBackend
-from batbench.config_space import ConfigSpace
+from batbench.config_space.config_space import ConfigSpace
 from batbench.config_space.arguments import Arguments
 from batbench.config_space.cuda_problem import CUDAProblem
 
diff --git a/batbench/benchmarks/expdist/expdist.py b/batbench/benchmarks/expdist/expdist.py
index 7a2a0b1..af7087a 100644
--- a/batbench/benchmarks/expdist/expdist.py
+++ b/batbench/benchmarks/expdist/expdist.py
@@ -4,7 +4,7 @@
 from batbench.config_space.arguments import Arguments
 from batbench.config_space.cuda_problem import CUDAProblem
 from batbench.backends.kernelbackend.kerneltuner_runner import KernelBackend
-from batbench.config_space import ConfigSpace
+from batbench.config_space.config_space import ConfigSpace
 
 class Expdist(CUDAProblem):
     def __init__(self, run_settings) -> None:
diff --git a/batbench/config_space/__init__.py b/batbench/config_space/__init__.py
index 28a685e..e69de29 100644
--- a/batbench/config_space/__init__.py
+++ b/batbench/config_space/__init__.py
@@ -1,3 +0,0 @@
-from .config_space import *
-from .cuda_problem import *
-from .problem import *