diff --git a/Python/poiseuille_flow.py b/Python/poiseuille_flow.py
index c2484ad90d0f2c9702b07e6291870f8a369354bd..3f0fc86f20624934a57c162fcb9e56af8c24f467 100644
--- a/Python/poiseuille_flow.py
+++ b/Python/poiseuille_flow.py
@@ -1,12 +1,12 @@
-from virtualfluids.boundaryconditions import NoSlipBCAdapter, NoSlipBCAlgorithm
-from virtualfluids.builder import VirtualFluidsBuilder
-from virtualfluids.geometry import GbCuboid3D
-from virtualfluids.kernel import LBMKernel, KernelType
-from virtualfluids.writer import Writer, WriterType
+from pyfluids import Simulation
+from pyfluids.boundaryconditions import NoSlipBCAdapter, NoSlipBCAlgorithm
+from pyfluids.geometry import GbCuboid3D
+from pyfluids.kernel import LBMKernel, KernelType
+from pyfluids.writer import Writer, WriterType
 
 
 def simulate_poiseuille_flow(physical_params, grid_params, sim_params):
-    builder = VirtualFluidsBuilder()
+    simulation = Simulation()
 
     kernel = LBMKernel(KernelType.CompressibleCumulantFourthOrderViscosity)
     kernel.use_forcing = True
@@ -21,18 +21,18 @@ def simulate_poiseuille_flow(physical_params, grid_params, sim_params):
     writer.output_path = "./output"
     writer.type = WriterType.BINARY
 
-    builder.set_kernel_config(kernel)
-    builder.set_physical_parameters(physical_params)
-    builder.set_grid_parameters(grid_params)
-    builder.set_simulation_parameters(sim_params)
-    builder.set_writer(writer)
+    simulation.set_kernel_config(kernel)
+    simulation.set_physical_parameters(physical_params)
+    simulation.set_grid_parameters(grid_params)
+    simulation.set_simulation_parameters(sim_params)
+    simulation.set_writer(writer)
 
     no_slip_adapter = NoSlipBCAdapter()
     no_slip_adapter.algorithm = NoSlipBCAlgorithm()
-    builder.add_bc_adapter(no_slip_adapter)
+    simulation.add_bc_adapter(no_slip_adapter)
 
     block_length = 3 * grid_params.delta_x
-    builder.add_object(
+    simulation.add_object(
         GbCuboid3D(g_min_x1 - block_length,
                    g_min_x2 - block_length,
                    g_min_x3 - block_length,
@@ -42,7 +42,7 @@ def simulate_poiseuille_flow(physical_params, grid_params, sim_params):
         no_slip_adapter,
         1, "/geo/addWallZMin")
 
-    builder.add_object(
+    simulation.add_object(
         GbCuboid3D(g_min_x1 - block_length,
                    g_min_x2 - block_length,
                    g_max_x3,
@@ -52,4 +52,4 @@ def simulate_poiseuille_flow(physical_params, grid_params, sim_params):
         no_slip_adapter,
         1, "/geo/addWallZMax")
 
-    builder.run_simulation()
+    simulation.run_simulation()
diff --git a/Python/test_boundaryconditions.py b/Python/test_boundaryconditions.py
index 9af40a00279bee99909aa7c3d5270ae4e7a1e3ae..3a59cbbe37a3584f624d9b92a320e1ff36b3e4da 100644
--- a/Python/test_boundaryconditions.py
+++ b/Python/test_boundaryconditions.py
@@ -1,4 +1,4 @@
-from virtualfluids.boundaryconditions import *
+from pyfluids.boundaryconditions import *
 
 no_slip_algo = NoSlipBCAlgorithm()
 no_slip_bc_adapter = NoSlipBCAdapter()
diff --git a/Python/test_cubeflow.py b/Python/test_cubeflow.py
index 627beaa512182b2d4027626335beb738a503a972..89c2d93fc112e00ec3c4623e797dbdb9f651a9b3 100644
--- a/Python/test_cubeflow.py
+++ b/Python/test_cubeflow.py
@@ -2,8 +2,8 @@ from virtualfluids.geometry import GbCuboid3D
 from virtualfluids.boundaryconditions import NoSlipBCAlgorithm, NoSlipBCAdapter, VelocityBCAdapter, DensityBCAdapter, \
     VelocityBCAlgorithm, NonReflectingOutflowBCAlgorithm
 from virtualfluids.parameters import PhysicalParameters, SimulationParameters, GridParameters
-from virtualfluids.kernel import CompressibleCumulantFourthOrderViscosityKernel
-from virtualfluids.builder import VirtualFluidsBuilder
+from virtualfluids.kernel import LBMKernel, KernelType
+from virtualfluids.simulation import Simulation
 from virtualfluids.writer import Writer, WriterType
 from pymuparser import Parser
 
@@ -27,7 +27,7 @@ grid_parameters.periodic_boundary_in_x3 = True
 
 sim_parameters = SimulationParameters()
 sim_parameters.timestep_log_interval = 1000
-sim_parameters.number_of_timesteps = 1000000
+sim_parameters.number_of_timesteps = 1000
 sim_parameters.number_of_threads = 4
 
 wall_thickness = 3 * grid_parameters.delta_x
@@ -67,7 +67,7 @@ velocity_function.expression = "u"
 velocity_bc = VelocityBCAdapter(True, False, False, velocity_function, 0, -10)
 velocity_bc.algorithm = VelocityBCAlgorithm()
 
-kernel = CompressibleCumulantFourthOrderViscosityKernel()
+kernel = LBMKernel(KernelType.CompressibleCumulantFourthOrderViscosity)
 # kernel.use_forcing = True
 # kernel.forcing_in_x1 = 3e-6
 
@@ -75,7 +75,7 @@ writer = Writer()
 writer.output_path = "./output"
 writer.type = WriterType.BINARY
 
-builder = VirtualFluidsBuilder(communicator_type="mpi")
+builder = Simulation()
 builder.set_writer(writer)
 
 builder.set_physical_parameters(physical_parameters)
diff --git a/Python/test_geometry.py b/Python/test_geometry.py
index 2718d997237d52f024a37310b947f8bdd42d9c59..301542c3f32f84a1c2cce8cb635af8dfee7225e7 100644
--- a/Python/test_geometry.py
+++ b/Python/test_geometry.py
@@ -1,4 +1,4 @@
-from virtualfluids.geometry import *
+from pyfluids.geometry import *
 
 point1 = GbPoint3D(1, 2, 3)
 point2 = GbPoint3D(4, 5, 6)
diff --git a/Python/test_kernel.py b/Python/test_kernel.py
index 7e3758ccccbc30ce4f64b062de2d8fe31e03ff0e..0497eb351bc6d56a52d6f6d7337e86fc2f7c56d1 100644
--- a/Python/test_kernel.py
+++ b/Python/test_kernel.py
@@ -1,4 +1,4 @@
-from virtualfluids.kernel import LBMKernel, KernelType
+from pyfluids.kernel import LBMKernel, KernelType
 
 kernel = LBMKernel(KernelType.BGK)
 kernel.use_forcing = True
diff --git a/Python/test_lid_driven_cavity.py b/Python/test_lid_driven_cavity.py
index 4fb04a56d2ed9ea6e511c94779cb1e6980afb6d7..d06487e8231a6057f6eb34420f501e99916fc532 100644
--- a/Python/test_lid_driven_cavity.py
+++ b/Python/test_lid_driven_cavity.py
@@ -1,12 +1,12 @@
+from pyfluids import Simulation
+from pyfluids.boundaryconditions import NoSlipBCAdapter, NoSlipBCAlgorithm, VelocityBCAdapter, VelocityBCAlgorithm
+from pyfluids.geometry import GbCuboid3D
+from pyfluids.kernel import LBMKernel, KernelType
+from pyfluids.parameters import GridParameters, PhysicalParameters, SimulationParameters
 from pymuparser import Parser
-from virtualfluids.boundaryconditions import NoSlipBCAdapter, NoSlipBCAlgorithm, VelocityBCAdapter, VelocityBCAlgorithm
-from virtualfluids.builder import VirtualFluidsBuilder
-from virtualfluids.geometry import GbCuboid3D
-from virtualfluids.kernel import CumulantK17LBMKernelConfig
-from virtualfluids.parameters import GridParameters, PhysicalParameters, SimulationParameters
-
-builder = VirtualFluidsBuilder(communicator_type="mpi")
-kernel = CumulantK17LBMKernelConfig()
+
+builder = Simulation()
+kernel = LBMKernel(KernelType.CompressibleCumulantFourthOrderViscosity)
 
 sim_parameters = SimulationParameters()
 sim_parameters.number_of_threads = 4
diff --git a/Python/test_poiseuille_l2.py b/Python/test_poiseuille_l2.py
index 71ecb6fc606df31d2de268ec827330df2118e6d6..91c100a3b657f66ef0b97d54f23fb54b91d54a8f 100644
--- a/Python/test_poiseuille_l2.py
+++ b/Python/test_poiseuille_l2.py
@@ -4,7 +4,7 @@ import pyvista as pv
 from norms import l2_norm
 from poiseuille_analytical import poiseuille_at_heights, PoiseuilleSettings
 from poiseuille_flow import simulate_poiseuille_flow
-from virtualfluids.parameters import PhysicalParameters, GridParameters, SimulationParameters
+from pyfluids.parameters import PhysicalParameters, GridParameters, SimulationParameters
 from vtk_utilities import vertical_column_from_mesh, get_values_from_indices
 
 
diff --git a/Python/test_virtualfluids_help.py b/Python/test_virtualfluids_help.py
index 8f278ab2e77dbd15a55d886a94072240c0027259..8375dce8ac44800a406927269b9204692b4ffc4c 100644
--- a/Python/test_virtualfluids_help.py
+++ b/Python/test_virtualfluids_help.py
@@ -1,3 +1,2 @@
-import virtualfluids
-import virtualfluids.geometry
-help(virtualfluids)
\ No newline at end of file
+import pyfluids
+help(pyfluids)
\ No newline at end of file
diff --git a/src/cpu/pythonbindings/CMakeLists.txt b/src/cpu/pythonbindings/CMakeLists.txt
index b376be1ba09efa7395d137a70bfd295865457898..e3471cf3d17a576b1e387df173b86c265a950d5e 100644
--- a/src/cpu/pythonbindings/CMakeLists.txt
+++ b/src/cpu/pythonbindings/CMakeLists.txt
@@ -2,18 +2,18 @@ project(VirtualFluidsPython)
 
 file(GLOB SUBMODULE_SOURCES src/submodules/*.cpp)
 
-pybind11_add_module(virtualfluids src/VirtualfluidsModule.cpp)
+pybind11_add_module(pyfluids src/VirtualfluidsModule.cpp)
 pybind11_add_module(pymuparser src/muParser.cpp)
 
 # TODO: Move this to MuParser CMakeLists.txt
 set_target_properties(muparser PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
-target_compile_definitions(virtualfluids PRIVATE VF_METIS VF_MPI)
+target_compile_definitions(pyfluids PRIVATE VF_METIS VF_MPI)
 target_compile_definitions(pymuparser PRIVATE VF_METIS VF_MPI)
 
-target_link_libraries(virtualfluids PRIVATE VirtualFluidsBuilder VirtualFluidsCore muparser basics)
+target_link_libraries(pyfluids PRIVATE simulationconfig VirtualFluidsCore muparser basics)
 target_link_libraries(pymuparser PRIVATE muparser)
 
-install(TARGETS virtualfluids DESTINATION .)
+install(TARGETS pyfluids DESTINATION .)
 install(TARGETS pymuparser DESTINATION .)
 
diff --git a/src/cpu/pythonbindings/src/VirtualfluidsModule.cpp b/src/cpu/pythonbindings/src/VirtualfluidsModule.cpp
index b7591161bb8c2b52c6ee7dc1b958dae55c6b0c45..61c6005b9fbdd1108d9ffff374763cad95a5c40e 100644
--- a/src/cpu/pythonbindings/src/VirtualfluidsModule.cpp
+++ b/src/cpu/pythonbindings/src/VirtualfluidsModule.cpp
@@ -1,6 +1,6 @@
 #include <pybind11/pybind11.h>
 #include "submodules/boundaryconditions.cpp"
-#include "submodules/builder.cpp"
+#include "submodules/simulationconfig.cpp"
 #include "submodules/geometry.cpp"
 #include "submodules/kernel.cpp"
 #include "submodules/simulationparameters.cpp"
@@ -8,10 +8,10 @@
 
 namespace py = pybind11;
 
-PYBIND11_MODULE(virtualfluids, m)
+PYBIND11_MODULE(pyfluids, m)
 {
     makeBoundaryConditionsModule(m);
-    makeBuilderModule(m);
+    makeSimulationModule(m);
     makeGeometryModule(m);
     makeKernelModule(m);
     makeParametersModule(m);
diff --git a/src/cpu/pythonbindings/src/submodules/builder.cpp b/src/cpu/pythonbindings/src/submodules/builder.cpp
deleted file mode 100644
index 2afded56934bc6b78062bf374fa14cf370cca33c..0000000000000000000000000000000000000000
--- a/src/cpu/pythonbindings/src/submodules/builder.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <pybind11/pybind11.h>
-#include <VirtualFluidsBuilder/VirtualFluidsBuilder.h>
-
-namespace py = pybind11;
-
-void makeBuilderModule(py::module &parentModule)
-{
-    using namespace pybind11::literals;
-
-    py::module builderModule = parentModule.def_submodule("builder");
-
-    py::class_<VirtualFluidsBuilder, std::shared_ptr<VirtualFluidsBuilder>>(builderModule, "VirtualFluidsBuilder")
-            .def(py::init())
-            .def("set_writer", &VirtualFluidsBuilder::setWriterConfig)
-            .def("set_grid_parameters", &VirtualFluidsBuilder::setGridParameters)
-            .def("set_physical_parameters", &VirtualFluidsBuilder::setPhysicalParameters)
-            .def("set_simulation_parameters", &VirtualFluidsBuilder::setSimulationParameters)
-            .def("set_kernel_config", &VirtualFluidsBuilder::setKernelConfig)
-            .def("add_object", &VirtualFluidsBuilder::addObject)
-            .def("add_bc_adapter", &VirtualFluidsBuilder::addBCAdapter)
-            .def("run_simulation", &VirtualFluidsBuilder::run);
-
-
-}
\ No newline at end of file
diff --git a/src/cpu/pythonbindings/src/submodules/kernel.cpp b/src/cpu/pythonbindings/src/submodules/kernel.cpp
index dd6e81f67c38625e9c738dceeb051ce7887dfd0d..39e051384f98cef9f8040a7e9a71b32ea7dff97f 100644
--- a/src/cpu/pythonbindings/src/submodules/kernel.cpp
+++ b/src/cpu/pythonbindings/src/submodules/kernel.cpp
@@ -1,7 +1,7 @@
 #include <memory>
 #include <pybind11/pybind11.h>
-#include <VirtualFluidsBuilder/KernelFactory.h>
-#include <VirtualFluidsBuilder/KernelConfigStructs.h>
+#include <simulationconfig/KernelFactory.h>
+#include <simulationconfig/KernelConfigStructs.h>
 
 
 namespace py = pybind11;
diff --git a/src/cpu/pythonbindings/src/submodules/simulationconfig.cpp b/src/cpu/pythonbindings/src/submodules/simulationconfig.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..abda89306e59b909cb9c88c05824307346d8c9bf
--- /dev/null
+++ b/src/cpu/pythonbindings/src/submodules/simulationconfig.cpp
@@ -0,0 +1,22 @@
+#include <pybind11/pybind11.h>
+#include <simulationconfig/Simulation.h>
+
+namespace py = pybind11;
+
+void makeSimulationModule(py::module &parentModule)
+{
+    using namespace pybind11::literals;
+
+    py::class_<Simulation, std::shared_ptr<Simulation>>(parentModule, "Simulation")
+            .def(py::init())
+            .def("set_writer", &Simulation::setWriterConfig)
+            .def("set_grid_parameters", &Simulation::setGridParameters)
+            .def("set_physical_parameters", &Simulation::setPhysicalParameters)
+            .def("set_simulation_parameters", &Simulation::setSimulationParameters)
+            .def("set_kernel_config", &Simulation::setKernelConfig)
+            .def("add_object", &Simulation::addObject)
+            .def("add_bc_adapter", &Simulation::addBCAdapter)
+            .def("run_simulation", &Simulation::run);
+
+
+}
\ No newline at end of file
diff --git a/src/cpu/pythonbindings/src/submodules/simulationparameters.cpp b/src/cpu/pythonbindings/src/submodules/simulationparameters.cpp
index 7fbf79ba15122a940c7c9d8b3f39520e9264795b..ffb93d01f459624be3320fc5b248ce2b215b7c8c 100644
--- a/src/cpu/pythonbindings/src/submodules/simulationparameters.cpp
+++ b/src/cpu/pythonbindings/src/submodules/simulationparameters.cpp
@@ -1,6 +1,6 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
-#include <VirtualFluidsBuilder/SimulationParameters.h>
+#include <simulationconfig/SimulationParameters.h>
 
 namespace py = pybind11;
 
diff --git a/src/cpu/pythonbindings/src/submodules/writer.cpp b/src/cpu/pythonbindings/src/submodules/writer.cpp
index 7375819112ca4a9787521a28f33a43efbdb92760..4609bfa536d9bf80546f72882b4826460557b183 100644
--- a/src/cpu/pythonbindings/src/submodules/writer.cpp
+++ b/src/cpu/pythonbindings/src/submodules/writer.cpp
@@ -1,5 +1,5 @@
 #include <pybind11/pybind11.h>
-#include <VirtualFluidsBuilder/WriterConfig.h>
+#include <simulationconfig/WriterConfig.h>
 
 namespace py = pybind11;
 
diff --git a/src/cpu/simulationconfig/CMakeLists.txt b/src/cpu/simulationconfig/CMakeLists.txt
index fdf00184b34a6dab184eebfd78bd10b43cde4b11..4d55e1ae490bfa71ebe775879f3c9fbaba66d89b 100644
--- a/src/cpu/simulationconfig/CMakeLists.txt
+++ b/src/cpu/simulationconfig/CMakeLists.txt
@@ -1,17 +1,17 @@
 cmake_minimum_required(VERSION 3.1)
-project(VirtualFluidsBuilder)
+project(simulationconfig)
 
 set(VFBUILDER_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
-file(GLOB HEADERS ${VFBUILDER_INCLUDE_DIR}/VirtualFluidsBuilder/*.h)
+file(GLOB HEADERS ${VFBUILDER_INCLUDE_DIR}/simulationconfig/*.h)
 file(GLOB SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
 
-add_library(VirtualFluidsBuilder STATIC ${SRC} ${HEADERS})
+add_library(simulationconfig STATIC ${SRC} ${HEADERS})
 
-set_target_properties(VirtualFluidsBuilder PROPERTIES CXX_STANDARD 11 POSITION_INDEPENDENT_CODE ON)
+set_target_properties(simulationconfig PROPERTIES CXX_STANDARD 11 POSITION_INDEPENDENT_CODE ON)
 
-target_include_directories(VirtualFluidsBuilder PUBLIC ${VFBUILDER_INCLUDE_DIR})
-target_link_libraries(VirtualFluidsBuilder PRIVATE VirtualFluidsCore basics muparser)
-target_compile_definitions(VirtualFluidsBuilder PRIVATE VF_METIS VF_MPI)
+target_include_directories(simulationconfig PUBLIC ${VFBUILDER_INCLUDE_DIR})
+target_link_libraries(simulationconfig PRIVATE VirtualFluidsCore basics muparser)
+target_compile_definitions(simulationconfig PRIVATE VF_METIS VF_MPI)
 
 
diff --git a/src/cpu/simulationconfig/include/VirtualFluidsBuilder/AbstractLBMSystem.h b/src/cpu/simulationconfig/include/simulationconfig/AbstractLBMSystem.h
similarity index 95%
rename from src/cpu/simulationconfig/include/VirtualFluidsBuilder/AbstractLBMSystem.h
rename to src/cpu/simulationconfig/include/simulationconfig/AbstractLBMSystem.h
index 12e64187b57740d5e202bea994df06c6013270be..0c3ac72db2d3cb3488860227171f2fd27600c028 100644
--- a/src/cpu/simulationconfig/include/VirtualFluidsBuilder/AbstractLBMSystem.h
+++ b/src/cpu/simulationconfig/include/simulationconfig/AbstractLBMSystem.h
@@ -1,7 +1,3 @@
-//
-// Created by Sven Marcus on 20.08.20.
-//
-
 #ifndef VIRTUALFLUIDSPYTHONBINDINGS_ABSTRACTLBMSYSTEM_H
 #define VIRTUALFLUIDSPYTHONBINDINGS_ABSTRACTLBMSYSTEM_H
 
diff --git a/src/cpu/simulationconfig/include/VirtualFluidsBuilder/D3Q27LBMSystem.h b/src/cpu/simulationconfig/include/simulationconfig/D3Q27LBMSystem.h
similarity index 95%
rename from src/cpu/simulationconfig/include/VirtualFluidsBuilder/D3Q27LBMSystem.h
rename to src/cpu/simulationconfig/include/simulationconfig/D3Q27LBMSystem.h
index abfe3efc41de252dda84dde6452999a2fca2e83e..c9883a61a27aa3d44af61be11d5b809aaf7068ce 100644
--- a/src/cpu/simulationconfig/include/VirtualFluidsBuilder/D3Q27LBMSystem.h
+++ b/src/cpu/simulationconfig/include/simulationconfig/D3Q27LBMSystem.h
@@ -1,7 +1,3 @@
-//
-// Created by Sven Marcus on 20.08.20.
-//
-
 #ifndef VIRTUALFLUIDSPYTHONBINDINGS_D3Q27LBMSYSTEM_H
 #define VIRTUALFLUIDSPYTHONBINDINGS_D3Q27LBMSYSTEM_H
 
diff --git a/src/cpu/simulationconfig/include/VirtualFluidsBuilder/KernelConfigStructs.h b/src/cpu/simulationconfig/include/simulationconfig/KernelConfigStructs.h
similarity index 91%
rename from src/cpu/simulationconfig/include/VirtualFluidsBuilder/KernelConfigStructs.h
rename to src/cpu/simulationconfig/include/simulationconfig/KernelConfigStructs.h
index 41b359711ee23ecb94fcd632f675af21c23d614e..b70de7f9bdbddb80bcae4e297a1ac2304e32211d 100644
--- a/src/cpu/simulationconfig/include/VirtualFluidsBuilder/KernelConfigStructs.h
+++ b/src/cpu/simulationconfig/include/simulationconfig/KernelConfigStructs.h
@@ -1,7 +1,3 @@
-//
-// Created by Sven Marcus on 10.09.20.
-//
-
 #ifndef VIRTUALFLUIDSPYTHONBINDINGS_KERNELCONFIGSTRUCTS_H
 #define VIRTUALFLUIDSPYTHONBINDINGS_KERNELCONFIGSTRUCTS_H
 
diff --git a/src/cpu/simulationconfig/include/VirtualFluidsBuilder/KernelFactory.h b/src/cpu/simulationconfig/include/simulationconfig/KernelFactory.h
similarity index 93%
rename from src/cpu/simulationconfig/include/VirtualFluidsBuilder/KernelFactory.h
rename to src/cpu/simulationconfig/include/simulationconfig/KernelFactory.h
index 206d65c5f53fa31c948923f9b2dab7b4550c692e..6b151d96f9c538bcfbf3aeb693afd56e36e6cf35 100644
--- a/src/cpu/simulationconfig/include/VirtualFluidsBuilder/KernelFactory.h
+++ b/src/cpu/simulationconfig/include/simulationconfig/KernelFactory.h
@@ -1,7 +1,3 @@
-//
-// Created by Sven Marcus on 20.08.20.
-//
-
 #ifndef VIRTUALFLUIDSPYTHONBINDINGS_KERNELFACTORY_H
 #define VIRTUALFLUIDSPYTHONBINDINGS_KERNELFACTORY_H
 
diff --git a/src/cpu/simulationconfig/include/VirtualFluidsBuilder/VirtualFluidsBuilder.h b/src/cpu/simulationconfig/include/simulationconfig/Simulation.h
similarity index 96%
rename from src/cpu/simulationconfig/include/VirtualFluidsBuilder/VirtualFluidsBuilder.h
rename to src/cpu/simulationconfig/include/simulationconfig/Simulation.h
index d0b45e4748e7f2a306a9eebe9ed58eb248291b59..f003999c444d7b8e6423b25e94e2e0cbe5e993c8 100644
--- a/src/cpu/simulationconfig/include/VirtualFluidsBuilder/VirtualFluidsBuilder.h
+++ b/src/cpu/simulationconfig/include/simulationconfig/Simulation.h
@@ -18,7 +18,7 @@
 #include "WriterConfig.h"
 
 
-class VirtualFluidsBuilder {
+class Simulation {
 private:
     KernelFactory kernelFactory = KernelFactory();
 
@@ -39,9 +39,9 @@ private:
     WriterConfig &writerConfig = *(new WriterConfig());
 
 public:
-    explicit VirtualFluidsBuilder();
+    explicit Simulation();
 
-    ~VirtualFluidsBuilder();
+    ~Simulation();
 
     WriterConfig &getWriterConfig();
 
diff --git a/src/cpu/simulationconfig/include/VirtualFluidsBuilder/SimulationParameters.h b/src/cpu/simulationconfig/include/simulationconfig/SimulationParameters.h
similarity index 94%
rename from src/cpu/simulationconfig/include/VirtualFluidsBuilder/SimulationParameters.h
rename to src/cpu/simulationconfig/include/simulationconfig/SimulationParameters.h
index ec478dcbe5e5af1d2608d61ca9261a0857a767e8..41cf95fb80037fe1275d4505cc91ffe0531d1465 100644
--- a/src/cpu/simulationconfig/include/VirtualFluidsBuilder/SimulationParameters.h
+++ b/src/cpu/simulationconfig/include/simulationconfig/SimulationParameters.h
@@ -1,7 +1,3 @@
-//
-// Created by Sven Marcus on 11.09.20.
-//
-
 #ifndef VIRTUALFLUIDSPYTHONBINDINGS_SIMULATIONPARAMETERS_H
 #define VIRTUALFLUIDSPYTHONBINDINGS_SIMULATIONPARAMETERS_H
 
diff --git a/src/cpu/simulationconfig/include/VirtualFluidsBuilder/WriterConfig.h b/src/cpu/simulationconfig/include/simulationconfig/WriterConfig.h
similarity index 93%
rename from src/cpu/simulationconfig/include/VirtualFluidsBuilder/WriterConfig.h
rename to src/cpu/simulationconfig/include/simulationconfig/WriterConfig.h
index ecb17e994a47b6da2fa9df25765670f93e2a43f3..0caf25d94f264dd488ac7130274e351c0597fc89 100644
--- a/src/cpu/simulationconfig/include/VirtualFluidsBuilder/WriterConfig.h
+++ b/src/cpu/simulationconfig/include/simulationconfig/WriterConfig.h
@@ -1,7 +1,3 @@
-//
-// Created by Sven Marcus on 23.09.20.
-//
-
 #ifndef VIRTUALFLUIDSPYTHONBINDINGS_WRITERCONFIG_H
 #define VIRTUALFLUIDSPYTHONBINDINGS_WRITERCONFIG_H
 
diff --git a/src/cpu/simulationconfig/src/D3Q27LBMSystem.cpp b/src/cpu/simulationconfig/src/D3Q27LBMSystem.cpp
index 1500afaaf7eba48f6c1708d333e3b78c5cce22f3..b1a01ca7b05fedcbc7a66a0de3cdcfa33f3b0722 100644
--- a/src/cpu/simulationconfig/src/D3Q27LBMSystem.cpp
+++ b/src/cpu/simulationconfig/src/D3Q27LBMSystem.cpp
@@ -1,8 +1,4 @@
-//
-// Created by Sven Marcus on 20.08.20.
-//
-
-#include "VirtualFluidsBuilder/D3Q27LBMSystem.h"
+#include "simulationconfig/D3Q27LBMSystem.h"
 #include <Interactors/D3Q27Interactor.h>
 #include <LBM/D3Q27System.h>
 
diff --git a/src/cpu/simulationconfig/src/KernelFactory.cpp b/src/cpu/simulationconfig/src/KernelFactory.cpp
index 196eaca1b7a4ff9179d8049a4b9e9e47f4d609a5..87e6912bf974a97278965480c293f5408ee475fa 100644
--- a/src/cpu/simulationconfig/src/KernelFactory.cpp
+++ b/src/cpu/simulationconfig/src/KernelFactory.cpp
@@ -1,12 +1,8 @@
-//
-// Created by Sven Marcus on 20.08.20.
-//
-
-#include "VirtualFluidsBuilder/KernelFactory.h"
 #include <LBM/LBMKernel.h>
 #include <LBM/CompressibleCumulant4thOrderViscosityLBMKernel.h>
 #include <LBM/BGKLBMKernel.h>
-#include <VirtualFluidsBuilder/D3Q27LBMSystem.h>
+#include <simulationconfig/D3Q27LBMSystem.h>
+#include "simulationconfig/KernelFactory.h"
 
 std::shared_ptr<LBMKernel> KernelFactory::makeKernel(KernelType kernelType)
 {
diff --git a/src/cpu/simulationconfig/src/VirtualFluidsBuilder.cpp b/src/cpu/simulationconfig/src/Simulation.cpp
similarity index 80%
rename from src/cpu/simulationconfig/src/VirtualFluidsBuilder.cpp
rename to src/cpu/simulationconfig/src/Simulation.cpp
index 8bdb2370743279776411924296301990303fd849..32c63087dc153ca510badd51734141423ebeb91e 100644
--- a/src/cpu/simulationconfig/src/VirtualFluidsBuilder.cpp
+++ b/src/cpu/simulationconfig/src/Simulation.cpp
@@ -28,11 +28,11 @@
 #include <Visitors/SetConnectorsBlockVisitor.h>
 #include <Visitors/SetKernelBlockVisitor.h>
 
-#include <VirtualFluidsBuilder/SimulationParameters.h>
-#include <VirtualFluidsBuilder/VirtualFluidsBuilder.h>
+#include <simulationconfig/SimulationParameters.h>
+#include <simulationconfig/Simulation.h>
 
 
-VirtualFluidsBuilder::VirtualFluidsBuilder()
+Simulation::Simulation()
 {
     this->communicator = MPICommunicator::getInstance();
     this->grid = SPtr<Grid3D>(new Grid3D(communicator));
@@ -41,24 +41,24 @@ VirtualFluidsBuilder::VirtualFluidsBuilder()
     this->registeredAdapters = std::set<SPtr<BCAdapter>>();
 }
 
-void VirtualFluidsBuilder::setGridParameters(SPtr<GridParameters> parameters)
+void Simulation::setGridParameters(SPtr<GridParameters> parameters)
 {
     this->gridParameters = std::move(parameters);
 }
 
-void VirtualFluidsBuilder::setPhysicalParameters(SPtr<PhysicalParameters> parameters)
+void Simulation::setPhysicalParameters(SPtr<PhysicalParameters> parameters)
 {
     this->physicalParameters = std::move(parameters);
 }
 
-void VirtualFluidsBuilder::setSimulationParameters(SPtr<SimulationParameters> parameters)
+void Simulation::setSimulationParameters(SPtr<SimulationParameters> parameters)
 {
     this->simulationParameters = std::move(parameters);
 }
 
 void
-VirtualFluidsBuilder::addObject(const SPtr<GbObject3D> &object, const SPtr<BCAdapter> &bcAdapter, int state,
-                                const std::string &folderPath)
+Simulation::addObject(const SPtr<GbObject3D> &object, const SPtr<BCAdapter> &bcAdapter, int state,
+                      const std::string &folderPath)
 {
     const bool is_in = registeredAdapters.find(bcAdapter) != registeredAdapters.end();
     if (!is_in) addBCAdapter(bcAdapter);
@@ -66,30 +66,30 @@ VirtualFluidsBuilder::addObject(const SPtr<GbObject3D> &object, const SPtr<BCAda
     GbSystem3D::writeGeoObject(object, writerConfig.outputPath + folderPath, writerConfig.getWriter());
 }
 
-void VirtualFluidsBuilder::addBCAdapter(const SPtr<BCAdapter> &bcAdapter)
+void Simulation::addBCAdapter(const SPtr<BCAdapter> &bcAdapter)
 {
     registeredAdapters.insert(bcAdapter);
     this->bcVisitor.addBC(bcAdapter);
 }
 
-void VirtualFluidsBuilder::setKernelConfig(const SPtr<LBMKernelConfig> &kernel)
+void Simulation::setKernelConfig(const SPtr<LBMKernelConfig> &kernel)
 {
     this->kernelConfig = kernel;
     this->lbmKernel = kernelFactory.makeKernel(kernel->kernelType);
     this->lbmSystem = kernelFactory.makeLBMSystem(kernel->kernelType);
 }
 
-void VirtualFluidsBuilder::setWriterConfig(const WriterConfig &config)
+void Simulation::setWriterConfig(const WriterConfig &config)
 {
     this->writerConfig = config;
 }
 
-WriterConfig &VirtualFluidsBuilder::getWriterConfig()
+WriterConfig &Simulation::getWriterConfig()
 {
     return writerConfig;
 }
 
-void VirtualFluidsBuilder::run()
+void Simulation::run()
 {
     UBLOG(logINFO, "Beginning simulation setup")
     grid->setDeltaX(gridParameters->deltaX);
@@ -169,8 +169,8 @@ void VirtualFluidsBuilder::run()
 }
 
 void
-VirtualFluidsBuilder::setKernelForcing(const SPtr<LBMKernel> &kernel,
-                                       std::shared_ptr<LBMUnitConverter> &converter) const
+Simulation::setKernelForcing(const SPtr<LBMKernel> &kernel,
+                             std::shared_ptr<LBMUnitConverter> &converter) const
 {
     kernel->setWithForcing(kernelConfig->useForcing);
     kernel->setForcingX1(kernelConfig->forcingX1 * converter->getFactorForceWToLb());
@@ -178,14 +178,14 @@ VirtualFluidsBuilder::setKernelForcing(const SPtr<LBMKernel> &kernel,
     kernel->setForcingX3(kernelConfig->forcingX3 * converter->getFactorForceWToLb());
 }
 
-void VirtualFluidsBuilder::logSimulationData(const int &nodesInX1, const int &nodesInX2, const int &nodesInX3) const
+void Simulation::logSimulationData(const int &nodesInX1, const int &nodesInX2, const int &nodesInX3) const
 {
     UBLOG(logINFO, "Domain size = " << nodesInX1 << " x " << nodesInX2 << " x " << nodesInX3)
     UBLOG(logINFO, "dx          = " << gridParameters->deltaX << " m")
     UBLOG(logINFO, "latticeViscosity    = " << physicalParameters->latticeViscosity)
 }
 
-void VirtualFluidsBuilder::generateBlockGrid(const SPtr<GbObject3D> &gridCube) const
+void Simulation::generateBlockGrid(const SPtr<GbObject3D> &gridCube) const
 {
     UBLOG(logINFO, "Generate block grid")
     GenBlocksGridVisitor genBlocks(gridCube);
@@ -193,7 +193,7 @@ void VirtualFluidsBuilder::generateBlockGrid(const SPtr<GbObject3D> &gridCube) c
     writeBlocks();
 }
 
-void VirtualFluidsBuilder::setBoundaryConditionProcessor(const SPtr<LBMKernel> &kernel)
+void Simulation::setBoundaryConditionProcessor(const SPtr<LBMKernel> &kernel)
 {
     UBLOG(logINFO, "Create boundary conditions processor")
     SPtr<BCProcessor> bcProc;
@@ -201,7 +201,7 @@ void VirtualFluidsBuilder::setBoundaryConditionProcessor(const SPtr<LBMKernel> &
     kernel->setBCProcessor(bcProc);
 }
 
-void VirtualFluidsBuilder::setBlockSize(const int &nodesInX1, const int &nodesInX2, const int &nodesInX3) const
+void Simulation::setBlockSize(const int &nodesInX1, const int &nodesInX2, const int &nodesInX3) const
 {
     int blockSizeX1 = nodesInX1 / gridParameters->blocksPerDirection[0];
     int blockSizeX2 = nodesInX2 / gridParameters->blocksPerDirection[1];
@@ -213,14 +213,14 @@ void VirtualFluidsBuilder::setBlockSize(const int &nodesInX1, const int &nodesIn
 }
 
 std::shared_ptr<LBMUnitConverter>
-VirtualFluidsBuilder::makeLBMUnitConverter()
+Simulation::makeLBMUnitConverter()
 {
     return SPtr<LBMUnitConverter>(new LBMUnitConverter());
 }
 
 SPtr<CoProcessor>
-VirtualFluidsBuilder::makeMacroscopicQuantitiesCoProcessor(const std::shared_ptr<LBMUnitConverter> &converter,
-                                                           const SPtr<UbScheduler> &visSch) const
+Simulation::makeMacroscopicQuantitiesCoProcessor(const std::shared_ptr<LBMUnitConverter> &converter,
+                                                 const SPtr<UbScheduler> &visSch) const
 {
     SPtr<CoProcessor> mqCoProcessor(
             new WriteMacroscopicQuantitiesCoProcessor(grid, visSch, writerConfig.outputPath, writerConfig.getWriter(),
@@ -230,7 +230,7 @@ VirtualFluidsBuilder::makeMacroscopicQuantitiesCoProcessor(const std::shared_ptr
     return mqCoProcessor;
 }
 
-void VirtualFluidsBuilder::writeBoundaryConditions() const
+void Simulation::writeBoundaryConditions() const
 {
     SPtr<UbScheduler> geoSch(new UbScheduler(1));
     WriteBoundaryConditionsCoProcessor ppgeo(grid, geoSch, writerConfig.outputPath, writerConfig.getWriter(),
@@ -238,7 +238,7 @@ void VirtualFluidsBuilder::writeBoundaryConditions() const
     ppgeo.process(0);
 }
 
-void VirtualFluidsBuilder::writeBlocks() const
+void Simulation::writeBlocks() const
 {
     UBLOG(logINFO, "Write block grid to VTK-file")
     SPtr<CoProcessor> ppblocks(
@@ -253,8 +253,8 @@ void VirtualFluidsBuilder::writeBlocks() const
 }
 
 SPtr<GbObject3D>
-VirtualFluidsBuilder::makeSimulationBoundingBox(const int &nodesInX1, const int &nodesInX2,
-                                                const int &nodesInX3) const
+Simulation::makeSimulationBoundingBox(const int &nodesInX1, const int &nodesInX2,
+                                      const int &nodesInX3) const
 {
     double minX1 = 0, minX2 = 0, minX3 = 0;
     const double maxX1 = minX1 + gridParameters->deltaX * nodesInX1;
@@ -270,4 +270,4 @@ VirtualFluidsBuilder::makeSimulationBoundingBox(const int &nodesInX1, const int
     return gridCube;
 }
 
-VirtualFluidsBuilder::~VirtualFluidsBuilder() = default;
+Simulation::~Simulation() = default;