diff --git a/lbmpy/advanced_streaming/__init__.py b/lbmpy/advanced_streaming/__init__.py
index aeddb1f38a435f8f289bd413ebc9f4cdb6a41be8..a7ae14819f188769eedae31d262bb2ba0f6eb87f 100644
--- a/lbmpy/advanced_streaming/__init__.py
+++ b/lbmpy/advanced_streaming/__init__.py
@@ -1,10 +1,9 @@
-from .custom_code_nodes import NeighbourOffsetArrays, MirroredStencilDirections
 from .indexing import BetweenTimestepsIndexing
 from .communication import get_communication_slices, LBMPeriodicityHandling
 from .utility import Timestep, get_accessor, is_inplace, get_timesteps, \
     numeric_index, numeric_offsets, inverse_dir_index, AccessPdfValues
 
-__all__ = ['BetweenTimestepsIndexing', 'NeighbourOffsetArrays', 'MirroredStencilDirections',
+__all__ = ['BetweenTimestepsIndexing',
            'get_communication_slices', 'LBMPeriodicityHandling',
            'Timestep', 'get_accessor', 'is_inplace', 'get_timesteps',
            'numeric_index', 'numeric_offsets', 'inverse_dir_index', 'AccessPdfValues']
diff --git a/lbmpy/advanced_streaming/indexing.py b/lbmpy/advanced_streaming/indexing.py
index af0af4262ff618bcec349f92144839850db98fc1..98ec6303817a0099a42d8963ca7cc744cbcf03a0 100644
--- a/lbmpy/advanced_streaming/indexing.py
+++ b/lbmpy/advanced_streaming/indexing.py
@@ -4,7 +4,7 @@ import pystencils as ps
 
 from pystencils.typing import TypedSymbol, create_type
 from lbmpy.advanced_streaming.utility import get_accessor, inverse_dir_index, is_inplace, Timestep
-from .custom_code_nodes import TranslationArraysNode
+from lbmpy.custom_code_nodes import TranslationArraysNode
 
 from itertools import product
 
diff --git a/lbmpy/boundaries/boundaryconditions.py b/lbmpy/boundaries/boundaryconditions.py
index e894f1a18a81533de0ab6a9fddacb3ff5eaf6e61..a987af6a793f16d93293ae8c12a75eb411f365a0 100644
--- a/lbmpy/boundaries/boundaryconditions.py
+++ b/lbmpy/boundaries/boundaryconditions.py
@@ -7,7 +7,7 @@ from pystencils import Assignment, Field
 from pystencils.typing import create_type
 from pystencils.sympyextensions import get_symmetric_part
 from lbmpy.simplificationfactory import create_simplification_strategy
-from lbmpy.advanced_streaming.custom_code_nodes import NeighbourOffsetArrays, MirroredStencilDirections, LbmWeightInfo
+from lbmpy.custom_code_nodes import NeighbourOffsetArrays, MirroredStencilDirections, LbmWeightInfo
 from pystencils.stencil import offset_to_direction_string, direction_string_to_offset, inverse_direction
 
 import sympy as sp
diff --git a/lbmpy/advanced_streaming/custom_code_nodes.py b/lbmpy/custom_code_nodes.py
similarity index 100%
rename from lbmpy/advanced_streaming/custom_code_nodes.py
rename to lbmpy/custom_code_nodes.py
diff --git a/lbmpy/sparse/mapping.py b/lbmpy/sparse/mapping.py
index 664907c73168cc25ea88d4b4df55f9ce79341879..fcb3e33b9a92291b85f4fa656864f01610342677 100644
--- a/lbmpy/sparse/mapping.py
+++ b/lbmpy/sparse/mapping.py
@@ -3,7 +3,7 @@ from typing import Tuple
 import numpy as np
 import sympy as sp
 
-from lbmpy.advanced_streaming.custom_code_nodes import LbmWeightInfo
+from lbmpy.custom_code_nodes import LbmWeightInfo
 from pystencils import Assignment, Field, TypedSymbol
 from pystencils.boundaries.boundaryhandling import BoundaryOffsetInfo
 from pystencils.boundaries.createindexlist import (