diff --git a/__init__.py b/__init__.py
index 4ba13340e3614738862cdf543e4db23d6c0c8a1d..0c574e9129ff8eb1998437e400dce2bac12eba0c 100644
--- a/__init__.py
+++ b/__init__.py
@@ -5,11 +5,11 @@ from .data_types import TypedSymbol
 from .slicing import make_slice
 from .kernelcreation import create_kernel, create_indexed_kernel
 from .display_utils import show_code, to_dot
-from .assignment_collection import AssignmentCollection
+from .simp import AssignmentCollection
 from .assignment import Assignment
 from .sympyextensions import SymbolCreator
 from .datahandling import create_data_handling
-from . kernel_decorator import kernel
+from .kernel_decorator import kernel
 
 __all__ = ['Field', 'FieldType', 'fields',
            'TypedSymbol',
@@ -21,3 +21,4 @@ __all__ = ['Field', 'FieldType', 'fields',
            'SymbolCreator',
            'create_data_handling',
            'kernel']
+
diff --git a/fd/finitedifferences.py b/fd/finitedifferences.py
index f39d4c0c7203c1fb2b3ca8a92c9334e291bee91f..4b584779b66d45de1b74ec581f38fc74b51cb7a5 100644
--- a/fd/finitedifferences.py
+++ b/fd/finitedifferences.py
@@ -2,10 +2,9 @@ import numpy as np
 import sympy as sp
 from typing import Union, Optional
 
-from pystencils.assignment_collection import AssignmentCollection
-from pystencils.field import Field
+from pystencils import Field, AssignmentCollection
+from pystencils.fd import Diff
 from pystencils.sympyextensions import fast_subs
-from pystencils.fd.derivative import Diff
 
 
 FieldOrFieldAccess = Union[Field, Field.Access]
diff --git a/kernelcreation.py b/kernelcreation.py
index 45eebc34c2794b4d27cad6d7c1efcfe81b1c3153..17d804b2d1ddc3641e78841fcdf8e8497bdc11f2 100644
--- a/kernelcreation.py
+++ b/kernelcreation.py
@@ -1,10 +1,10 @@
 from types import MappingProxyType
 import sympy as sp
-from pystencils.assignment import Assignment
-from pystencils.astnodes import LoopOverCoordinate, Conditional, Block, SympyAssignment
-from pystencils.assignment_collection import AssignmentCollection
-from pystencils.gpucuda.indexing import indexing_creator_from_params
-from pystencils.transformations import remove_conditionals_in_staggered_kernel
+from .assignment import Assignment
+from .astnodes import LoopOverCoordinate, Conditional, Block, SympyAssignment
+from .simp.assignment_collection import AssignmentCollection
+from .gpucuda.indexing import indexing_creator_from_params
+from .transformations import remove_conditionals_in_staggered_kernel
 
 
 def create_kernel(assignments, target='cpu', data_type="double", iteration_slice=None, ghost_layers=None,
diff --git a/assignment_collection/__init__.py b/simp/__init__.py
similarity index 65%
rename from assignment_collection/__init__.py
rename to simp/__init__.py
index 7648bbab8624019ab4e7de218576c1212673ee31..0e8a85d1fac9e85830b9b26776fd929cc8937b8d 100644
--- a/assignment_collection/__init__.py
+++ b/simp/__init__.py
@@ -1,6 +1,6 @@
-from pystencils.assignment_collection.assignment_collection import AssignmentCollection
-from pystencils.assignment_collection.simplificationstrategy import SimplificationStrategy
-from pystencils.assignment_collection.simplifications import sympy_cse, sympy_cse_on_assignment_list, \
+from .assignment_collection import AssignmentCollection
+from .simplificationstrategy import SimplificationStrategy
+from .simplifications import sympy_cse, sympy_cse_on_assignment_list, \
     apply_to_all_assignments, apply_on_all_subexpressions, subexpression_substitution_in_existing_subexpressions, \
     subexpression_substitution_in_main_assignments, add_subexpressions_for_divisions
 
diff --git a/assignment_collection/assignment_collection.py b/simp/assignment_collection.py
similarity index 100%
rename from assignment_collection/assignment_collection.py
rename to simp/assignment_collection.py
diff --git a/assignment_collection/simplifications.py b/simp/simplifications.py
similarity index 97%
rename from assignment_collection/simplifications.py
rename to simp/simplifications.py
index 6d6de1414d50f79cceac236b7c414ede5f488a0e..2cb4dd30371c8db5f3685e5d41c24c5719a864e8 100644
--- a/assignment_collection/simplifications.py
+++ b/simp/simplifications.py
@@ -1,7 +1,7 @@
 import sympy as sp
 from typing import Callable, List
 from pystencils.assignment import Assignment
-from pystencils.assignment_collection.assignment_collection import AssignmentCollection
+from pystencils.simp.assignment_collection import AssignmentCollection
 from pystencils.sympyextensions import subs_additive
 
 AC = AssignmentCollection
diff --git a/assignment_collection/simplificationstrategy.py b/simp/simplificationstrategy.py
similarity index 98%
rename from assignment_collection/simplificationstrategy.py
rename to simp/simplificationstrategy.py
index d87b1ee1b54dec7226f72fa31e76881bc0438654..f80734bab97f7f2e4c3db8baba6e8aa6af15002e 100644
--- a/assignment_collection/simplificationstrategy.py
+++ b/simp/simplificationstrategy.py
@@ -1,7 +1,7 @@
 import sympy as sp
 from collections import namedtuple
 from typing import Callable, Any, Optional, Sequence
-from pystencils.assignment_collection.assignment_collection import AssignmentCollection
+from pystencils.simp.assignment_collection import AssignmentCollection
 
 
 class SimplificationStrategy: