diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 10f582ec0..bfd339c16 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -14,11 +14,11 @@
 
 /img @pdschubert
 
-/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEInstInteractionAnalysis.h @pdschubert @vulder
-/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/ @fabianbs96
-/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEExtendedTaintAnalysis.h @fabianbs96
-/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEExtendedTaintAnalysis.cpp @fabianbs96
-/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/ @fabianbs96
+/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysis.h @pdschubert @vulder
+/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/ @fabianbs96
+/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.h @fabianbs96
+/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.cpp @fabianbs96
+/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/ @fabianbs96
 
 /include/phasar/PhasarLLVM/AnalysisStrategy/ @pdschubert
 
diff --git a/BreakingChanges.md b/BreakingChanges.md
index 2d8fd3dc0..0addc2d26 100644
--- a/BreakingChanges.md
+++ b/BreakingChanges.md
@@ -2,7 +2,21 @@
 
 ## development HEAD
 
-- `LLVMPointsTo*` has been renamed to `LLVMAlias*`
+- Renamed `phasar/PhasarLLVM/DataFlowSolver/` to either `phasar/DataFlow/` or `phasar/PhasarLLVM/DataFlow/` depending on whether the components need LLVMCore. Analoguous changes in `lib/` and `unittests/`.
+    An incomplete list of moved/renamed files:
+    - `phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/*` => `phasar/DataFlow/IfdsIde/Solver/*`
+    - `phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IDETabulationProblem.h` => `phasar/DataFlow/IfdsIde/IDETabulationProblem.h`
+    - `phasar/DB/LLVMProjectIRDB.h` => `phasar/PhasarLLVM/DB/LLVMProjectIRDB.h`
+    - ...
+- Renamed and split up some libraries:
+    - `phasar_phasarllvm_utils` => `phasar_llvm_utils`
+    - `phasar_typehierarchy` => `phasar_llvm_typehierarchy`
+    - `phasar_ifdside` => `phasar_llvm_ifdside`
+    - `phasar_controlflow` has its LLVM dependent stuff moved to `phasar_llvm_controlflow`
+    - `phasar_db` has its LLVM dependent stuff moved to `phasar_llvm_db`
+    - `phasar_pointer` has its LLVM dependent stuff moved to `phasar_llvm_pointer`
+- Renamed the phasar tool `phasar-llvm` to `phasar-cli`
+- `LLVMPointsTo[.*]` has been renamed to `LLVMAlias[.*]`
 - The ctor of `LLVMAliasSet` now takes the `LLVMProjectIRDB` as pointer instead of a reference to better document that it may capture the IRDB by reference.
 - The `PointsToInfo` interface has been replaced by the CRTP interface `AliasInfoBase`. Introduced two type-erased implementation of that interface: `AliasInfo` and `AliasInfoRef`. In most cases you should replace `PointsToInfo*` and `LLVMPointsToInfo*` by `AliasInfoRef`, bzw. `LLVMAliasInfoRef`.
 - Introduced a new interface `PointsToInfoBase` and type-erased implementations `PointstoInfo` and `PointsToInfoRef`. Don't confuse them with the old `PointsToInfo`!!! (However, they have different APIs, so you should encounter compilation errors then)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b40adea2..b512cce5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -309,7 +309,7 @@ endif()
 
 set(INCLUDE_INSTALL_DIR include/ CACHE PATH "Install dir of headers")
 
-# Install targets of phasar-llvm, other executables, and libraries are to be
+# Install targets of phasar-cli, other executables, and libraries are to be
 # found in the individual subdirectories of tools/
 
 # Install Phasar include directory
diff --git a/Dockerfile b/Dockerfile
index 527a7741c..7bc1363f0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,4 +58,4 @@ RUN mkdir -p build && cd build && \
             -G Ninja && \
           cmake --build .
 
-ENTRYPOINT [ "./build/tools/phasar-llvm/phasar-llvm" ]
+ENTRYPOINT [ "./build/tools/phasar-cli/phasar-cli" ]
diff --git a/README.md b/README.md
index 4bd600cff..27fa3c817 100644
--- a/README.md
+++ b/README.md
@@ -131,12 +131,12 @@ Use them as a reference if you wish to modify PhASAR and recompile it.
 
 After compilation using cmake the following two binaries can be found in the build/ directory:
 
-+ phasar-llvm - the actual PhASAR command-line tool
++ phasar-cli - the actual PhASAR command-line tool (previously called `phasar-llvm`)
 + myphasartool - an example tool that shows how tools can be build on top of PhASAR
 
 Use the command:
 
-`$ ./phasar-llvm --help`
+`$ ./phasar-cli --help`
 
 in order to display the manual and help message.
 
@@ -167,7 +167,7 @@ C++'s long compile times are always a pain. As shown in the above, when using cm
 ### Running a test solver
 To test if everything works as expected please run the following command:
 
-`$ phasar-llvm --module test/build_systems_tests/installation_tests/module.ll -D ifds-solvertest`
+`$ phasar-cli -m test/build_systems_tests/installation_tests/module.ll -D ifds-solvertest`
 
 If you obtain output other than a segmentation fault or an exception terminating the program abnormally everything works as expected.
 
diff --git a/cmake/phasar_macros.cmake b/cmake/phasar_macros.cmake
index 3ec6f49bb..67f68741b 100644
--- a/cmake/phasar_macros.cmake
+++ b/cmake/phasar_macros.cmake
@@ -16,17 +16,21 @@ function(add_phasar_unittest test_name)
     LINK_PUBLIC
     phasar_config
     phasar_controller
+    phasar_llvm_controlflow
     phasar_controlflow
-    phasar_phasarllvm_utils
+    phasar_llvm_utils
     phasar_analysis_strategy
-    phasar_ifdside
+    phasar_llvm_ifdside
     phasar_utils
     phasar_mono
+    phasar_llvm_db
     phasar_db
     # phasar_clang
     phasar_passes
+    phasar_llvm_pointer
     phasar_pointer
-    phasar_typehierarchy
+    phasar_llvm_typehierarchy
+    phasar_llvm
     phasar_taintconfig
     nlohmann_json_schema_validator
     ${SQLITE3_LIBRARY}
diff --git a/examples/llvm-hello-world/main.cpp b/examples/llvm-hello-world/main.cpp
index fe8d6f776..3cb439b21 100644
--- a/examples/llvm-hello-world/main.cpp
+++ b/examples/llvm-hello-world/main.cpp
@@ -1,6 +1,3 @@
-#include <memory>
-#include <string>
-
 #include "llvm/IR/DebugLoc.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/Instruction.h"
@@ -15,6 +12,9 @@
 #include "llvm/Support/SourceMgr.h"
 #include "llvm/Support/raw_ostream.h"
 
+#include <memory>
+#include <string>
+
 int main(int argc, char **argv) {
   if (argc != 2) {
     llvm::errs() << "usage: <prog> <IR file>\n";
diff --git a/include/phasar/PhasarLLVM/AnalysisStrategy/AnalysisSetup.h b/include/phasar/AnalysisStrategy/AnalysisSetup.h
similarity index 100%
rename from include/phasar/PhasarLLVM/AnalysisStrategy/AnalysisSetup.h
rename to include/phasar/AnalysisStrategy/AnalysisSetup.h
diff --git a/include/phasar/PhasarLLVM/AnalysisStrategy/DemandDrivenAnalysis.h b/include/phasar/AnalysisStrategy/DemandDrivenAnalysis.h
similarity index 100%
rename from include/phasar/PhasarLLVM/AnalysisStrategy/DemandDrivenAnalysis.h
rename to include/phasar/AnalysisStrategy/DemandDrivenAnalysis.h
diff --git a/include/phasar/PhasarLLVM/AnalysisStrategy/IncrementalUpdateAnalysis.h b/include/phasar/AnalysisStrategy/IncrementalUpdateAnalysis.h
similarity index 100%
rename from include/phasar/PhasarLLVM/AnalysisStrategy/IncrementalUpdateAnalysis.h
rename to include/phasar/AnalysisStrategy/IncrementalUpdateAnalysis.h
diff --git a/include/phasar/PhasarLLVM/AnalysisStrategy/ModuleWiseAnalysis.h b/include/phasar/AnalysisStrategy/ModuleWiseAnalysis.h
similarity index 100%
rename from include/phasar/PhasarLLVM/AnalysisStrategy/ModuleWiseAnalysis.h
rename to include/phasar/AnalysisStrategy/ModuleWiseAnalysis.h
diff --git a/include/phasar/PhasarLLVM/AnalysisStrategy/Strategies.def b/include/phasar/AnalysisStrategy/Strategies.def
similarity index 100%
rename from include/phasar/PhasarLLVM/AnalysisStrategy/Strategies.def
rename to include/phasar/AnalysisStrategy/Strategies.def
diff --git a/include/phasar/PhasarLLVM/AnalysisStrategy/Strategies.h b/include/phasar/AnalysisStrategy/Strategies.h
similarity index 94%
rename from include/phasar/PhasarLLVM/AnalysisStrategy/Strategies.h
rename to include/phasar/AnalysisStrategy/Strategies.h
index 91c38d0f1..16c17655e 100644
--- a/include/phasar/PhasarLLVM/AnalysisStrategy/Strategies.h
+++ b/include/phasar/AnalysisStrategy/Strategies.h
@@ -24,7 +24,7 @@ namespace psr {
 enum class AnalysisStrategy {
   None,
 #define ANALYSIS_STRATEGY_TYPES(NAME, CMDFLAG, DESC) NAME,
-#include "phasar/PhasarLLVM/AnalysisStrategy/Strategies.def"
+#include "phasar/AnalysisStrategy/Strategies.def"
 
 };
 
diff --git a/include/phasar/PhasarLLVM/AnalysisStrategy/VariationalAnalysis.h b/include/phasar/AnalysisStrategy/VariationalAnalysis.h
similarity index 86%
rename from include/phasar/PhasarLLVM/AnalysisStrategy/VariationalAnalysis.h
rename to include/phasar/AnalysisStrategy/VariationalAnalysis.h
index 7ab61ff4d..3211a0091 100644
--- a/include/phasar/PhasarLLVM/AnalysisStrategy/VariationalAnalysis.h
+++ b/include/phasar/AnalysisStrategy/VariationalAnalysis.h
@@ -10,8 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_ANALYSISSTRATEGY_VARIATIONALANALYSIS_H_
 #define PHASAR_PHASARLLVM_ANALYSISSTRATEGY_VARIATIONALANALYSIS_H_
 
-#include "phasar/PhasarLLVM/AnalysisStrategy/AnalysisSetup.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Solver/IntraMonoSolver.h"
+#include "phasar/AnalysisStrategy/AnalysisSetup.h"
 
 #include <type_traits>
 
diff --git a/include/phasar/PhasarLLVM/ControlFlow/CFGBase.h b/include/phasar/ControlFlow/CFGBase.h
similarity index 100%
rename from include/phasar/PhasarLLVM/ControlFlow/CFGBase.h
rename to include/phasar/ControlFlow/CFGBase.h
diff --git a/include/phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.def b/include/phasar/ControlFlow/CallGraphAnalysisType.def
similarity index 100%
rename from include/phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.def
rename to include/phasar/ControlFlow/CallGraphAnalysisType.def
diff --git a/include/phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.h b/include/phasar/ControlFlow/CallGraphAnalysisType.h
similarity index 92%
rename from include/phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.h
rename to include/phasar/ControlFlow/CallGraphAnalysisType.h
index 99bbda20c..31d6193ce 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.h
+++ b/include/phasar/ControlFlow/CallGraphAnalysisType.h
@@ -18,7 +18,7 @@
 namespace psr {
 enum class CallGraphAnalysisType {
 #define CALL_GRAPH_ANALYSIS_TYPE(NAME, CMDFLAG, DESC) NAME,
-#include "phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.def"
+#include "phasar/ControlFlow/CallGraphAnalysisType.def"
   Invalid
 };
 
diff --git a/include/phasar/PhasarLLVM/ControlFlow/ICFGBase.h b/include/phasar/ControlFlow/ICFGBase.h
similarity index 99%
rename from include/phasar/PhasarLLVM/ControlFlow/ICFGBase.h
rename to include/phasar/ControlFlow/ICFGBase.h
index 308b51ed4..e85520de2 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/ICFGBase.h
+++ b/include/phasar/ControlFlow/ICFGBase.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_CONTROLFLOW_ICFGBASE_H
 #define PHASAR_PHASARLLVM_CONTROLFLOW_ICFGBASE_H
 
-#include "phasar/PhasarLLVM/ControlFlow/CFGBase.h"
+#include "phasar/ControlFlow/CFGBase.h"
 #include "phasar/Utils/TypeTraits.h"
 
 #include "llvm/ADT/StringRef.h"
diff --git a/include/phasar/PhasarLLVM/ControlFlow/SpecialMemberFunctionType.def b/include/phasar/ControlFlow/SpecialMemberFunctionType.def
similarity index 100%
rename from include/phasar/PhasarLLVM/ControlFlow/SpecialMemberFunctionType.def
rename to include/phasar/ControlFlow/SpecialMemberFunctionType.def
diff --git a/include/phasar/PhasarLLVM/ControlFlow/SpecialMemberFunctionType.h b/include/phasar/ControlFlow/SpecialMemberFunctionType.h
similarity index 93%
rename from include/phasar/PhasarLLVM/ControlFlow/SpecialMemberFunctionType.h
rename to include/phasar/ControlFlow/SpecialMemberFunctionType.h
index 9f6e488b0..b6e86f6c2 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/SpecialMemberFunctionType.h
+++ b/include/phasar/ControlFlow/SpecialMemberFunctionType.h
@@ -29,7 +29,7 @@ namespace psr {
 
 enum class SpecialMemberFunctionType {
 #define SPECIAL_MEMBER_FUNCTION_TYPES(NAME, TYPE) TYPE,
-#include "phasar/PhasarLLVM/ControlFlow/SpecialMemberFunctionType.def"
+#include "phasar/ControlFlow/SpecialMemberFunctionType.def"
 };
 
 std::string toString(SpecialMemberFunctionType SMFT);
diff --git a/include/phasar/Controller/AnalysisController.h b/include/phasar/Controller/AnalysisController.h
index 4df2c6bc9..35671ff61 100644
--- a/include/phasar/Controller/AnalysisController.h
+++ b/include/phasar/Controller/AnalysisController.h
@@ -10,20 +10,19 @@
 #ifndef PHASAR_CONTROLLER_ANALYSISCONTROLLER_H
 #define PHASAR_CONTROLLER_ANALYSISCONTROLLER_H
 
+#include "phasar/AnalysisStrategy/Strategies.h"
 #include "phasar/Controller/AnalysisControllerEmitterOptions.h"
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/SimpleAnalysisConstructor.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/Strategies.h"
+#include "phasar/DataFlow/IfdsIde/IFDSIDESolverConfig.h"
+#include "phasar/DataFlow/IfdsIde/Solver/IDESolver.h"
+#include "phasar/DataFlow/IfdsIde/Solver/IFDSSolver.h"
+#include "phasar/DataFlow/IfdsIde/SolverResults.h"
+#include "phasar/DataFlow/Mono/Solver/InterMonoSolver.h"
+#include "phasar/DataFlow/Mono/Solver/IntraMonoSolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSIDESolverConfig.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IFDSSolver.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/SolverResults.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Solver/InterMonoSolver.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Solver/IntraMonoSolver.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/HelperAnalyses.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
-#include "phasar/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h"
+#include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TaintConfig/TaintConfig.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/DataFlowAnalysisType.h"
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionComposer.h b/include/phasar/DataFlow/IfdsIde/EdgeFunctionComposer.h
similarity index 95%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionComposer.h
rename to include/phasar/DataFlow/IfdsIde/EdgeFunctionComposer.h
index 2c1a44d70..16e7e6578 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionComposer.h
+++ b/include/phasar/DataFlow/IfdsIde/EdgeFunctionComposer.h
@@ -10,8 +10,8 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_EDGEFUNCTIONCOMPOSER_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_EDGEFUNCTIONCOMPOSER_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionUtils.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
 
 #include <memory>
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionSingletonFactory.h b/include/phasar/DataFlow/IfdsIde/EdgeFunctionSingletonFactory.h
similarity index 100%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionSingletonFactory.h
rename to include/phasar/DataFlow/IfdsIde/EdgeFunctionSingletonFactory.h
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionUtils.h b/include/phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h
similarity index 97%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionUtils.h
rename to include/phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h
index 637f2be70..c86f446c2 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionUtils.h
+++ b/include/phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h
@@ -7,12 +7,12 @@
  *     Philipp Schubert, Fabian Schiebel and others
  *****************************************************************************/
 
-#ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_EDGEFUNCTIONUTILS_H_
-#define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_EDGEFUNCTIONUTILS_H_
+#ifndef PHASAR_DATAFLOW_IFDSIDE_EDGEFUNCTIONUTILS_H_
+#define PHASAR_DATAFLOW_IFDSIDE_EDGEFUNCTIONUTILS_H_
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/JoinLattice.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
 #include "phasar/Utils/ByRef.h"
+#include "phasar/Utils/JoinLattice.h"
 
 #include <memory>
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h b/include/phasar/DataFlow/IfdsIde/EdgeFunctions.h
similarity index 99%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h
rename to include/phasar/DataFlow/IfdsIde/EdgeFunctions.h
index 7d247821a..946f5b0c7 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h
+++ b/include/phasar/DataFlow/IfdsIde/EdgeFunctions.h
@@ -17,8 +17,8 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_EDGEFUNCTIONS_H_
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_EDGEFUNCTIONS_H_
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/JoinLattice.h"
 #include "phasar/Utils/ByRef.h"
+#include "phasar/Utils/JoinLattice.h"
 #include "phasar/Utils/TypeTraits.h"
 
 #include "llvm/ADT/ArrayRef.h"
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowFunctions.h b/include/phasar/DataFlow/IfdsIde/FlowFunctions.h
similarity index 100%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowFunctions.h
rename to include/phasar/DataFlow/IfdsIde/FlowFunctions.h
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IDETabulationProblem.h b/include/phasar/DataFlow/IfdsIde/IDETabulationProblem.h
similarity index 86%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IDETabulationProblem.h
rename to include/phasar/DataFlow/IfdsIde/IDETabulationProblem.h
index c907b42ed..bddccc0be 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IDETabulationProblem.h
+++ b/include/phasar/DataFlow/IfdsIde/IDETabulationProblem.h
@@ -10,19 +10,20 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IDETABULATIONPROBLEM_H_
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IDETABULATIONPROBLEM_H_
 
+#include "phasar/ControlFlow/ICFGBase.h"
 #include "phasar/DB/ProjectIRDBBase.h"
-#include "phasar/PhasarLLVM/ControlFlow/ICFGBase.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSIDESolverConfig.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/InitialSeeds.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/JoinLattice.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/SolverResults.h"
-#include "phasar/PhasarLLVM/Utils/Printer.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
+#include "phasar/DataFlow/IfdsIde/FlowFunctions.h"
+#include "phasar/DataFlow/IfdsIde/IFDSIDESolverConfig.h"
+#include "phasar/DataFlow/IfdsIde/InitialSeeds.h"
+#include "phasar/DataFlow/IfdsIde/SolverResults.h"
+#include "phasar/Utils/JoinLattice.h"
+#include "phasar/Utils/Printer.h"
 #include "phasar/Utils/Soundness.h"
 
 #include <cassert>
 #include <memory>
+#include <optional>
 #include <set>
 #include <string>
 #include <type_traits>
@@ -55,13 +56,11 @@ class IDETabulationProblem : public FlowFunctions<AnalysisDomainTy, Container>,
 
   using ConfigurationTy = HasNoConfigurationType;
 
-  explicit IDETabulationProblem(const db_t *IRDB,
+  explicit IDETabulationProblem(const ProjectIRDBBase<db_t> *IRDB,
                                 std::vector<std::string> EntryPoints,
                                 std::optional<d_t> ZeroValue)
       : IRDB(IRDB), EntryPoints(std::move(EntryPoints)),
         ZeroValue(std::move(ZeroValue)) {
-    static_assert(std::is_base_of_v<ProjectIRDBBase<db_t>, db_t>,
-                  "db_t must implement the ProjectIRDBBase interface!");
     assert(IRDB != nullptr);
   }
 
@@ -128,7 +127,7 @@ class IDETabulationProblem : public FlowFunctions<AnalysisDomainTy, Container>,
     return generateFlow(std::move(FactToGenerate), getZeroValue());
   }
 
-  const db_t *IRDB{};
+  const ProjectIRDBBase<db_t> *IRDB{};
   std::vector<std::string> EntryPoints;
   std::optional<d_t> ZeroValue;
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSIDESolverConfig.h b/include/phasar/DataFlow/IfdsIde/IFDSIDESolverConfig.h
similarity index 85%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSIDESolverConfig.h
rename to include/phasar/DataFlow/IfdsIde/IFDSIDESolverConfig.h
index 7524e2911..e402ada1c 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSIDESolverConfig.h
+++ b/include/phasar/DataFlow/IfdsIde/IFDSIDESolverConfig.h
@@ -42,12 +42,6 @@ enum class SolverConfigOptions : uint32_t {
 struct IFDSIDESolverConfig {
   IFDSIDESolverConfig() noexcept = default;
   IFDSIDESolverConfig(SolverConfigOptions Options) noexcept;
-  ~IFDSIDESolverConfig() = default;
-  IFDSIDESolverConfig(const IFDSIDESolverConfig &) noexcept = default;
-  IFDSIDESolverConfig &
-  operator=(const IFDSIDESolverConfig &) noexcept = default;
-  IFDSIDESolverConfig(IFDSIDESolverConfig &&) noexcept = default;
-  IFDSIDESolverConfig &operator=(IFDSIDESolverConfig &&) noexcept = default;
 
   [[nodiscard]] bool followReturnsPastSeeds() const;
   [[nodiscard]] bool autoAddZero() const;
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSTabulationProblem.h b/include/phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h
similarity index 91%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSTabulationProblem.h
rename to include/phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h
index bb0d9f085..54ee72b58 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSTabulationProblem.h
+++ b/include/phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h
@@ -10,10 +10,10 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSTABULATIONPROBLEM_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSTABULATIONPROBLEM_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionUtils.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IDETabulationProblem.h"
-#include "phasar/PhasarLLVM/Domain/AnalysisDomain.h"
-#include "phasar/PhasarLLVM/Utils/BinaryDomain.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h"
+#include "phasar/DataFlow/IfdsIde/IDETabulationProblem.h"
+#include "phasar/Domain/AnalysisDomain.h"
+#include "phasar/Domain/BinaryDomain.h"
 
 #include <set>
 #include <string>
@@ -40,7 +40,7 @@ class IFDSTabulationProblem
   using typename Base::t_t;
   using typename Base::v_t;
 
-  explicit IFDSTabulationProblem(const db_t *IRDB,
+  explicit IFDSTabulationProblem(const ProjectIRDBBase<db_t> *IRDB,
                                  std::vector<std::string> EntryPoints,
                                  d_t ZeroValue)
       : Base(IRDB, std::move(EntryPoints), std::move(ZeroValue)) {}
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/InitialSeeds.h b/include/phasar/DataFlow/IfdsIde/InitialSeeds.h
similarity index 86%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/InitialSeeds.h
rename to include/phasar/DataFlow/IfdsIde/InitialSeeds.h
index 7f89d566d..d12fca954 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/InitialSeeds.h
+++ b/include/phasar/DataFlow/IfdsIde/InitialSeeds.h
@@ -10,8 +10,10 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_INITIALSEEDS_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_INITIALSEEDS_H
 
-#include "phasar/PhasarLLVM/Utils/BinaryDomain.h"
-#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
+#include "phasar/Domain/BinaryDomain.h"
+#include "phasar/Utils/TypeTraits.h"
+
+#include "llvm/Support/Compiler.h"
 
 #include <map>
 #include <set>
@@ -72,19 +74,21 @@ template <typename N, typename D, typename L> class InitialSeeds {
   [[nodiscard]] const GeneralizedSeeds &getSeeds() const & { return Seeds; }
   [[nodiscard]] GeneralizedSeeds getSeeds() && { return std::move(Seeds); }
 
-  void dump(llvm::raw_ostream &OS = llvm::errs()) {
+  void dump(llvm::raw_ostream &OS = llvm::errs()) const {
 
     auto printNode = [&](auto &&Node) { // NOLINT
-      if constexpr (std::is_same_v<const llvm::Instruction *, N>) {
-        OS << llvmIRToString(Node);
+      if constexpr (std::is_pointer_v<N> &&
+                    is_llvm_printable_v<std::remove_pointer_t<N>>) {
+        OS << *Node;
       } else {
         OS << Node;
       }
     };
 
     auto printFact = [&](auto &&Node) { // NOLINT
-      if constexpr (std::is_same_v<const llvm::Value *, D>) {
-        OS << llvmIRToString(Node);
+      if constexpr (std::is_pointer_v<D> &&
+                    is_llvm_printable_v<std::remove_pointer_t<D>>) {
+        OS << *Node;
       } else {
         OS << Node;
       }
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowEdgeFunctionCache.h b/include/phasar/DataFlow/IfdsIde/Solver/FlowEdgeFunctionCache.h
similarity index 99%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowEdgeFunctionCache.h
rename to include/phasar/DataFlow/IfdsIde/Solver/FlowEdgeFunctionCache.h
index d960462ee..fe3d40968 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowEdgeFunctionCache.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/FlowEdgeFunctionCache.h
@@ -10,8 +10,8 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_FLOWEDGEFUNCTIONCACHE_H_
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_FLOWEDGEFUNCTIONCACHE_H_
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IDETabulationProblem.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
+#include "phasar/DataFlow/IfdsIde/IDETabulationProblem.h"
 #include "phasar/Utils/EquivalenceClassMap.h"
 #include "phasar/Utils/Logger.h"
 #include "phasar/Utils/PAMMMacros.h"
@@ -26,6 +26,10 @@
 #include <type_traits>
 #include <utility>
 
+namespace llvm {
+class Value;
+} // namespace llvm
+
 namespace psr {
 template <typename KeyT> class DefaultMapKeyCompressor {
 public:
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h b/include/phasar/DataFlow/IfdsIde/Solver/IDESolver.h
similarity index 98%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h
rename to include/phasar/DataFlow/IfdsIde/Solver/IDESolver.h
index bab12b3f0..c9297e808 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/IDESolver.h
@@ -18,22 +18,22 @@
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_IDESOLVER_H
 
 #include "phasar/Config/Configuration.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowEdgeFunctionCache.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IDETabulationProblem.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSTabulationProblem.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/InitialSeeds.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/JoinLattice.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/JumpFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/PathEdge.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/SolverResults.h"
-#include "phasar/PhasarLLVM/Domain/AnalysisDomain.h"
-#include "phasar/PhasarLLVM/Utils/DOTGraph.h"
-#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
+#include "phasar/DataFlow/IfdsIde/FlowFunctions.h"
+#include "phasar/DataFlow/IfdsIde/IDETabulationProblem.h"
+#include "phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h"
+#include "phasar/DataFlow/IfdsIde/InitialSeeds.h"
+#include "phasar/DataFlow/IfdsIde/Solver/FlowEdgeFunctionCache.h"
+#include "phasar/DataFlow/IfdsIde/Solver/JumpFunctions.h"
+#include "phasar/DataFlow/IfdsIde/Solver/PathEdge.h"
+#include "phasar/DataFlow/IfdsIde/SolverResults.h"
+#include "phasar/Domain/AnalysisDomain.h"
+#include "phasar/Utils/DOTGraph.h"
+#include "phasar/Utils/JoinLattice.h"
 #include "phasar/Utils/Logger.h"
 #include "phasar/Utils/PAMMMacros.h"
 #include "phasar/Utils/Table.h"
+#include "phasar/Utils/Utilities.h"
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/raw_ostream.h"
@@ -49,7 +49,14 @@
 #include <unordered_set>
 #include <utility>
 
+namespace llvm {
+class Instruction;
+class Value;
+} // namespace llvm
+
 namespace psr {
+// For sorting the results in dumpResults()
+std::string getMetaDataID(const llvm::Value *V);
 
 /// Solves the given IDETabulationProblem as described in the 1996 paper by
 /// Sagiv, Horwitz and Reps. To solve the problem, call solve(). Results
@@ -268,7 +275,7 @@ class IDESolver {
     IDEProblem.emitGraphicalReport(getSolverResults(), OS);
   }
 
-  virtual void dumpResults(llvm::raw_ostream &OS = llvm::outs()) {
+  void dumpResults(llvm::raw_ostream &OS = llvm::outs()) {
     PAMM_GET_INSTANCE;
     START_TIMER("DFA IDE Result Dumping", PAMM_SEVERITY_LEVEL::Full);
     OS << "\n***************************************************************\n"
@@ -278,12 +285,11 @@ class IDESolver {
     if (Cells.empty()) {
       OS << "No results computed!" << '\n';
     } else {
-      LLVMValueIDLess LLVMIDLess;
       std::sort(
-          Cells.begin(), Cells.end(),
-          [&LLVMIDLess](const auto &Lhs, const auto &Rhs) {
+          Cells.begin(), Cells.end(), [](const auto &Lhs, const auto &Rhs) {
             if constexpr (std::is_same_v<n_t, const llvm::Instruction *>) {
-              return LLVMIDLess(Lhs.getRowKey(), Rhs.getRowKey());
+              return StringIDLess{}(getMetaDataID(Lhs.getRowKey()),
+                                    getMetaDataID(Rhs.getRowKey()));
             } else {
               // If non-LLVM IR is used
               return Lhs.getRowKey() < Rhs.getRowKey();
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IFDSSolver.h b/include/phasar/DataFlow/IfdsIde/Solver/IFDSSolver.h
similarity index 91%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IFDSSolver.h
rename to include/phasar/DataFlow/IfdsIde/Solver/IFDSSolver.h
index 12bb215f2..f9ed15d76 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IFDSSolver.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/IFDSSolver.h
@@ -17,9 +17,9 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_IFDSSOLVER_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_IFDSSOLVER_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSTabulationProblem.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h"
-#include "phasar/PhasarLLVM/Utils/BinaryDomain.h"
+#include "phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h"
+#include "phasar/DataFlow/IfdsIde/Solver/IDESolver.h"
+#include "phasar/Domain/BinaryDomain.h"
 
 #include <memory>
 #include <set>
@@ -30,9 +30,6 @@ namespace psr {
 
 template <typename AnalysisDomainTy>
 class IFDSSolver : public IDESolver<WithBinaryValueDomain<AnalysisDomainTy>> {
-  static_assert(std::is_same_v<BinaryDomain, typename AnalysisDomainTy::l_t>,
-                "Expect an IFDS analysis domain");
-
 public:
   using ProblemTy = IFDSTabulationProblem<AnalysisDomainTy>;
   using d_t = typename AnalysisDomainTy::d_t;
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/JumpFunctions.h b/include/phasar/DataFlow/IfdsIde/Solver/JumpFunctions.h
similarity index 98%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/JumpFunctions.h
rename to include/phasar/DataFlow/IfdsIde/Solver/JumpFunctions.h
index 62b4ef799..a9c3f839e 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/JumpFunctions.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/JumpFunctions.h
@@ -17,8 +17,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_JUMPFUNCTIONS_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_JUMPFUNCTIONS_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
-#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
 #include "phasar/Utils/Logger.h"
 #include "phasar/Utils/Table.h"
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/PathEdge.h b/include/phasar/DataFlow/IfdsIde/Solver/PathEdge.h
similarity index 67%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/PathEdge.h
rename to include/phasar/DataFlow/IfdsIde/Solver/PathEdge.h
index 1ab42af3c..84c16b706 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/PathEdge.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/PathEdge.h
@@ -7,35 +7,31 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-/*
- * PathEdge.h
- *
- *  Created on: 16.08.2016
- *      Author: pdschbrt
- */
-
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_PATHEDGE_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_PATHEDGE_H
 
-#include <ostream>
+#include "llvm/Support/raw_ostream.h"
+
+#include <type_traits>
 
 namespace psr {
 
 template <typename N, typename D> class PathEdge {
-private:
-  const N Target;
-  const D DSource;
-  const D DTarget;
 
 public:
-  PathEdge(D DSource, N Target, D DTarget)
-      : Target(Target), DSource(DSource), DTarget(DTarget) {}
+  PathEdge(D DSource, N Target, D DTarget) noexcept
+      : Target(std::move(Target)), DSource(std::move(DSource)),
+        DTarget(std::move(DTarget)) {}
 
   ~PathEdge() = default;
 
-  PathEdge(const PathEdge &) = default;
+  PathEdge(const PathEdge &) noexcept(
+      std::is_nothrow_copy_constructible_v<N>
+          &&std::is_nothrow_copy_constructible_v<D>) = default;
 
-  PathEdge &operator=(const PathEdge &) = default;
+  PathEdge &operator=(const PathEdge &) noexcept(
+      std::is_nothrow_copy_assignable_v<N>
+          &&std::is_nothrow_copy_assignable_v<D>) = default;
 
   PathEdge(PathEdge &&) noexcept = default;
 
@@ -52,6 +48,11 @@ template <typename N, typename D> class PathEdge {
     return OS << "<" << Edge.DSource << "> -> <" << Edge.Target << ","
               << Edge.DTarget << ">";
   }
+
+private:
+  N Target;
+  D DSource;
+  D DTarget;
 };
 
 } // namespace psr
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/SolverResults.h b/include/phasar/DataFlow/IfdsIde/SolverResults.h
similarity index 97%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/SolverResults.h
rename to include/phasar/DataFlow/IfdsIde/SolverResults.h
index 18112840d..6795f673f 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/SolverResults.h
+++ b/include/phasar/DataFlow/IfdsIde/SolverResults.h
@@ -17,7 +17,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_SOLVERRESULTS_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SOLVER_SOLVERRESULTS_H
 
-#include "phasar/PhasarLLVM/Utils/BinaryDomain.h"
+#include "phasar/Domain/BinaryDomain.h"
 #include "phasar/Utils/Table.h"
 
 #include <set>
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/SpecialSummaries.h b/include/phasar/DataFlow/IfdsIde/SpecialSummaries.h
similarity index 93%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/SpecialSummaries.h
rename to include/phasar/DataFlow/IfdsIde/SpecialSummaries.h
index 4b24842f2..6861e2452 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/SpecialSummaries.h
+++ b/include/phasar/DataFlow/IfdsIde/SpecialSummaries.h
@@ -18,10 +18,10 @@
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_SPECIALSUMMARIES_H
 
 #include "phasar/Config/Configuration.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionUtils.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowFunctions.h"
-#include "phasar/PhasarLLVM/Utils/BinaryDomain.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
+#include "phasar/DataFlow/IfdsIde/FlowFunctions.h"
+#include "phasar/Domain/BinaryDomain.h"
 #include "phasar/Utils/IO.h" // readFile
 
 #include "llvm/IR/Function.h"
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Contexts/CallStringCTX.h b/include/phasar/DataFlow/Mono/Contexts/CallStringCTX.h
similarity index 86%
rename from include/phasar/PhasarLLVM/DataFlowSolver/Mono/Contexts/CallStringCTX.h
rename to include/phasar/DataFlow/Mono/Contexts/CallStringCTX.h
index 9bfd10dd4..07a7693c7 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Contexts/CallStringCTX.h
+++ b/include/phasar/DataFlow/Mono/Contexts/CallStringCTX.h
@@ -1,7 +1,9 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_MONO_CONTEXTS_CALLSTRINGCTX_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_MONO_CONTEXTS_CALLSTRINGCTX_H
 
-#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
+#include "phasar/Utils/Printer.h"
+
+#include "llvm/Support/raw_ostream.h"
 
 #include "boost/functional/hash.hpp"
 
@@ -14,7 +16,7 @@ namespace psr {
 template <typename N, unsigned K> class CallStringCTX {
 protected:
   std::deque<N> CallString;
-  static const unsigned KLimit = K;
+  static constexpr unsigned KLimit = K;
   friend struct std::hash<psr::CallStringCTX<N, K>>;
 
 public:
@@ -66,21 +68,16 @@ template <typename N, unsigned K> class CallStringCTX {
     return Lhs.cs < Rhs.cs;
   }
 
-  void print(llvm::raw_ostream &OS) const {
+  llvm::raw_ostream &print(llvm::raw_ostream &OS,
+                           const NodePrinterBase<N> &NP) const {
     OS << "Call string: [ ";
     for (auto C : CallString) {
-      OS << llvmIRToString(C);
+      NP.printNode(OS, C);
       if (C != CallString.back()) {
         OS << " * ";
       }
     }
-    OS << " ]";
-  }
-
-  friend llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
-                                       const CallStringCTX<N, K> &C) {
-    C.print(OS);
-    return OS;
+    return OS << " ]";
   }
 
   [[nodiscard]] bool empty() const { return CallString.empty(); }
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/InterMonoProblem.h b/include/phasar/DataFlow/Mono/InterMonoProblem.h
similarity index 84%
rename from include/phasar/PhasarLLVM/DataFlowSolver/Mono/InterMonoProblem.h
rename to include/phasar/DataFlow/Mono/InterMonoProblem.h
index 06c69df8d..5d119ac64 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/InterMonoProblem.h
+++ b/include/phasar/DataFlow/Mono/InterMonoProblem.h
@@ -17,10 +17,9 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_MONO_INTERMONOPROBLEM_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_MONO_INTERMONOPROBLEM_H
 
-#include "phasar/DB/ProjectIRDBBase.h"
-#include "phasar/PhasarLLVM/ControlFlow/ICFGBase.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/IntraMonoProblem.h"
-#include "phasar/PhasarLLVM/Pointer/AliasInfo.h"
+#include "phasar/ControlFlow/ICFGBase.h"
+#include "phasar/DataFlow/Mono/IntraMonoProblem.h"
+#include "phasar/Pointer/AliasInfo.h"
 #include "phasar/Utils/BitVectorSet.h"
 
 #include <set>
@@ -48,15 +47,14 @@ class InterMonoProblem : public IntraMonoProblem<AnalysisDomainTy> {
   const i_t *ICF;
 
 public:
-  InterMonoProblem(const db_t *IRDB, const TypeHierarchy<t_t, f_t> *TH,
-                   const i_t *ICF, AliasInfoRef<v_t, n_t> PT,
+  InterMonoProblem(const ProjectIRDBBase<db_t> *IRDB,
+                   const TypeHierarchy<t_t, f_t> *TH, const i_t *ICF,
+                   AliasInfoRef<v_t, n_t> PT,
                    std::vector<std::string> EntryPoints = {})
       : IntraMonoProblem<AnalysisDomainTy>(IRDB, TH, ICF, PT, EntryPoints),
         ICF(ICF) {
     static_assert(is_icfg_v<i_t, AnalysisDomainTy>,
                   "Type parameter i_t must implement the ICFG interface!");
-    static_assert(std::is_base_of_v<ProjectIRDBBase<db_t>, db_t>,
-                  "db_t must implement the ProjectIRDBBase interface!");
   }
 
   ~InterMonoProblem() override = default;
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/IntraMonoProblem.h b/include/phasar/DataFlow/Mono/IntraMonoProblem.h
similarity index 79%
rename from include/phasar/PhasarLLVM/DataFlowSolver/Mono/IntraMonoProblem.h
rename to include/phasar/DataFlow/Mono/IntraMonoProblem.h
index 5983f13bb..4f5927d81 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/IntraMonoProblem.h
+++ b/include/phasar/DataFlow/Mono/IntraMonoProblem.h
@@ -17,11 +17,10 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_MONO_INTRAMONOPROBLEM_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_MONO_INTRAMONOPROBLEM_H
 
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/ControlFlow/CFGBase.h"
-#include "phasar/PhasarLLVM/Pointer/AliasInfo.h"
-#include "phasar/PhasarLLVM/Utils/Printer.h"
-#include "phasar/Utils/BitVectorSet.h"
+#include "phasar/ControlFlow/CFGBase.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/Pointer/AliasInfo.h"
+#include "phasar/Utils/Printer.h"
 #include "phasar/Utils/Soundness.h"
 
 #include <set>
@@ -54,9 +53,9 @@ class IntraMonoProblem : public NodePrinter<AnalysisDomainTy>,
   using ProblemAnalysisDomain = AnalysisDomainTy;
 
 protected:
-  const db_t *IRDB;
+  const ProjectIRDBBase<db_t> *IRDB;
   const TypeHierarchy<t_t, f_t> *TH;
-  const c_t *CF;
+  const CFGBase<c_t> *CF;
   AliasInfoRef<v_t, n_t> PT;
   std::vector<std::string> EntryPoints;
   [[maybe_unused]] Soundness S = Soundness::Soundy;
@@ -66,16 +65,12 @@ class IntraMonoProblem : public NodePrinter<AnalysisDomainTy>,
   // a user problem can override the type of configuration to be used, if any
   using ConfigurationTy = HasNoConfigurationType;
 
-  IntraMonoProblem(const db_t *IRDB, const TypeHierarchy<t_t, f_t> *TH,
-                   const c_t *CF, AliasInfoRef<v_t, n_t> PT,
+  IntraMonoProblem(const ProjectIRDBBase<db_t> *IRDB,
+                   const TypeHierarchy<t_t, f_t> *TH, const CFGBase<c_t> *CF,
+                   AliasInfoRef<v_t, n_t> PT,
                    std::vector<std::string> EntryPoints = {})
       : IRDB(IRDB), TH(TH), CF(CF), PT(PT),
-        EntryPoints(std::move(EntryPoints)) {
-    static_assert(is_cfg_v<c_t, AnalysisDomainTy>,
-                  "c_t must implement the CFG interface!");
-    static_assert(std::is_base_of_v<ProjectIRDBBase<db_t>, db_t>,
-                  "db_t must implement the ProjectIRDBBase interface!");
-  }
+        EntryPoints(std::move(EntryPoints)) {}
 
   ~IntraMonoProblem() override = default;
 
@@ -95,13 +90,15 @@ class IntraMonoProblem : public NodePrinter<AnalysisDomainTy>,
     return EntryPoints;
   }
 
-  [[nodiscard]] const db_t *getProjectIRDB() const { return IRDB; }
+  [[nodiscard]] const ProjectIRDBBase<db_t> *getProjectIRDB() const {
+    return IRDB;
+  }
 
   [[nodiscard]] const TypeHierarchy<t_t, f_t> *getTypeHierarchy() const {
     return TH;
   }
 
-  [[nodiscard]] const c_t *getCFG() const { return CF; }
+  [[nodiscard]] const CFGBase<c_t> *getCFG() const { return CF; }
 
   [[nodiscard]] AliasInfoRef<v_t, n_t> getPointstoInfo() const { return PT; }
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Solver/InterMonoSolver.h b/include/phasar/DataFlow/Mono/Solver/InterMonoSolver.h
similarity index 93%
rename from include/phasar/PhasarLLVM/DataFlowSolver/Mono/Solver/InterMonoSolver.h
rename to include/phasar/DataFlow/Mono/Solver/InterMonoSolver.h
index 414a5423a..c1a7285b6 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Solver/InterMonoSolver.h
+++ b/include/phasar/DataFlow/Mono/Solver/InterMonoSolver.h
@@ -17,9 +17,8 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_MONO_SOLVER_INTERMONOSOLVER_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_MONO_SOLVER_INTERMONOSOLVER_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Contexts/CallStringCTX.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/InterMonoProblem.h"
-#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
+#include "phasar/DataFlow/Mono/Contexts/CallStringCTX.h"
+#include "phasar/DataFlow/Mono/InterMonoProblem.h"
 
 #include <deque>
 #include <unordered_map>
@@ -86,8 +85,8 @@ template <typename AnalysisDomainTy, unsigned K> class InterMonoSolver {
   void printWorkList() {
     llvm::outs() << "CURRENT WORKLIST:\n";
     for (auto &[Src, Dst] : Worklist) {
-      llvm::outs() << llvmIRToString(Src) << " --> " << llvmIRToString(Dst)
-                   << '\n';
+      llvm::outs() << IMProblem.NtoString(Src) << " --> "
+                   << IMProblem.NtoString(Dst) << '\n';
     }
     llvm::outs() << "-----------------\n";
   }
@@ -179,8 +178,8 @@ template <typename AnalysisDomainTy, unsigned K> class InterMonoSolver {
     llvm::outs() << "Handle normal flow\n";
     auto Src = Edge.first;
     auto Dst = Edge.second;
-    llvm::outs() << "Src: " << llvmIRToString(Src) << '\n';
-    llvm::outs() << "Dst: " << llvmIRToString(Dst) << '\n';
+    llvm::outs() << "Src: " << IMProblem.NtoString(Src) << '\n';
+    llvm::outs() << "Dst: " << IMProblem.NtoString(Dst) << '\n';
     std::unordered_map<CallStringCTX<n_t, K>, mono_container_t> Out;
     for (auto &[Ctx, Facts] : Analysis[Src]) {
       Out[Ctx] = IMProblem.normalFlow(Src, Analysis[Src][Ctx]);
@@ -225,8 +224,8 @@ template <typename AnalysisDomainTy, unsigned K> class InterMonoSolver {
     std::unordered_map<CallStringCTX<n_t, K>, mono_container_t> Out;
     if (!isIntraEdge(Edge)) {
       llvm::outs() << "Handle call flow\n";
-      llvm::outs() << "Src: " << llvmIRToString(Src) << '\n';
-      llvm::outs() << "Dst: " << llvmIRToString(Dst) << '\n';
+      llvm::outs() << "Src: " << IMProblem.NtoString(Src) << '\n';
+      llvm::outs() << "Dst: " << IMProblem.NtoString(Dst) << '\n';
       for (auto &[Ctx, Facts] : Analysis[Src]) {
         auto CTXAdd(Ctx);
         CTXAdd.push_back(Src);
@@ -254,8 +253,8 @@ template <typename AnalysisDomainTy, unsigned K> class InterMonoSolver {
     } else {
       // Handle call-to-ret flow
       llvm::outs() << "Handle call to ret flow\n";
-      llvm::outs() << "Src: " << llvmIRToString(Src) << '\n';
-      llvm::outs() << "Dst: " << llvmIRToString(Dst) << '\n';
+      llvm::outs() << "Src: " << IMProblem.NtoString(Src) << '\n';
+      llvm::outs() << "Dst: " << IMProblem.NtoString(Dst) << '\n';
       for (auto &[Ctx, Facts] : Analysis[Src]) {
         // call-to-ret flow does not modify contexts
         Out[Ctx] = IMProblem.callToRetFlow(
@@ -289,11 +288,11 @@ template <typename AnalysisDomainTy, unsigned K> class InterMonoSolver {
     std::unordered_map<CallStringCTX<n_t, K>, mono_container_t> Out;
     llvm::outs() << "\nHandle ret flow in: "
                  << ICF->getFunctionName(ICF->getFunctionOf(Src)) << '\n';
-    llvm::outs() << "Src: " << llvmIRToString(Src) << '\n';
-    llvm::outs() << "Dst: " << llvmIRToString(Dst) << '\n';
+    llvm::outs() << "Src: " << IMProblem.NtoString(Src) << '\n';
+    llvm::outs() << "Dst: " << IMProblem.NtoString(Dst) << '\n';
     for (auto &[Ctx, Facts] : Analysis[Src]) {
       auto CTXRm(Ctx);
-      llvm::outs() << "CTXRm: " << CTXRm << '\n';
+      CTXRm.print(llvm::outs() << "CTXRm: ", IMProblem) << '\n';
       // we need to use several call- and retsites if the context is empty
       llvm::SmallVector<n_t> CallSites;
 
@@ -320,7 +319,7 @@ template <typename AnalysisDomainTy, unsigned K> class InterMonoSolver {
       // TODO!
       llvm::outs() << "ResSites.size(): " << RetSites.size() << '\n';
       for (auto RetSite : RetSites) {
-        llvm::outs() << "RetSite: " << llvmIRToString(RetSite) << '\n';
+        llvm::outs() << "RetSite: " << IMProblem.NtoString(RetSite) << '\n';
         llvm::outs() << "Return facts: ";
         IMProblem.printContainer(llvm::outs(), Out[CTXRm]);
         llvm::outs() << '\n';
@@ -403,18 +402,18 @@ template <typename AnalysisDomainTy, unsigned K> class InterMonoSolver {
   virtual void dumpResults(llvm::raw_ostream &OS = llvm::outs()) {
     OS << "======= DUMP LLVM-INTER-MONOTONE-SOLVER RESULTS =======\n";
     for (auto &[Node, ContextMap] : this->Analysis) {
-      OS << "Instruction:\n" << this->IMProblem.NtoString(Node);
+      OS << "Instruction:\n" << IMProblem.NtoString(Node);
       OS << "\nFacts:\n";
       if (ContextMap.empty()) {
         OS << "\tEMPTY\n";
       } else {
         for (auto &[Context, FlowFacts] : ContextMap) {
-          OS << Context << '\n';
+          Context.print(OS, IMProblem) << '\n';
           if (FlowFacts.empty()) {
             OS << "\tEMPTY\n";
           } else {
             for (auto FlowFact : FlowFacts) {
-              OS << this->IMProblem.DtoString(FlowFact);
+              OS << IMProblem.DtoString(FlowFact);
             }
           }
         }
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Solver/IntraMonoSolver.h b/include/phasar/DataFlow/Mono/Solver/IntraMonoSolver.h
similarity index 98%
rename from include/phasar/PhasarLLVM/DataFlowSolver/Mono/Solver/IntraMonoSolver.h
rename to include/phasar/DataFlow/Mono/Solver/IntraMonoSolver.h
index f5d874471..0283ce9d4 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Solver/IntraMonoSolver.h
+++ b/include/phasar/DataFlow/Mono/Solver/IntraMonoSolver.h
@@ -17,7 +17,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_MONO_SOLVER_INTRAMONOSOLVER_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_MONO_SOLVER_INTRAMONOSOLVER_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/IntraMonoProblem.h"
+#include "phasar/DataFlow/Mono/IntraMonoProblem.h"
 #include "phasar/Utils/BitVectorSet.h"
 
 #include <deque>
@@ -43,7 +43,7 @@ template <typename AnalysisDomainTy> class IntraMonoSolver {
   ProblemTy &IMProblem;
   std::deque<std::pair<n_t, n_t>> Worklist;
   std::unordered_map<n_t, mono_container_t> Analysis;
-  const c_t *CFG;
+  const CFGBase<c_t> *CFG;
 
   void initialize() {
     const auto &EntryPoints = IMProblem.getEntryPoints();
diff --git a/include/phasar/PhasarLLVM/Domain/AnalysisDomain.h b/include/phasar/Domain/AnalysisDomain.h
similarity index 100%
rename from include/phasar/PhasarLLVM/Domain/AnalysisDomain.h
rename to include/phasar/Domain/AnalysisDomain.h
diff --git a/include/phasar/PhasarLLVM/Utils/BinaryDomain.h b/include/phasar/Domain/BinaryDomain.h
similarity index 94%
rename from include/phasar/PhasarLLVM/Utils/BinaryDomain.h
rename to include/phasar/Domain/BinaryDomain.h
index 29a0f23a9..80fe3d8ed 100644
--- a/include/phasar/PhasarLLVM/Utils/BinaryDomain.h
+++ b/include/phasar/Domain/BinaryDomain.h
@@ -17,7 +17,7 @@
 #ifndef PHASAR_PHASARLLVM_UTILS_BINARYDOMAIN_H_
 #define PHASAR_PHASARLLVM_UTILS_BINARYDOMAIN_H_
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/JoinLattice.h"
+#include "phasar/Utils/JoinLattice.h"
 
 #include <string>
 
diff --git a/include/phasar/PhasarLLVM/Utils/LatticeDomain.h b/include/phasar/Domain/LatticeDomain.h
similarity index 96%
rename from include/phasar/PhasarLLVM/Utils/LatticeDomain.h
rename to include/phasar/Domain/LatticeDomain.h
index 740ebe346..6694cf605 100644
--- a/include/phasar/PhasarLLVM/Utils/LatticeDomain.h
+++ b/include/phasar/Domain/LatticeDomain.h
@@ -10,8 +10,8 @@
 #ifndef PHASAR_PHASARLLVM_UTILS_LATTICEDOMAIN_H
 #define PHASAR_PHASARLLVM_UTILS_LATTICEDOMAIN_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/JoinLattice.h"
 #include "phasar/Utils/ByRef.h"
+#include "phasar/Utils/JoinLattice.h"
 #include "phasar/Utils/TypeTraits.h"
 
 #include "llvm/Support/ErrorHandling.h"
@@ -114,7 +114,7 @@ inline bool operator==(const LatticeDomain<L> &Lhs,
 template <
     typename L, typename LL,
     typename = std::void_t<decltype(std::declval<LL>() == std::declval<L>())>>
-inline bool operator==(const LL &Lhs, const LatticeDomain<L> Rhs) {
+inline bool operator==(const LL &Lhs, const LatticeDomain<L> &Rhs) {
   if (auto RVal = Rhs.getValueOrNull()) {
     return Lhs == *RVal;
   }
@@ -124,7 +124,7 @@ inline bool operator==(const LL &Lhs, const LatticeDomain<L> Rhs) {
 template <
     typename L, typename LL,
     typename = std::void_t<decltype(std::declval<LL>() == std::declval<L>())>>
-inline bool operator==(const LatticeDomain<L> Lhs, const LL &Rhs) {
+inline bool operator==(const LatticeDomain<L> &Lhs, const LL &Rhs) {
   return Rhs == Lhs;
 }
 
@@ -208,8 +208,7 @@ inline bool operator<(const LatticeDomain<L> &Lhs,
     if (auto RhsPtr = Rhs.getValueOrNull()) {
       return *LhsPtr < *RhsPtr;
     }
-  }
-  if (Lhs.isBottom()) {
+  } else if (Lhs.isBottom()) {
     return false;
   }
   if (Rhs.isBottom()) {
diff --git a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardCFG.h b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardCFG.h
index 9792fca22..a488e9b46 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardCFG.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardCFG.h
@@ -10,7 +10,6 @@
 #ifndef PHASAR_PHASARLLVM_CONTROLFLOW_LLVMBASEDBACKWARDCFG_H_
 #define PHASAR_PHASARLLVM_CONTROLFLOW_LLVMBASEDBACKWARDCFG_H_
 
-#include "phasar/PhasarLLVM/ControlFlow/CFGBase.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h"
 
 namespace llvm {
diff --git a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardICFG.h b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardICFG.h
index 61571a8d1..10a342488 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardICFG.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardICFG.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_CONTROLFLOW_LLVMBASEDBACKWARDICFG_H_
 #define PHASAR_PHASARLLVM_CONTROLFLOW_LLVMBASEDBACKWARDICFG_H_
 
-#include "phasar/PhasarLLVM/ControlFlow/ICFGBase.h"
+#include "phasar/ControlFlow/ICFGBase.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardCFG.h"
 #include "phasar/PhasarLLVM/Utils/LLVMBasedContainerConfig.h"
 
diff --git a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h
index 4bcbbaa7f..647a22e6a 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_CONTROLFLOW_LLVMBASEDCFG_H_
 #define PHASAR_PHASARLLVM_CONTROLFLOW_LLVMBASEDCFG_H_
 
-#include "phasar/PhasarLLVM/ControlFlow/CFGBase.h"
+#include "phasar/ControlFlow/CFGBase.h"
 
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallVector.h"
diff --git a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h
index 45499afc0..3878aa155 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h
@@ -17,9 +17,9 @@
 #ifndef PHASAR_PHASARLLVM_CONTROLFLOW_LLVMBASEDICFG_H_
 #define PHASAR_PHASARLLVM_CONTROLFLOW_LLVMBASEDICFG_H_
 
-#include "phasar/PhasarLLVM/ControlFlow/ICFGBase.h"
+#include "phasar/ControlFlow/CallGraphAnalysisType.h"
+#include "phasar/ControlFlow/ICFGBase.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h"
-#include "phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/PhasarLLVM/Utils/LLVMBasedContainerConfig.h"
 #include "phasar/Utils/MaybeUniquePtr.h"
diff --git a/include/phasar/DB/LLVMProjectIRDB.h b/include/phasar/PhasarLLVM/DB/LLVMProjectIRDB.h
similarity index 100%
rename from include/phasar/DB/LLVMProjectIRDB.h
rename to include/phasar/PhasarLLVM/DB/LLVMProjectIRDB.h
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/BranchSwitchInstFlowFunction.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/BranchSwitchInstFlowFunction.h
similarity index 87%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/BranchSwitchInstFlowFunction.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/BranchSwitchInstFlowFunction.h
index 8744d6a97..75129176f 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/BranchSwitchInstFlowFunction.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/BranchSwitchInstFlowFunction.h
@@ -5,7 +5,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_BRANCHSWITCHINSTFLOWFUNCTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_BRANCHSWITCHINSTFLOWFUNCTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
 
 namespace psr {
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CallToRetFlowFunction.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CallToRetFlowFunction.h
similarity index 86%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CallToRetFlowFunction.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CallToRetFlowFunction.h
index e8dd07049..efa2f22b9 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CallToRetFlowFunction.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CallToRetFlowFunction.h
@@ -5,7 +5,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_CALLTORETFLOWFUNCTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_CALLTORETFLOWFUNCTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
 
 namespace psr {
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CheckOperandsFlowFunction.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CheckOperandsFlowFunction.h
similarity index 86%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CheckOperandsFlowFunction.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CheckOperandsFlowFunction.h
index 4dee3bb83..2a9f2f5bf 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CheckOperandsFlowFunction.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CheckOperandsFlowFunction.h
@@ -5,7 +5,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_CHECKOPERANDSFLOWFUNCTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_CHECKOPERANDSFLOWFUNCTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
 
 namespace psr {
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h
similarity index 78%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h
index efd8261c7..0117e364b 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h
@@ -5,15 +5,11 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_FLOWFUNCTIONBASE_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_FLOWFUNCTIONBASE_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowFunctions.h"
-#include "phasar/PhasarLLVM/Domain/ExtendedValue.h"
+#include "phasar/DataFlow/IfdsIde/FlowFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde//IFDSFieldSensTaintAnalysis/Utils/ExtendedValue.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStats.h"
 
 #include "llvm/IR/Instruction.h"
-#include "llvm/IR/Instructions.h"
-
-#include "../Stats/TraceStats.h"
-#include "../Utils/DataFlowUtils.h"
-#include "../Utils/Log.h"
 
 namespace psr {
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GEPInstFlowFunction.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GEPInstFlowFunction.h
similarity index 86%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GEPInstFlowFunction.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GEPInstFlowFunction.h
index 85000b4fe..4ebf27b65 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GEPInstFlowFunction.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GEPInstFlowFunction.h
@@ -5,7 +5,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_GEPINSTFLOWFUNCTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_GEPINSTFLOWFUNCTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
 
 namespace psr {
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GenerateFlowFunction.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GenerateFlowFunction.h
similarity index 86%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GenerateFlowFunction.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GenerateFlowFunction.h
index 077cf95b9..969e7dd73 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GenerateFlowFunction.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GenerateFlowFunction.h
@@ -5,7 +5,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_GENERATEFLOWFUNCTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_GENERATEFLOWFUNCTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
 
 namespace psr {
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/IdentityFlowFunction.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/IdentityFlowFunction.h
similarity index 86%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/IdentityFlowFunction.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/IdentityFlowFunction.h
index b10b7c732..0aa541206 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/IdentityFlowFunction.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/IdentityFlowFunction.h
@@ -5,7 +5,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_IDENTITYFLOWFUNCTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_IDENTITYFLOWFUNCTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
 
 namespace psr {
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCallee.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCallee.h
similarity index 77%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCallee.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCallee.h
index 824f0f4fd..fcca65bf6 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCallee.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCallee.h
@@ -5,15 +5,14 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_MAPTAINTEDVALUESTOCALLEE_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_MAPTAINTEDVALUESTOCALLEE_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h"
-#include "phasar/PhasarLLVM/Domain/ExtendedValue.h"
+#include "phasar/DataFlow/IfdsIde/FlowFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde//IFDSFieldSensTaintAnalysis/Utils/ExtendedValue.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStats.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
 
 #include "llvm/IR/AbstractCallSite.h"
 #include "llvm/IR/Instruction.h"
 
-#include "../Stats/TraceStats.h"
-
 namespace psr {
 
 class MapTaintedValuesToCallee : public FlowFunction<ExtendedValue> {
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCaller.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCaller.h
similarity index 74%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCaller.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCaller.h
index 95909e1a2..57477a0ad 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCaller.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCaller.h
@@ -5,14 +5,13 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_MAPTAINTEDVALUESTOCALLER_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_MAPTAINTEDVALUESTOCALLER_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h"
-#include "phasar/PhasarLLVM/Domain/ExtendedValue.h"
+#include "phasar/DataFlow/IfdsIde/FlowFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde//IFDSFieldSensTaintAnalysis/Utils/ExtendedValue.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStats.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
 
 #include "llvm/IR/Instructions.h"
 
-#include "../Stats/TraceStats.h"
-
 namespace psr {
 
 class MapTaintedValuesToCaller : public FlowFunction<ExtendedValue> {
@@ -28,7 +27,7 @@ class MapTaintedValuesToCaller : public FlowFunction<ExtendedValue> {
 private:
   const llvm::CallInst *CallInst;
   const llvm::ReturnInst *RetInst;
-  ::psr::TraceStats &TraceStats;
+  TraceStats &TraceStats;
   ExtendedValue ZV;
 };
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemSetInstFlowFunction.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemSetInstFlowFunction.h
similarity index 86%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemSetInstFlowFunction.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemSetInstFlowFunction.h
index c96ebf6f3..9c12e828b 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemSetInstFlowFunction.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemSetInstFlowFunction.h
@@ -5,7 +5,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_MEMSETINSTFLOWFUNCTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_MEMSETINSTFLOWFUNCTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
 
 namespace psr {
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemTransferInstFlowFunction.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemTransferInstFlowFunction.h
similarity index 87%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemTransferInstFlowFunction.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemTransferInstFlowFunction.h
index 80df2e5dd..7d52a7458 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemTransferInstFlowFunction.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemTransferInstFlowFunction.h
@@ -5,7 +5,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_MEMTRANSFERINSTFLOWFUNCTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_MEMTRANSFERINSTFLOWFUNCTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
 
 namespace psr {
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/PHINodeFlowFunction.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/PHINodeFlowFunction.h
similarity index 86%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/PHINodeFlowFunction.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/PHINodeFlowFunction.h
index d6499dada..1aa55b8eb 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/PHINodeFlowFunction.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/PHINodeFlowFunction.h
@@ -5,7 +5,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_PHINODEFLOWFUNCTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_PHINODEFLOWFUNCTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
 
 namespace psr {
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/ReturnInstFlowFunction.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/ReturnInstFlowFunction.h
similarity index 86%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/ReturnInstFlowFunction.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/ReturnInstFlowFunction.h
index 80172d59d..700699152 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/ReturnInstFlowFunction.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/ReturnInstFlowFunction.h
@@ -5,7 +5,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_RETURNINSTFLOWFUNCTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_RETURNINSTFLOWFUNCTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
 
 namespace psr {
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/StoreInstFlowFunction.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/StoreInstFlowFunction.h
similarity index 86%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/StoreInstFlowFunction.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/StoreInstFlowFunction.h
index a54302f01..c2e121de1 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/StoreInstFlowFunction.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/StoreInstFlowFunction.h
@@ -5,7 +5,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_STOREINSTFLOWFUNCTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_STOREINSTFLOWFUNCTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
 
 namespace psr {
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAEndInstFlowFunction.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAEndInstFlowFunction.h
similarity index 86%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAEndInstFlowFunction.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAEndInstFlowFunction.h
index 0f71e7f07..04949dae2 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAEndInstFlowFunction.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAEndInstFlowFunction.h
@@ -5,7 +5,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_VAENDINSTFLOWFUNCTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_VAENDINSTFLOWFUNCTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
 
 namespace psr {
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAStartInstFlowFunction.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAStartInstFlowFunction.h
similarity index 86%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAStartInstFlowFunction.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAStartInstFlowFunction.h
index 470c06e90..3b7980bc5 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAStartInstFlowFunction.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAStartInstFlowFunction.h
@@ -5,7 +5,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_VASTARTINSTFLOWFUNCTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_FLOWFUNCTIONS_VASTARTINSTFLOWFUNCTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
 
 namespace psr {
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovRetValWriter.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovRetValWriter.h
similarity index 100%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovRetValWriter.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovRetValWriter.h
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovWriter.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovWriter.h
similarity index 100%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovWriter.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovWriter.h
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LineNumberEntry.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LineNumberEntry.h
similarity index 100%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LineNumberEntry.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LineNumberEntry.h
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LineNumberWriter.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LineNumberWriter.h
similarity index 100%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LineNumberWriter.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LineNumberWriter.h
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStats.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStats.h
similarity index 100%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStats.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStats.h
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStatsWriter.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStatsWriter.h
similarity index 100%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStatsWriter.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStatsWriter.h
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h
similarity index 97%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h
index 73ab8ede0..cb936e237 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h
@@ -5,7 +5,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_UTILS_DATAFLOWUTILS_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSFIELDSENSTAINTANALYSIS_UTILS_DATAFLOWUTILS_H
 
-#include "phasar/PhasarLLVM/Domain/ExtendedValue.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/ExtendedValue.h"
 
 #include "llvm/IR/Instructions.h"
 
diff --git a/include/phasar/PhasarLLVM/Domain/ExtendedValue.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/ExtendedValue.h
similarity index 100%
rename from include/phasar/PhasarLLVM/Domain/ExtendedValue.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/ExtendedValue.h
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/Log.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/Log.h
similarity index 100%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/Log.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/Log.h
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMFlowFunctions.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFlowFunctions.h
similarity index 99%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMFlowFunctions.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFlowFunctions.h
index 4d89b3e63..37fea2267 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMFlowFunctions.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFlowFunctions.h
@@ -10,8 +10,8 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_LLVMFLOWFUNCTIONS_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_LLVMFLOWFUNCTIONS_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h"
+#include "phasar/DataFlow/IfdsIde/FlowFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/TypeTraits.h"
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h
similarity index 88%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h
index bd581b6f3..b6df3aeb5 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h
@@ -34,9 +34,9 @@ namespace psr {
  */
 class LLVMZeroValue : public llvm::GlobalVariable {
 private:
-  LLVMZeroValue(llvm::Module &Mod); // NOLINT(modernize-use-equals-delete)
+  LLVMZeroValue(llvm::Module &Mod);
 
-  static constexpr auto LLVMZeroValueInternalName = "zero_value";
+  static constexpr llvm::StringLiteral LLVMZeroValueInternalName = "zero_value";
 
 public:
   LLVMZeroValue(const LLVMZeroValue &Z) = delete;
@@ -45,7 +45,7 @@ class LLVMZeroValue : public llvm::GlobalVariable {
   LLVMZeroValue &operator=(LLVMZeroValue &&Z) = delete;
   ~LLVMZeroValue() = default;
 
-  [[nodiscard]] llvm::StringRef getName() const {
+  [[nodiscard]] llvm::StringRef getName() const noexcept {
     return LLVMZeroValueInternalName;
   }
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocation.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocation.h
similarity index 99%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocation.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocation.h
index 65904e5e1..5f7dbf727 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocation.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocation.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_EXTENDEDTAINTANALYSIS_ABSTRACTMEMORYLOCATION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_EXTENDEDTAINTANALYSIS_ABSTRACTMEMORYLOCATION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocationFactory.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocationFactory.h
similarity index 98%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocationFactory.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocationFactory.h
index 2c5cc0222..aa27ef024 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocationFactory.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocationFactory.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_EXTENDEDTAINTANALYSIS_ABSTRACTMEMORYLOCATIONFACTORY_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_EXTENDEDTAINTANALYSIS_ABSTRACTMEMORYLOCATIONFACTORY_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocation.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocation.h"
 
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseMap.h"
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.h
similarity index 91%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.h
index 478f2a917..a9ebecde5 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_EXTENDEDTAINTANALYSIS_COMPOSEEDGEFUNCTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_EXTENDEDTAINTANALYSIS_COMPOSEEDGEFUNCTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.h"
 
 namespace psr::XTaint {
 class ComposeEdgeFunction : public EdgeFunctionBase {
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/DebugEdgeIdentity.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/DebugEdgeIdentity.h
similarity index 89%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/DebugEdgeIdentity.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/DebugEdgeIdentity.h
index 4c665e880..d6414b11d 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/DebugEdgeIdentity.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/DebugEdgeIdentity.h
@@ -10,8 +10,8 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_EXTENDEDTAINTANALYSIS_DEBUGEDGEIDENTITY_H_
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_EXTENDEDTAINTANALYSIS_DEBUGEDGEIDENTITY_H_
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.h"
 
 namespace llvm {
 class Instruction;
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.h
similarity index 98%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.h
index 55594e770..662d2d566 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_EXTENDEDTAINTANALYSIS_EDGEDOMAIN_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_EXTENDEDTAINTANALYSIS_EDGEDOMAIN_H
 
-#include "phasar/PhasarLLVM/Utils/LatticeDomain.h"
+#include "phasar/Domain/LatticeDomain.h"
 
 #include "llvm/ADT/PointerIntPair.h"
 #include "llvm/IR/Instruction.h" // Need a complete type llvm::Instruction for llvm::PointerIntPair
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.h
similarity index 92%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.h
index a90c858e5..3f659f475 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_EXTENDEDTAINTANALYSIS_GENEDGEFUNCTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_EXTENDEDTAINTANALYSIS_GENEDGEFUNCTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.h"
 
 namespace llvm {
 class Instruction;
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h
similarity index 91%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h
index 0cb09fa79..c28d05317 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h
@@ -10,10 +10,10 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_EXTENDEDTAINTANALYSIS_HELPERS_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_EXTENDEDTAINTANALYSIS_HELPERS_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
+#include "phasar/Domain/LatticeDomain.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.h"
 #include "phasar/PhasarLLVM/TaintConfig/TaintConfig.h"
-#include "phasar/PhasarLLVM/Utils/LatticeDomain.h"
 
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/SmallSet.h"
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinConstEdgeFunction.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinConstEdgeFunction.h
similarity index 93%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinConstEdgeFunction.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinConstEdgeFunction.h
index 4e7a025c7..de93aab37 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinConstEdgeFunction.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinConstEdgeFunction.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_EXTENDEDTAINTANALYSIS_JOINCONSTEDGEFUNCTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_EXTENDEDTAINTANALYSIS_JOINCONSTEDGEFUNCTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.h"
 
 namespace psr::XTaint {
 class JoinConstEdgeFunction : public EdgeFunctionBase {
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.h
similarity index 94%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.h
index 88a01beba..2c25f45da 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.h
@@ -10,8 +10,8 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_EXTENDEDTAINTANALYSIS_JOINEDGEFUNCTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_EXTENDEDTAINTANALYSIS_JOINEDGEFUNCTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.h"
 
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/SmallVector.h"
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/KillIfSanitizedEdgeFunction.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/KillIfSanitizedEdgeFunction.h
similarity index 88%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/KillIfSanitizedEdgeFunction.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/KillIfSanitizedEdgeFunction.h
index c2b873eef..163f88f0f 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/KillIfSanitizedEdgeFunction.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/KillIfSanitizedEdgeFunction.h
@@ -10,8 +10,8 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_EXTENDEDTAINTANALYSIS_KILLIFSANITIZEDEDGEFUNCTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_EXTENDEDTAINTANALYSIS_KILLIFSANITIZEDEDGEFUNCTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.h"
 
 namespace psr::XTaint {
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/TransferEdgeFunction.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/TransferEdgeFunction.h
similarity index 91%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/TransferEdgeFunction.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/TransferEdgeFunction.h
index e2149fc4d..d210083a6 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/TransferEdgeFunction.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/TransferEdgeFunction.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_EXTENDEDTAINTANALYSIS_TRANSFEREDGEFUNCTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_EXTENDEDTAINTANALYSIS_TRANSFEREDGEFUNCTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.h"
 
 namespace psr::XTaint {
 class TransferEdgeFunction : public EdgeFunctionBase {
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintAnalysisBase.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintAnalysisBase.h
similarity index 100%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintAnalysisBase.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintAnalysisBase.h
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.h
similarity index 91%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.h
index b29449931..fe89320c7 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.h
@@ -10,8 +10,8 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_EXTENDEDTAINTANALYSIS_XTAINTEDGEFUNCTIONBASE_H_
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_EXTENDEDTAINTANALYSIS_XTAINTEDGEFUNCTIONBASE_H_
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.h"
 
 #include "llvm/ADT/Hashing.h"
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEExtendedTaintAnalysis.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.h
similarity index 94%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEExtendedTaintAnalysis.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.h
index 130e4bd4e..7baf9a7f0 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEExtendedTaintAnalysis.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.h
@@ -10,20 +10,20 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDEEXTENDEDTAINTANALYSIS_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDEEXTENDEDTAINTANALYSIS_H
 
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IDETabulationProblem.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocation.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocationFactory.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintAnalysisBase.h"
+#include "phasar/DataFlow/IfdsIde/IDETabulationProblem.h"
+#include "phasar/Domain/LatticeDomain.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocation.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocationFactory.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintAnalysisBase.h"
 #include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/PhasarLLVM/TaintConfig/TaintConfig.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/BasicBlockOrdering.h"
-#include "phasar/PhasarLLVM/Utils/LatticeDomain.h"
 
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallBitVector.h"
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/AllBot.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/AllBot.h
similarity index 77%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/AllBot.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/AllBot.h
index c3a67e0d2..3abfd864c 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/AllBot.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/AllBot.h
@@ -10,9 +10,9 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDEGENERALIZEDLCA_ALLBOT_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDEGENERALIZEDLCA_ALLBOT_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionUtils.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.h"
 
 namespace psr::glca {
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/BinaryEdgeFunction.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/BinaryEdgeFunction.h
similarity index 84%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/BinaryEdgeFunction.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/BinaryEdgeFunction.h
index 2b3227fd3..78553a923 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/BinaryEdgeFunction.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/BinaryEdgeFunction.h
@@ -10,9 +10,9 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDEGENERALIZEDLCA_BINARYEDGEFUNCTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDEGENERALIZEDLCA_BINARYEDGEFUNCTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.h"
 
 namespace psr::glca {
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.h
similarity index 100%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.h
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValue.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValue.h
similarity index 100%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValue.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValue.h
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.h
similarity index 92%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.h
index 3b3888e85..81dfb13b1 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDEGENERALIZEDLCA_EDGEVALUESET_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDEGENERALIZEDLCA_EDGEVALUESET_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValue.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValue.h"
 
 #include <initializer_list>
 #include <unordered_set>
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/GenConstant.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/GenConstant.h
similarity index 87%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/GenConstant.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/GenConstant.h
index f5efbc5fb..8c2833030 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/GenConstant.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/GenConstant.h
@@ -10,8 +10,8 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDEGENERALIZEDLCA_GENCONSTANT_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDEGENERALIZEDLCA_GENCONSTANT_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.h"
 
 namespace psr::glca {
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.h
similarity index 93%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.h
index 49285fcea..d7c07ba73 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.h
@@ -10,11 +10,11 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDEGENERALIZEDLCA_IDEGENERALIZEDLCA_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDEGENERALIZEDLCA_IDEGENERALIZEDLCA_H
 
+#include "phasar/DataFlow/IfdsIde/IDETabulationProblem.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IDETabulationProblem.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.h"
 #include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
-#include "phasar/PhasarLLVM/Utils/Printer.h"
+#include "phasar/Utils/Printer.h"
 
 #include <map>
 #include <string>
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/JoinEdgeFunction.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/JoinEdgeFunction.h
similarity index 89%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/JoinEdgeFunction.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/JoinEdgeFunction.h
index 92f89a5d4..89f54b3d4 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/JoinEdgeFunction.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/JoinEdgeFunction.h
@@ -10,8 +10,8 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDEGENERALIZEDLCA_JOINEDGEFUNCTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDEGENERALIZEDLCA_JOINEDGEFUNCTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.h"
 
 namespace psr::glca {
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/LCAEdgeFunctionComposer.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/LCAEdgeFunctionComposer.h
similarity index 82%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/LCAEdgeFunctionComposer.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/LCAEdgeFunctionComposer.h
index ffc64e127..2340af8f7 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/LCAEdgeFunctionComposer.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/LCAEdgeFunctionComposer.h
@@ -10,9 +10,9 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDEGENERALIZEDLCA_LCAEDGEFUNCTIONCOMPOSER_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDEGENERALIZEDLCA_LCAEDGEFUNCTIONCOMPOSER_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionComposer.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctionComposer.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.h"
 
 namespace psr::glca {
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCalleeFlowFunction.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCalleeFlowFunction.h
similarity index 91%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCalleeFlowFunction.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCalleeFlowFunction.h
index b69c86621..f6a11eb95 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCalleeFlowFunction.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCalleeFlowFunction.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDEGENERALIZEDLCA_MAPFACTSTOCALLEEFLOWFUNCTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDEGENERALIZEDLCA_MAPFACTSTOCALLEEFLOWFUNCTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowFunctions.h"
+#include "phasar/DataFlow/IfdsIde/FlowFunctions.h"
 
 namespace llvm {
 class CallBase;
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCallerFlowFunction.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCallerFlowFunction.h
similarity index 89%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCallerFlowFunction.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCallerFlowFunction.h
index 3fbd34f70..50acbe5c6 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCallerFlowFunction.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCallerFlowFunction.h
@@ -10,8 +10,8 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDEGENERALIZEDLCA_MAPFACTSTOCALLERFLOWFUNCTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDEGENERALIZEDLCA_MAPFACTSTOCALLERFLOWFUNCTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h"
+#include "phasar/DataFlow/IfdsIde/FlowFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
 #include "llvm/IR/Function.h"
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/TypecastEdgeFunction.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/TypecastEdgeFunction.h
similarity index 83%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/TypecastEdgeFunction.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/TypecastEdgeFunction.h
index fc7bb20c0..1d255b29c 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/TypecastEdgeFunction.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/TypecastEdgeFunction.h
@@ -10,9 +10,9 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDEGENERALIZEDLCA_TYPECASTEDGEFUNCTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDEGENERALIZEDLCA_TYPECASTEDGEFUNCTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.h"
 
 namespace psr::glca {
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEInstInteractionAnalysis.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysis.h
similarity index 98%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEInstInteractionAnalysis.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysis.h
index e27be6d4e..ea24d73b9 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEInstInteractionAnalysis.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysis.h
@@ -10,21 +10,21 @@
 #ifndef PHASAR_PHASARLLVM_IFDSIDE_PROBLEMS_IDEINSTINTERACTIONALYSIS_H
 #define PHASAR_PHASARLLVM_IFDSIDE_PROBLEMS_IDEINSTINTERACTIONALYSIS_H
 
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionComposer.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionSingletonFactory.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IDETabulationProblem.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMFlowFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/SolverResults.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctionComposer.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctionSingletonFactory.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
+#include "phasar/DataFlow/IfdsIde/FlowFunctions.h"
+#include "phasar/DataFlow/IfdsIde/IDETabulationProblem.h"
+#include "phasar/DataFlow/IfdsIde/SolverResults.h"
+#include "phasar/Domain/LatticeDomain.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFlowFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
 #include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMPointsToUtils.h"
 #include "phasar/PhasarLLVM/Utils/LLVMIRToSrc.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
-#include "phasar/PhasarLLVM/Utils/LatticeDomain.h"
 #include "phasar/Utils/BitVectorSet.h"
 #include "phasar/Utils/ByRef.h"
 #include "phasar/Utils/Logger.h"
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysis.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysis.h
similarity index 95%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysis.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysis.h
index 67b784e0d..638451278 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysis.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysis.h
@@ -10,10 +10,10 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDELINEARCONSTANTANALYSIS_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDELINEARCONSTANTANALYSIS_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionComposer.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IDETabulationProblem.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctionComposer.h"
+#include "phasar/DataFlow/IfdsIde/IDETabulationProblem.h"
+#include "phasar/Domain/LatticeDomain.h"
 #include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
-#include "phasar/PhasarLLVM/Utils/LatticeDomain.h"
 
 #include "llvm/Support/raw_ostream.h"
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEProtoAnalysis.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEProtoAnalysis.h
similarity index 98%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEProtoAnalysis.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEProtoAnalysis.h
index dd0996fdc..20caaf6a4 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEProtoAnalysis.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEProtoAnalysis.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDEPROTOANALYSIS_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDEPROTOANALYSIS_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IDETabulationProblem.h"
+#include "phasar/DataFlow/IfdsIde/IDETabulationProblem.h"
 #include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
 
 #include <memory>
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDESecureHeapPropagation.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDESecureHeapPropagation.h
similarity index 98%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDESecureHeapPropagation.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDESecureHeapPropagation.h
index d39b8b4e2..189ed1175 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDESecureHeapPropagation.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDESecureHeapPropagation.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDESECUREHEAPPROPAGATION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDESECUREHEAPPROPAGATION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IDETabulationProblem.h"
+#include "phasar/DataFlow/IfdsIde/IDETabulationProblem.h"
 #include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
 
 #include "llvm/ADT/StringRef.h"
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDESolverTest.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDESolverTest.h
similarity index 98%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDESolverTest.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDESolverTest.h
index a40697cde..19d5165ba 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDESolverTest.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDESolverTest.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDESOLVERTEST_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDESOLVERTEST_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IDETabulationProblem.h"
+#include "phasar/DataFlow/IfdsIde/IDETabulationProblem.h"
 #include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
 
 #include <set>
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETypeStateAnalysis.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h
similarity index 98%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETypeStateAnalysis.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h
index 5b7574028..ce4fe6cbc 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETypeStateAnalysis.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDETYPESTATEANALYSIS_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDETYPESTATEANALYSIS_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IDETabulationProblem.h"
+#include "phasar/DataFlow/IfdsIde/IDETabulationProblem.h"
 #include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSConstAnalysis.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSConstAnalysis.h
similarity index 99%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSConstAnalysis.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSConstAnalysis.h
index 1c3446069..85ca53443 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSConstAnalysis.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSConstAnalysis.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IFDSCONSTANALYSIS_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IFDSCONSTANALYSIS_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSTabulationProblem.h"
+#include "phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h"
 #include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSFieldSensTaintAnalysis.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSFieldSensTaintAnalysis.h
similarity index 92%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSFieldSensTaintAnalysis.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSFieldSensTaintAnalysis.h
index baf8d5c2d..f1e345ab1 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSFieldSensTaintAnalysis.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSFieldSensTaintAnalysis.h
@@ -5,10 +5,10 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IFDSFIELDSENSTAINTANALYSIS_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IFDSFIELDSENSTAINTANALYSIS_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStats.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSTabulationProblem.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h"
-#include "phasar/PhasarLLVM/Domain/ExtendedValue.h"
+#include "phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde//IFDSFieldSensTaintAnalysis/Utils/ExtendedValue.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStats.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
 #include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
 #include "phasar/PhasarLLVM/TaintConfig/TaintConfig.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSProtoAnalysis.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSProtoAnalysis.h
similarity index 96%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSProtoAnalysis.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSProtoAnalysis.h
index a12032852..b978dd452 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSProtoAnalysis.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSProtoAnalysis.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IFDSPROTOANALYSIS_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IFDSPROTOANALYSIS_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSTabulationProblem.h"
+#include "phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h"
 #include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
 
 #include <map>
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSSignAnalysis.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSSignAnalysis.h
similarity index 96%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSSignAnalysis.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSSignAnalysis.h
index 7f059e250..a97e4a9c9 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSSignAnalysis.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSSignAnalysis.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IFDSSIGNANALYSIS_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IFDSSIGNANALYSIS_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSTabulationProblem.h"
+#include "phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h"
 #include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
 
 #include <memory>
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSSolverTest.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSSolverTest.h
similarity index 96%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSSolverTest.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSSolverTest.h
index 286cbbf47..69c0ea3eb 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSSolverTest.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSSolverTest.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IFDSSOLVERTEST_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IFDSSOLVERTEST_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSTabulationProblem.h"
+#include "phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h"
 #include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
 
 #include <set>
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTaintAnalysis.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysis.h
similarity index 97%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTaintAnalysis.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysis.h
index 75bca817c..84d0c2c36 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTaintAnalysis.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysis.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IFDSTAINTANALYSIS_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IFDSTAINTANALYSIS_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSTabulationProblem.h"
+#include "phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h"
 #include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTypeAnalysis.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTypeAnalysis.h
similarity index 96%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTypeAnalysis.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTypeAnalysis.h
index 6009ba3ce..b8b4e060c 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTypeAnalysis.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTypeAnalysis.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IFDSTYPEANALYSIS_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IFDSTYPEANALYSIS_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSTabulationProblem.h"
+#include "phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h"
 #include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
 
 #include <memory>
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSUninitializedVariables.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariables.h
similarity index 97%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSUninitializedVariables.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariables.h
index 691549168..46db4b631 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSUninitializedVariables.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariables.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IFDSUNINITIALIZEDVARIABLES_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IFDSUNINITIALIZEDVARIABLES_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSTabulationProblem.h"
+#include "phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h"
 #include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
 
 #include <map>
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.h
similarity index 96%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.h
index e1b2da1f5..88e29ef1a 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_TYPESTATEDESCRIPTIONS_CSTDFILEIOTYPESTATEDESCRIPTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_TYPESTATEDESCRIPTIONS_CSTDFILEIOTYPESTATEDESCRIPTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h"
 
 #include <map>
 #include <set>
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFCTXDescription.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFCTXDescription.h
similarity index 93%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFCTXDescription.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFCTXDescription.h
index 80f8100de..580a4011a 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFCTXDescription.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFCTXDescription.h
@@ -10,10 +10,10 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_TYPESTATEDESCRIPTIONS_OPENSSLEVPKDFCTXDESCRIPTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_TYPESTATEDESCRIPTIONS_OPENSSLEVPKDFCTXDESCRIPTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETypeStateAnalysis.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h"
-#include "phasar/PhasarLLVM/Domain/AnalysisDomain.h"
+#include "phasar/DataFlow/IfdsIde/Solver/IDESolver.h"
+#include "phasar/Domain/AnalysisDomain.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h"
 
 #include <functional>
 #include <map>
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.h
similarity index 96%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.h
index 3a7286e1f..96bd98864 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_TYPESTATEDESCRIPTIONS_OPENSSLEVPKDFDESCRIPTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_TYPESTATEDESCRIPTIONS_OPENSSLEVPKDFDESCRIPTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h"
 
 #include <map>
 #include <set>
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureHeapDescription.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureHeapDescription.h
similarity index 89%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureHeapDescription.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureHeapDescription.h
index b0e9e5721..ca1205856 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureHeapDescription.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureHeapDescription.h
@@ -10,10 +10,10 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_TYPESTATEDESCRIPTIONS_OPENSSLSECUREHEAPDESCRIPTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_TYPESTATEDESCRIPTIONS_OPENSSLSECUREHEAPDESCRIPTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDESecureHeapPropagation.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h"
-#include "phasar/PhasarLLVM/Domain/AnalysisDomain.h"
+#include "phasar/DataFlow/IfdsIde/Solver/IDESolver.h"
+#include "phasar/Domain/AnalysisDomain.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDESecureHeapPropagation.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h"
 
 #include <map>
 #include <set>
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureMemoryDescription.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureMemoryDescription.h
similarity index 95%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureMemoryDescription.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureMemoryDescription.h
index a72307f06..9078d0321 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureMemoryDescription.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureMemoryDescription.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_TYPESTATEDESCRIPTIONS_OPENSSLSECUREMEMORYDESCRIPTION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_TYPESTATEDESCRIPTIONS_OPENSSLSECUREMEMORYDESCRIPTION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h"
 
 #include <map>
 #include <set>
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h
similarity index 100%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h
rename to include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoFullConstantPropagation.h b/include/phasar/PhasarLLVM/DataFlow/Mono/Problems/InterMonoFullConstantPropagation.h
similarity index 93%
rename from include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoFullConstantPropagation.h
rename to include/phasar/PhasarLLVM/DataFlow/Mono/Problems/InterMonoFullConstantPropagation.h
index 1c048ab59..c2ab701a7 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoFullConstantPropagation.h
+++ b/include/phasar/PhasarLLVM/DataFlow/Mono/Problems/InterMonoFullConstantPropagation.h
@@ -10,11 +10,11 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_MONO_PROBLEMS_INTERMONOFULLCONSTANTPROPAGATION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_MONO_PROBLEMS_INTERMONOFULLCONSTANTPROPAGATION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/InterMonoProblem.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoFullConstantPropagation.h"
+#include "phasar/DataFlow/Mono/InterMonoProblem.h"
+#include "phasar/Domain/LatticeDomain.h"
+#include "phasar/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoFullConstantPropagation.h"
 #include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
-#include "phasar/PhasarLLVM/Utils/LatticeDomain.h"
 
 #include <cstdint>
 #include <map>
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoSolverTest.h b/include/phasar/PhasarLLVM/DataFlow/Mono/Problems/InterMonoSolverTest.h
similarity index 97%
rename from include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoSolverTest.h
rename to include/phasar/PhasarLLVM/DataFlow/Mono/Problems/InterMonoSolverTest.h
index b714ed0ca..2c5446829 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoSolverTest.h
+++ b/include/phasar/PhasarLLVM/DataFlow/Mono/Problems/InterMonoSolverTest.h
@@ -17,7 +17,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_MONO_PROBLEMS_INTERMONOSOLVERTEST_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_MONO_PROBLEMS_INTERMONOSOLVERTEST_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/InterMonoProblem.h"
+#include "phasar/DataFlow/Mono/InterMonoProblem.h"
 #include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/Utils/BitVectorSet.h"
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoTaintAnalysis.h b/include/phasar/PhasarLLVM/DataFlow/Mono/Problems/InterMonoTaintAnalysis.h
similarity index 97%
rename from include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoTaintAnalysis.h
rename to include/phasar/PhasarLLVM/DataFlow/Mono/Problems/InterMonoTaintAnalysis.h
index b87564ebb..fb6f69d03 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoTaintAnalysis.h
+++ b/include/phasar/PhasarLLVM/DataFlow/Mono/Problems/InterMonoTaintAnalysis.h
@@ -17,8 +17,8 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_MONO_PROBLEMS_INTERMONOTAINTANALYSIS_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_MONO_PROBLEMS_INTERMONOTAINTANALYSIS_H
 
+#include "phasar/DataFlow/Mono/InterMonoProblem.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/InterMonoProblem.h"
 #include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/PhasarLLVM/TaintConfig/TaintConfig.h"
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoFullConstantPropagation.h b/include/phasar/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoFullConstantPropagation.h
similarity index 97%
rename from include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoFullConstantPropagation.h
rename to include/phasar/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoFullConstantPropagation.h
index dfab9e949..d8b64028e 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoFullConstantPropagation.h
+++ b/include/phasar/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoFullConstantPropagation.h
@@ -17,10 +17,10 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_MONO_PROBLEMS_INTRAMONOFULLCONSTANTPROPAGATION_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_MONO_PROBLEMS_INTRAMONOFULLCONSTANTPROPAGATION_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/IntraMonoProblem.h"
+#include "phasar/DataFlow/Mono/IntraMonoProblem.h"
+#include "phasar/Domain/LatticeDomain.h"
 #include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
-#include "phasar/PhasarLLVM/Utils/LatticeDomain.h"
 #include "phasar/Utils/BitVectorSet.h"
 
 #include <cstdint>
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoSolverTest.h b/include/phasar/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoSolverTest.h
similarity index 97%
rename from include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoSolverTest.h
rename to include/phasar/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoSolverTest.h
index 4c888234c..cae80de31 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoSolverTest.h
+++ b/include/phasar/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoSolverTest.h
@@ -17,7 +17,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_MONO_PROBLEMS_INTRAMONOSOLVERTEST_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_MONO_PROBLEMS_INTRAMONOSOLVERTEST_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/IntraMonoProblem.h"
+#include "phasar/DataFlow/Mono/IntraMonoProblem.h"
 #include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/Utils/BitVectorSet.h"
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoUninitVariables.h b/include/phasar/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoUninitVariables.h
similarity index 97%
rename from include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoUninitVariables.h
rename to include/phasar/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoUninitVariables.h
index 71a39b393..c3d4ac5a4 100644
--- a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoUninitVariables.h
+++ b/include/phasar/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoUninitVariables.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_MONO_PROBLEMS_INTRAMONOUNINITVARIABLES_H
 #define PHASAR_PHASARLLVM_DATAFLOWSOLVER_MONO_PROBLEMS_INTRAMONOUNINITVARIABLES_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/IntraMonoProblem.h"
+#include "phasar/DataFlow/Mono/IntraMonoProblem.h"
 #include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/CallString.h b/include/phasar/PhasarLLVM/DataFlowSolver/Mono/CallString.h
deleted file mode 100644
index e1c9a350b..000000000
--- a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/CallString.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2017 Philipp Schubert.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Philipp Schubert and others
- *****************************************************************************/
-
-/*
- * CallString.h
- *
- *  Created on: 06.06.2017
- *      Author: philipp
- */
-
-#ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_MONO_CALLSTRING_H
-#define PHASAR_PHASARLLVM_DATAFLOWSOLVER_MONO_CALLSTRING_H
-
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/Support/raw_ostream.h"
-
-#include <algorithm>
-#include <deque>
-#include <initializer_list>
-#include <iterator>
-#include <stdexcept>
-
-namespace psr {
-
-template <typename T, unsigned K> class CallString {
-private:
-  std::deque<T> CS;
-  static const unsigned KLimit = K;
-
-public:
-  CallString() = default;
-  CallString(std::initializer_list<T> IList) : CS(IList) {
-    if (IList.size() > KLimit) {
-      throw std::runtime_error(
-          "initial call string length exceeds maximal length K");
-    }
-  }
-
-  void push(T S) {
-    if (CS.size() > KLimit - 1) {
-      CS.pop_front();
-    }
-    CS.push_back(S);
-  }
-
-  T returnSite() {
-    if (!CS.empty()) {
-      return CS.back();
-    }
-    return {};
-  }
-
-  void pop() {
-    if (!CS.empty()) {
-      CS.pop_back();
-    }
-  }
-
-  size_t size() { return CS.size(); }
-
-  std::deque<T> getInternalCS() const { return CS; }
-
-  friend bool operator==(const CallString &Lhs, const CallString &Rhs) {
-    return Lhs.cs == Rhs.cs;
-  }
-
-  friend bool operator!=(const CallString &Lhs, const CallString &Rhs) {
-    return !(Lhs == Rhs);
-  }
-
-  friend bool operator<(const CallString &Lhs, const CallString &Rhs) {
-    return Lhs.cs < Rhs.cs;
-  }
-
-  friend llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
-                                       const CallString &C) {
-    llvm::interleave(C.CS, OS, " * ");
-    return OS;
-  }
-};
-
-} // namespace psr
-
-#endif
diff --git a/include/phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h b/include/phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h
index 68ec9fda9..11490fe20 100644
--- a/include/phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h
+++ b/include/phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_DOMAIN_LLVMANALYSISDOMAIN_H
 #define PHASAR_PHASARLLVM_DOMAIN_LLVMANALYSISDOMAIN_H
 
-#include "phasar/PhasarLLVM/Domain/AnalysisDomain.h"
+#include "phasar/Domain/AnalysisDomain.h"
 
 namespace llvm {
 class Value;
diff --git a/include/phasar/PhasarLLVM/AnalysisStrategy/HelperAnalyses.h b/include/phasar/PhasarLLVM/HelperAnalyses.h
similarity index 94%
rename from include/phasar/PhasarLLVM/AnalysisStrategy/HelperAnalyses.h
rename to include/phasar/PhasarLLVM/HelperAnalyses.h
index bd6a45460..07b09878d 100644
--- a/include/phasar/PhasarLLVM/AnalysisStrategy/HelperAnalyses.h
+++ b/include/phasar/PhasarLLVM/HelperAnalyses.h
@@ -10,8 +10,8 @@
 #ifndef PHASAR_PHASARLLVM_ANALYSISSTRATEGY_HELPERANALYSES_H_
 #define PHASAR_PHASARLLVM_ANALYSISSTRATEGY_HELPERANALYSES_H_
 
-#include "phasar/PhasarLLVM/AnalysisStrategy/HelperAnalysisConfig.h"
-#include "phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.h"
+#include "phasar/ControlFlow/CallGraphAnalysisType.h"
+#include "phasar/PhasarLLVM/HelperAnalysisConfig.h"
 
 #include "nlohmann/json.hpp"
 
diff --git a/include/phasar/PhasarLLVM/AnalysisStrategy/HelperAnalysisConfig.h b/include/phasar/PhasarLLVM/HelperAnalysisConfig.h
similarity index 89%
rename from include/phasar/PhasarLLVM/AnalysisStrategy/HelperAnalysisConfig.h
rename to include/phasar/PhasarLLVM/HelperAnalysisConfig.h
index 5d8139f92..d35195e76 100644
--- a/include/phasar/PhasarLLVM/AnalysisStrategy/HelperAnalysisConfig.h
+++ b/include/phasar/PhasarLLVM/HelperAnalysisConfig.h
@@ -10,8 +10,8 @@
 #ifndef PHASAR_PHASARLLVM_ANALYSISSTRATEGY_HELPERANALYSISCONFIG_H
 #define PHASAR_PHASARLLVM_ANALYSISSTRATEGY_HELPERANALYSISCONFIG_H
 
-#include "phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.h"
-#include "phasar/PhasarLLVM/Pointer/AliasAnalysisType.h"
+#include "phasar/ControlFlow/CallGraphAnalysisType.h"
+#include "phasar/Pointer/AliasAnalysisType.h"
 #include "phasar/Utils/Soundness.h"
 
 #include "nlohmann/json.hpp"
diff --git a/include/phasar/PhasarLLVM/Pointer/DynamicAliasSetPtr.h b/include/phasar/PhasarLLVM/Pointer/DynamicAliasSetPtr.h
deleted file mode 100644
index 571b5c937..000000000
--- a/include/phasar/PhasarLLVM/Pointer/DynamicAliasSetPtr.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2022 Philipp Schubert.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Fabian Schiebel and others
- *****************************************************************************/
-
-#ifndef PHASAR_PHASARLLVM_POINTER_DYNAMICALIASSET_H
-#define PHASAR_PHASARLLVM_POINTER_DYNAMICALIASSET_H
-
-#include "llvm/ADT/DenseMapInfo.h"
-#include "llvm/ADT/DenseSet.h"
-#include "llvm/ADT/Hashing.h"
-
-#include <cstddef>
-
-namespace llvm {
-class Value;
-} // namespace llvm
-
-namespace psr {
-
-template <typename Container = llvm::DenseSet<const llvm::Value *>>
-class DynamicAliasSetConstPtr;
-/// A Container** that behaves like a Container*
-template <typename Container = llvm::DenseSet<const llvm::Value *>>
-class DynamicAliasSetPtr {
-public:
-  using container_type = Container;
-
-  constexpr DynamicAliasSetPtr() noexcept = default;
-  constexpr DynamicAliasSetPtr(std::nullptr_t) noexcept {}
-  constexpr DynamicAliasSetPtr(container_type **Value) noexcept : Value(Value) {
-    assert(Value != nullptr);
-  }
-  constexpr DynamicAliasSetPtr(const DynamicAliasSetPtr &) noexcept = default;
-  constexpr DynamicAliasSetPtr &
-  operator=(const DynamicAliasSetPtr &) noexcept = default;
-  ~DynamicAliasSetPtr() noexcept = default;
-
-  [[nodiscard]] constexpr container_type *get() noexcept { return *Value; }
-  [[nodiscard]] constexpr const container_type *get() const noexcept {
-    return *Value;
-  }
-
-  constexpr container_type *operator->() noexcept { return get(); }
-  constexpr const container_type *operator->() const noexcept { return get(); }
-
-  constexpr container_type &operator*() noexcept { return **Value; }
-  constexpr const container_type &operator*() const noexcept { return **Value; }
-
-  constexpr operator bool() const noexcept {
-    return Value && *Value != nullptr;
-  }
-
-  [[nodiscard]] constexpr container_type **value() noexcept { return Value; }
-  [[nodiscard]] constexpr container_type const *const *value() const noexcept {
-    return Value;
-  }
-
-  [[nodiscard]] friend constexpr llvm::hash_code
-  hash_value(DynamicAliasSetPtr // NOLINT(readability-identifier-naming)
-                 Ptr) noexcept {
-    return llvm::hash_value(Ptr.Value);
-  }
-
-  [[nodiscard]] friend constexpr bool
-  operator==(DynamicAliasSetPtr LHS, DynamicAliasSetPtr RHS) noexcept {
-    return LHS.Value == RHS.Value;
-  }
-  [[nodiscard]] friend constexpr bool
-  operator!=(DynamicAliasSetPtr LHS, DynamicAliasSetPtr RHS) noexcept {
-    return !(LHS == RHS);
-  }
-
-  [[nodiscard]] friend constexpr bool
-  operator<(DynamicAliasSetPtr LHS, DynamicAliasSetPtr RHS) noexcept {
-    return LHS.Value < RHS.Value;
-  }
-  [[nodiscard]] friend constexpr bool
-  operator>(DynamicAliasSetPtr LHS, DynamicAliasSetPtr RHS) noexcept {
-    return LHS.Value > RHS.Value;
-  }
-
-  [[nodiscard]] friend constexpr bool
-  operator<=(DynamicAliasSetPtr LHS, DynamicAliasSetPtr RHS) noexcept {
-    return LHS.Value <= RHS.Value;
-  }
-  [[nodiscard]] friend constexpr bool
-  operator>=(DynamicAliasSetPtr LHS, DynamicAliasSetPtr RHS) noexcept {
-    return LHS.Value >= RHS.Value;
-  }
-
-private:
-  friend class DynamicAliasSetConstPtr<container_type>;
-
-  container_type **Value = nullptr;
-};
-
-/// A Container const** that behaves like a const Container*.
-/// NOTE: This is different to const DynamicAliasSetPtr<Container> which
-/// propagates the const through all known layers of indirection
-template <typename Container>
-class DynamicAliasSetConstPtr : private DynamicAliasSetPtr<Container> {
-public:
-  using DynamicAliasSetPtr<Container>::DynamicAliasSetPtr;
-  using DynamicAliasSetPtr<Container>::operator bool;
-  using typename DynamicAliasSetPtr<Container>::container_type;
-
-  constexpr DynamicAliasSetConstPtr(
-      DynamicAliasSetPtr<Container> Other) noexcept
-      : DynamicAliasSetPtr<Container>(Other) {}
-
-  [[nodiscard]] constexpr const container_type *get() const noexcept {
-    return DynamicAliasSetPtr<Container>::get();
-  }
-
-  constexpr const container_type *operator->() const noexcept { return get(); }
-
-  constexpr const container_type &operator*() const noexcept {
-    return *DynamicAliasSetPtr<Container>::get();
-  }
-
-  [[nodiscard]] constexpr container_type const *const *value() const noexcept {
-    return DynamicAliasSetPtr<Container>::value();
-  }
-
-  [[nodiscard]] friend constexpr llvm::hash_code
-  hash_value(DynamicAliasSetConstPtr // NOLINT(readability-identifier-naming)
-                 Ptr) noexcept {
-    return llvm::hash_value(Ptr.value());
-  }
-
-  [[nodiscard]] friend constexpr bool
-  operator==(DynamicAliasSetConstPtr LHS,
-             DynamicAliasSetConstPtr RHS) noexcept {
-    return LHS.value() == RHS.value();
-  }
-  [[nodiscard]] friend constexpr bool
-  operator!=(DynamicAliasSetConstPtr LHS,
-             DynamicAliasSetConstPtr RHS) noexcept {
-    return !(LHS == RHS);
-  }
-
-  [[nodiscard]] friend constexpr bool
-  operator<(DynamicAliasSetConstPtr LHS, DynamicAliasSetConstPtr RHS) noexcept {
-    return LHS.value() < RHS.value();
-  }
-  [[nodiscard]] friend constexpr bool
-  operator>(DynamicAliasSetConstPtr LHS, DynamicAliasSetConstPtr RHS) noexcept {
-    return LHS.value() > RHS.value();
-  }
-
-  [[nodiscard]] friend constexpr bool
-  operator<=(DynamicAliasSetConstPtr LHS,
-             DynamicAliasSetConstPtr RHS) noexcept {
-    return LHS.value() <= RHS.value();
-  }
-  [[nodiscard]] friend constexpr bool
-  operator>=(DynamicAliasSetConstPtr LHS,
-             DynamicAliasSetConstPtr RHS) noexcept {
-    return LHS.value() >= RHS.value();
-  }
-};
-
-extern template class DynamicAliasSetPtr<>;
-extern template class DynamicAliasSetConstPtr<>;
-} // namespace psr
-
-namespace std {
-template <typename C> struct hash<psr::DynamicAliasSetPtr<C>> {
-  constexpr size_t operator()(psr::DynamicAliasSetPtr<C> Ptr) const noexcept {
-    return std::hash<C **>{}(Ptr.value());
-  }
-};
-template <typename C> struct hash<psr::DynamicAliasSetConstPtr<C>> {
-  constexpr size_t
-  operator()(psr::DynamicAliasSetConstPtr<C> Ptr) const noexcept {
-    return std::hash<C const *const *>{}(Ptr.value());
-  }
-};
-} // namespace std
-
-namespace llvm {
-template <typename C> struct DenseMapInfo<psr::DynamicAliasSetPtr<C>> {
-  inline static psr::DynamicAliasSetPtr<C> getEmptyKey() noexcept {
-    return DenseMapInfo<C **>::getEmptyKey();
-  }
-  inline static psr::DynamicAliasSetPtr<C> getTombstoneKey() noexcept {
-    return DenseMapInfo<C **>::getTombstoneKey();
-  }
-
-  inline static bool isEqual(psr::DynamicAliasSetPtr<C> LHS,
-                             psr::DynamicAliasSetPtr<C> RHS) noexcept {
-    return LHS == RHS;
-  }
-
-  inline static unsigned getHashValue(psr::DynamicAliasSetPtr<C> Ptr) noexcept {
-    return hash_value(Ptr);
-  }
-};
-template <typename C> struct DenseMapInfo<psr::DynamicAliasSetConstPtr<C>> {
-  inline static psr::DynamicAliasSetConstPtr<C> getEmptyKey() noexcept {
-    return DenseMapInfo<C **>::getEmptyKey();
-  }
-  inline static psr::DynamicAliasSetConstPtr<C> getTombstoneKey() noexcept {
-    return DenseMapInfo<C **>::getTombstoneKey();
-  }
-
-  inline static bool isEqual(psr::DynamicAliasSetConstPtr<C> LHS,
-                             psr::DynamicAliasSetConstPtr<C> RHS) noexcept {
-    return LHS == RHS;
-  }
-
-  inline static unsigned
-  getHashValue(psr::DynamicAliasSetConstPtr<C> Ptr) noexcept {
-    return hash_value(Ptr);
-  }
-};
-} // namespace llvm
-
-#endif // PHASAR_PHASARLLVM_POINTER_DYNAMICALIASSET_H
diff --git a/include/phasar/PhasarLLVM/Pointer/LLVMAliasGraph.h b/include/phasar/PhasarLLVM/Pointer/LLVMAliasGraph.h
index d639a8f4e..c266980b1 100644
--- a/include/phasar/PhasarLLVM/Pointer/LLVMAliasGraph.h
+++ b/include/phasar/PhasarLLVM/Pointer/LLVMAliasGraph.h
@@ -11,11 +11,11 @@
 #define PHASAR_PHASARLLVM_POINTER_LLVMALIASGRAPH_H_
 
 #include "phasar/Config/Configuration.h"
-#include "phasar/PhasarLLVM/Pointer/AliasInfoBase.h"
-#include "phasar/PhasarLLVM/Pointer/AliasInfoTraits.h"
-#include "phasar/PhasarLLVM/Pointer/AliasSetOwner.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h"
+#include "phasar/Pointer/AliasInfoBase.h"
+#include "phasar/Pointer/AliasInfoTraits.h"
+#include "phasar/Pointer/AliasSetOwner.h"
 #include "phasar/Utils/AnalysisProperties.h"
 
 #include "llvm/IR/AbstractCallSite.h"
@@ -37,6 +37,9 @@ class Type;
 } // namespace llvm
 
 namespace psr {
+extern template class BoxedPtr<LLVMAliasInfo::AliasSetTy>;
+extern template class BoxedConstPtr<LLVMAliasInfo::AliasSetTy>;
+extern template class AliasSetOwner<LLVMAliasInfo::AliasSetTy>;
 
 class LLVMAliasGraph;
 template <>
@@ -263,7 +266,7 @@ class LLVMAliasGraph : public AnalysisPropertiesMixin<LLVMAliasGraph>,
 
   AliasSetOwner<AliasSetTy>::memory_resource_type MRes;
   AliasSetOwner<AliasSetTy> Owner{&MRes};
-  std::unordered_map<const llvm::Value *, DynamicAliasSetPtr<AliasSetTy>> Cache;
+  std::unordered_map<const llvm::Value *, BoxedPtr<AliasSetTy>> Cache;
 };
 
 } // namespace psr
diff --git a/include/phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h b/include/phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h
index 7a83d0058..43d83a1f6 100644
--- a/include/phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h
+++ b/include/phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h
@@ -10,8 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_POINTER_LLVMALIASINFO_H_
 #define PHASAR_PHASARLLVM_POINTER_LLVMALIASINFO_H_
 
-#include "phasar/PhasarLLVM/Pointer/AliasInfo.h"
-#include "phasar/PhasarLLVM/Pointer/DynamicAliasSetPtr.h"
+#include "phasar/Pointer/AliasInfo.h"
 
 namespace llvm {
 class Function;
diff --git a/include/phasar/PhasarLLVM/Pointer/LLVMAliasSet.h b/include/phasar/PhasarLLVM/Pointer/LLVMAliasSet.h
index 8ff9d2280..0775e98d2 100644
--- a/include/phasar/PhasarLLVM/Pointer/LLVMAliasSet.h
+++ b/include/phasar/PhasarLLVM/Pointer/LLVMAliasSet.h
@@ -10,12 +10,11 @@
 #ifndef PHASAR_PHASARLLVM_POINTER_LLVMALIASSET_H
 #define PHASAR_PHASARLLVM_POINTER_LLVMALIASSET_H
 
-#include "phasar/PhasarLLVM/Pointer/AliasInfoBase.h"
-#include "phasar/PhasarLLVM/Pointer/AliasInfoTraits.h"
-#include "phasar/PhasarLLVM/Pointer/AliasResult.h"
-#include "phasar/PhasarLLVM/Pointer/AliasSetOwner.h"
-#include "phasar/PhasarLLVM/Pointer/DynamicAliasSetPtr.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h"
+#include "phasar/Pointer/AliasInfoBase.h"
+#include "phasar/Pointer/AliasInfoTraits.h"
+#include "phasar/Pointer/AliasResult.h"
+#include "phasar/Pointer/AliasSetOwner.h"
 #include "phasar/Utils/AnalysisProperties.h"
 #include "phasar/Utils/StableVector.h"
 
@@ -52,8 +51,7 @@ class LLVMAliasSet : public AnalysisPropertiesMixin<LLVMAliasSet>,
   using AliasSetTy = traits_t::AliasSetTy;
   using AliasSetPtrTy = traits_t::AliasSetPtrTy;
   using AllocationSiteSetPtrTy = traits_t::AllocationSiteSetPtrTy;
-  using AliasSetMap =
-      llvm::DenseMap<const llvm::Value *, DynamicAliasSetPtr<AliasSetTy>>;
+  using AliasSetMap = llvm::DenseMap<const llvm::Value *, BoxedPtr<AliasSetTy>>;
 
   /**
    * Creates points-to set(s) for all functions in the IRDB. If
@@ -134,8 +132,7 @@ class LLVMAliasSet : public AnalysisPropertiesMixin<LLVMAliasSet>,
 
   void mergeAliasSets(const llvm::Value *V1, const llvm::Value *V2);
 
-  void mergeAliasSets(DynamicAliasSetPtr<AliasSetTy> PTS1,
-                      DynamicAliasSetPtr<AliasSetTy> PTS2);
+  void mergeAliasSets(BoxedPtr<AliasSetTy> PTS1, BoxedPtr<AliasSetTy> PTS2);
 
   bool interIsReachableAllocationSiteTy(const llvm::Value *V,
                                         const llvm::Value *P) const;
@@ -149,7 +146,7 @@ class LLVMAliasSet : public AnalysisPropertiesMixin<LLVMAliasSet>,
   void addPointer(llvm::AAResults &AA, const llvm::DataLayout &DL,
                   const llvm::Value *V, std::vector<const llvm::Value *> &Reps);
 
-  [[nodiscard]] static DynamicAliasSetPtr<AliasSetTy> getEmptyAliasSet();
+  [[nodiscard]] static BoxedPtr<AliasSetTy> getEmptyAliasSet();
 
   LLVMBasedAliasAnalysis PTA;
   llvm::DenseSet<const llvm::Function *> AnalyzedFunctions;
diff --git a/include/phasar/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h b/include/phasar/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h
index b97b3a257..e724a0c4d 100644
--- a/include/phasar/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h
+++ b/include/phasar/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_POINTER_LLVMBASEDALIASANALYSIS_H_
 #define PHASAR_PHASARLLVM_POINTER_LLVMBASEDALIASANALYSIS_H_
 
-#include "phasar/PhasarLLVM/Pointer/AliasAnalysisType.h"
+#include "phasar/Pointer/AliasAnalysisType.h"
 
 #include "llvm/Analysis/AliasAnalysis.h"
 #include "llvm/IR/PassManager.h"
diff --git a/include/phasar/PhasarLLVM/AnalysisStrategy/SimpleAnalysisConstructor.h b/include/phasar/PhasarLLVM/SimpleAnalysisConstructor.h
similarity index 98%
rename from include/phasar/PhasarLLVM/AnalysisStrategy/SimpleAnalysisConstructor.h
rename to include/phasar/PhasarLLVM/SimpleAnalysisConstructor.h
index 554ab4a05..7976a42ac 100644
--- a/include/phasar/PhasarLLVM/AnalysisStrategy/SimpleAnalysisConstructor.h
+++ b/include/phasar/PhasarLLVM/SimpleAnalysisConstructor.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_ANALYSISSTRATEGY_SIMPLEANALYSISCONSTRUCTOR_H_
 #define PHASAR_PHASARLLVM_ANALYSISSTRATEGY_SIMPLEANALYSISCONSTRUCTOR_H_
 
-#include "phasar/PhasarLLVM/AnalysisStrategy/HelperAnalyses.h"
+#include "phasar/PhasarLLVM/HelperAnalyses.h"
 
 #include <type_traits>
 #include <utility>
diff --git a/include/phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h b/include/phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h
index b9263c5f4..6024792d8 100644
--- a/include/phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h
+++ b/include/phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h
@@ -18,7 +18,7 @@
 #define PHASAR_PHASARLLVM_TYPEHIERARCHY_LLVMTYPEHIERARCHY_H_
 
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMVFTable.h"
-#include "phasar/PhasarLLVM/TypeHierarchy/TypeHierarchy.h"
+#include "phasar/TypeHierarchy/TypeHierarchy.h"
 
 #include "llvm/ADT/StringRef.h"
 
diff --git a/include/phasar/PhasarLLVM/TypeHierarchy/LLVMVFTable.h b/include/phasar/PhasarLLVM/TypeHierarchy/LLVMVFTable.h
index 85022a7d9..2feb38f3a 100644
--- a/include/phasar/PhasarLLVM/TypeHierarchy/LLVMVFTable.h
+++ b/include/phasar/PhasarLLVM/TypeHierarchy/LLVMVFTable.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_TYPEHIERARCHY_LLVMVFTABLE_H_
 #define PHASAR_PHASARLLVM_TYPEHIERARCHY_LLVMVFTABLE_H_
 
-#include "phasar/PhasarLLVM/TypeHierarchy/VFTable.h"
+#include "phasar/TypeHierarchy/VFTable.h"
 
 #include "nlohmann/json.hpp"
 
diff --git a/include/phasar/PhasarLLVM/Utils/IOFormat.def b/include/phasar/PhasarLLVM/Utils/IOFormat.def
deleted file mode 100644
index 1c353935a..000000000
--- a/include/phasar/PhasarLLVM/Utils/IOFormat.def
+++ /dev/null
@@ -1,18 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2020 Philipp Schubert.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Philipp Schubert and others
- *****************************************************************************/
-
-#ifndef IO_FORMAT_TYPES
-#define IO_FORMAT_TYPES(NAME, CMDFLAG, TYPE)
-#endif
-
-IO_FORMAT_TYPES("JSON", "json", JSON)
-IO_FORMAT_TYPES("SARIF", "sarif", SARIF)
-IO_FORMAT_TYPES("None", "none", None)
-
-#undef IO_FORMAT_TYPES
diff --git a/include/phasar/PhasarLLVM/Utils/IOFormat.h b/include/phasar/PhasarLLVM/Utils/IOFormat.h
deleted file mode 100644
index 32e8d022b..000000000
--- a/include/phasar/PhasarLLVM/Utils/IOFormat.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2020 Philipp Schubert.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Philipp Schubert and others
- *****************************************************************************/
-
-#ifndef PHASAR_PHASARLLVM_UTILS_IOFORMAT_H_
-#define PHASAR_PHASARLLVM_UTILS_IOFORMAT_H_
-
-namespace llvm {
-class raw_ostream;
-}
-
-#include <string>
-
-namespace psr {
-
-enum class IOFormat {
-#define IO_FORMAT_TYPES(NAME, CMDFLAG, TYPE) TYPE,
-#include "phasar/PhasarLLVM/Utils/IOFormat.def"
-};
-
-std::string toString(const IOFormat &D);
-
-IOFormat toIOFormat(const std::string &S);
-
-llvm::raw_ostream &operator<<(llvm::raw_ostream &Os, const IOFormat &D);
-
-} // namespace psr
-
-#endif
diff --git a/include/phasar/PhasarLLVM/Utils/LLVMShorthands.h b/include/phasar/PhasarLLVM/Utils/LLVMShorthands.h
index 18599565e..0504b6bf6 100644
--- a/include/phasar/PhasarLLVM/Utils/LLVMShorthands.h
+++ b/include/phasar/PhasarLLVM/Utils/LLVMShorthands.h
@@ -113,8 +113,6 @@ std::string getMetaDataID(const llvm::Value *V);
  * underlying types for their ID's, size_t and string respectively.
  */
 struct LLVMValueIDLess {
-  StringIDLess Sless;
-  LLVMValueIDLess() : Sless(StringIDLess()) {}
   bool operator()(const llvm::Value *Lhs, const llvm::Value *Rhs) const;
 };
 
diff --git a/include/phasar/PhasarLLVM/Utils/Printer.h b/include/phasar/PhasarLLVM/Utils/Printer.h
deleted file mode 100644
index ef4dce53d..000000000
--- a/include/phasar/PhasarLLVM/Utils/Printer.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2017 Philipp Schubert.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Philipp Schubert and others
- *****************************************************************************/
-
-/*
- * Printer.h
- *
- *  Created on: 07.09.2018
- *      Author: rleer
- */
-
-#ifndef PHASAR_PHASARLLVM_UTILS_PRINTER_H
-#define PHASAR_PHASARLLVM_UTILS_PRINTER_H
-
-#include "llvm/Support/raw_ostream.h"
-
-#include <string>
-
-namespace psr {
-
-template <typename AnalysisDomainTy> struct NodePrinter {
-  using N = typename AnalysisDomainTy::n_t;
-  virtual ~NodePrinter() = default;
-
-  virtual void printNode(llvm::raw_ostream &OS, N Stmt) const = 0;
-
-  virtual std::string NtoString(N Stmt) const { // NOLINT
-    std::string Buffer;
-    llvm::raw_string_ostream StrS(Buffer);
-    printNode(StrS, Stmt);
-    return StrS.str();
-  }
-};
-
-template <typename AnalysisDomainTy> struct DataFlowFactPrinter {
-  using D = typename AnalysisDomainTy::d_t;
-
-  virtual ~DataFlowFactPrinter() = default;
-
-  virtual void printDataFlowFact(llvm::raw_ostream &OS, D Fact) const = 0;
-
-  [[nodiscard]] virtual std::string DtoString(D Fact) const { // NOLINT
-    std::string Buffer;
-    llvm::raw_string_ostream StrS(Buffer);
-    printDataFlowFact(StrS, Fact);
-    return StrS.str();
-  }
-};
-
-template <typename V> struct ValuePrinter {
-  virtual ~ValuePrinter() = default;
-
-  virtual void printValue(llvm::raw_ostream &OS, V Val) const = 0;
-
-  virtual std::string VtoString(V Val) const { // NOLINT
-    std::string Buffer;
-    llvm::raw_string_ostream StrS(Buffer);
-    printValue(StrS, Val);
-    return StrS.str();
-  }
-};
-
-template <typename T> struct TypePrinter {
-  virtual ~TypePrinter() = default;
-
-  virtual void printType(llvm::raw_ostream &OS, T Ty) const = 0;
-
-  virtual std::string TtoString(T Ty) const { // NOLINT
-    std::string Buffer;
-    llvm::raw_string_ostream StrS(Buffer);
-    printType(StrS, Ty);
-    return StrS.str();
-  }
-};
-
-template <typename AnalysisDomainTy> struct EdgeFactPrinter {
-  using l_t = typename AnalysisDomainTy::l_t;
-
-  virtual ~EdgeFactPrinter() = default;
-
-  virtual void printEdgeFact(llvm::raw_ostream &OS, l_t L) const = 0;
-
-  [[nodiscard]] virtual std::string LtoString(l_t L) const { // NOLINT
-    std::string Buffer;
-    llvm::raw_string_ostream StrS(Buffer);
-    printEdgeFact(StrS, L);
-    return StrS.str();
-  }
-};
-
-template <typename AnalysisDomainTy> struct FunctionPrinter {
-  using F = typename AnalysisDomainTy::f_t;
-
-  virtual ~FunctionPrinter() = default;
-
-  virtual void printFunction(llvm::raw_ostream &OS, F Func) const = 0;
-
-  virtual std::string FtoString(F Func) const { // NOLINT
-    std::string Buffer;
-    llvm::raw_string_ostream StrS(Buffer);
-    printFunction(StrS, Func);
-    return StrS.str();
-  }
-};
-
-template <typename ContainerTy> struct ContainerPrinter {
-  virtual ~ContainerPrinter() = default;
-
-  virtual void printContainer(llvm::raw_ostream &OS,
-                              ContainerTy Container) const = 0;
-
-  virtual std::string ContainertoString(ContainerTy Container) const { // NOLINT
-    std::string Buffer;
-    llvm::raw_string_ostream StrS(Buffer);
-    printContainer(StrS, Container);
-    return StrS.str();
-  }
-};
-
-} // namespace psr
-
-#endif
diff --git a/include/phasar/PhasarLLVM/Utils/Scopes.h b/include/phasar/PhasarLLVM/Utils/Scopes.h
deleted file mode 100644
index b43d7e9bf..000000000
--- a/include/phasar/PhasarLLVM/Utils/Scopes.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2017 Philipp Schubert.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Philipp Schubert and others
- *****************************************************************************/
-
-#ifndef PHASAR_PHASARLLVM_UTILS_SCOPES_H_
-#define PHASAR_PHASARLLVM_UTILS_SCOPES_H_
-
-#include <map>
-#include <string>
-
-namespace llvm {
-class raw_ostream;
-} // namespace llvm
-
-namespace psr {
-
-enum class Scope { function, module, project };
-
-llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, Scope S);
-
-} // namespace psr
-
-#endif
diff --git a/include/phasar/PhasarLLVM/Utils/SummaryStrategy.h b/include/phasar/PhasarLLVM/Utils/SummaryStrategy.h
deleted file mode 100644
index f4cb78d0b..000000000
--- a/include/phasar/PhasarLLVM/Utils/SummaryStrategy.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2017 Philipp Schubert.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Philipp Schubert and others
- *****************************************************************************/
-
-#ifndef PHASAR_PHASARLLVM_UTILS_SUMMARYSTRATEGY_H_
-#define PHASAR_PHASARLLVM_UTILS_SUMMARYSTRATEGY_H_
-
-#include <map>
-#include <string>
-
-namespace llvm {
-class raw_ostream;
-}
-
-namespace psr {
-
-enum class SummaryGenerationStrategy {
-  always_all = 0,
-  powerset,
-  all_and_none,
-  all_observed,
-  always_none
-};
-
-extern const std::map<SummaryGenerationStrategy, std::string>
-    SummaryGenerationStrategyToString;
-
-extern const std::map<std::string, SummaryGenerationStrategy>
-    StringToSummaryGenerationStrategy;
-
-llvm::raw_ostream &operator<<(llvm::raw_ostream &Os,
-                              const SummaryGenerationStrategy &S);
-
-} // namespace psr
-
-#endif
diff --git a/include/phasar/PhasarLLVM/Pointer/AliasAnalysisType.def b/include/phasar/Pointer/AliasAnalysisType.def
similarity index 100%
rename from include/phasar/PhasarLLVM/Pointer/AliasAnalysisType.def
rename to include/phasar/Pointer/AliasAnalysisType.def
diff --git a/include/phasar/PhasarLLVM/Pointer/AliasAnalysisType.h b/include/phasar/Pointer/AliasAnalysisType.h
similarity index 90%
rename from include/phasar/PhasarLLVM/Pointer/AliasAnalysisType.h
rename to include/phasar/Pointer/AliasAnalysisType.h
index 8f8cf5641..c05177920 100644
--- a/include/phasar/PhasarLLVM/Pointer/AliasAnalysisType.h
+++ b/include/phasar/Pointer/AliasAnalysisType.h
@@ -9,7 +9,7 @@
 namespace psr {
 enum class AliasAnalysisType {
 #define ALIAS_ANALYSIS_TYPE(NAME, CMDFLAG, TYPE) NAME,
-#include "phasar/PhasarLLVM/Pointer/AliasAnalysisType.def"
+#include "phasar/Pointer/AliasAnalysisType.def"
   Invalid
 };
 
diff --git a/include/phasar/PhasarLLVM/Pointer/AliasInfo.h b/include/phasar/Pointer/AliasInfo.h
similarity index 99%
rename from include/phasar/PhasarLLVM/Pointer/AliasInfo.h
rename to include/phasar/Pointer/AliasInfo.h
index 815299800..eee1eca61 100644
--- a/include/phasar/PhasarLLVM/Pointer/AliasInfo.h
+++ b/include/phasar/Pointer/AliasInfo.h
@@ -10,8 +10,8 @@
 #ifndef PHASAR_PHASARLLVM_POINTER_ALIASINFO_H_
 #define PHASAR_PHASARLLVM_POINTER_ALIASINFO_H_
 
-#include "phasar/PhasarLLVM/Pointer/AliasInfoTraits.h"
-#include "phasar/PhasarLLVM/Pointer/AliasResult.h"
+#include "phasar/Pointer/AliasInfoTraits.h"
+#include "phasar/Pointer/AliasResult.h"
 #include "phasar/Utils/AnalysisProperties.h"
 #include "phasar/Utils/ByRef.h"
 
diff --git a/include/phasar/PhasarLLVM/Pointer/AliasInfoBase.h b/include/phasar/Pointer/AliasInfoBase.h
similarity index 98%
rename from include/phasar/PhasarLLVM/Pointer/AliasInfoBase.h
rename to include/phasar/Pointer/AliasInfoBase.h
index a8fc9aee8..ae0488651 100644
--- a/include/phasar/PhasarLLVM/Pointer/AliasInfoBase.h
+++ b/include/phasar/Pointer/AliasInfoBase.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_POINTER_ALIASINFOBASE_H
 #define PHASAR_PHASARLLVM_POINTER_ALIASINFOBASE_H
 
-#include "phasar/PhasarLLVM/Pointer/AliasInfoTraits.h"
+#include "phasar/Pointer/AliasInfoTraits.h"
 
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/Support/raw_ostream.h"
diff --git a/include/phasar/PhasarLLVM/Pointer/AliasInfoTraits.h b/include/phasar/Pointer/AliasInfoTraits.h
similarity index 89%
rename from include/phasar/PhasarLLVM/Pointer/AliasInfoTraits.h
rename to include/phasar/Pointer/AliasInfoTraits.h
index 42b812539..ad25d1141 100644
--- a/include/phasar/PhasarLLVM/Pointer/AliasInfoTraits.h
+++ b/include/phasar/Pointer/AliasInfoTraits.h
@@ -10,14 +10,14 @@
 #ifndef PHASAR_PHASARLLVM_POINTER_ALIASINFOTRAITS_H
 #define PHASAR_PHASARLLVM_POINTER_ALIASINFOTRAITS_H
 
+#include "phasar/Utils/BoxedPointer.h"
+
 #include "llvm/ADT/DenseSet.h"
 
 #include <memory>
 
 namespace psr {
 
-template <typename AliasSetTy> class DynamicAliasSetConstPtr;
-
 template <typename T> struct AliasInfoTraits {
   //   using n_t;
   //   using v_t;
@@ -30,7 +30,7 @@ template <typename V, typename N> struct DefaultAATraits {
   using n_t = N;
   using v_t = V;
   using AliasSetTy = llvm::DenseSet<v_t>;
-  using AliasSetPtrTy = DynamicAliasSetConstPtr<AliasSetTy>;
+  using AliasSetPtrTy = BoxedConstPtr<AliasSetTy>;
   using AllocationSiteSetPtrTy = std::unique_ptr<AliasSetTy>;
 };
 } // namespace psr
diff --git a/include/phasar/PhasarLLVM/Pointer/AliasResult.def b/include/phasar/Pointer/AliasResult.def
similarity index 100%
rename from include/phasar/PhasarLLVM/Pointer/AliasResult.def
rename to include/phasar/Pointer/AliasResult.def
diff --git a/include/phasar/PhasarLLVM/Pointer/AliasResult.h b/include/phasar/Pointer/AliasResult.h
similarity index 94%
rename from include/phasar/PhasarLLVM/Pointer/AliasResult.h
rename to include/phasar/Pointer/AliasResult.h
index 1879a6174..29e62fff7 100644
--- a/include/phasar/PhasarLLVM/Pointer/AliasResult.h
+++ b/include/phasar/Pointer/AliasResult.h
@@ -17,7 +17,7 @@
 namespace psr {
 enum class AliasResult {
 #define ALIAS_RESULT_TYPE(NAME) NAME,
-#include "phasar/PhasarLLVM/Pointer/AliasResult.def"
+#include "phasar/Pointer/AliasResult.def"
 };
 
 std::string toString(AliasResult AR);
diff --git a/include/phasar/PhasarLLVM/Pointer/AliasSetOwner.h b/include/phasar/Pointer/AliasSetOwner.h
similarity index 95%
rename from include/phasar/PhasarLLVM/Pointer/AliasSetOwner.h
rename to include/phasar/Pointer/AliasSetOwner.h
index 2c9ea0609..5d01d79ba 100644
--- a/include/phasar/PhasarLLVM/Pointer/AliasSetOwner.h
+++ b/include/phasar/Pointer/AliasSetOwner.h
@@ -10,8 +10,8 @@
 #ifndef PHASAR_PHASARLLVM_POINTER_ALIASSETOWNER_H
 #define PHASAR_PHASARLLVM_POINTER_ALIASSETOWNER_H
 
-#include "phasar/PhasarLLVM/Pointer/AliasInfoTraits.h"
-#include "phasar/PhasarLLVM/Pointer/DynamicAliasSetPtr.h"
+#include "phasar/Pointer/AliasInfoTraits.h"
+#include "phasar/Utils/BoxedPointer.h"
 #include "phasar/Utils/MemoryResource.h"
 #include "phasar/Utils/StableVector.h"
 
@@ -77,7 +77,7 @@ template <typename AliasSetTy> class AliasSetOwner {
     OwnedPTS.clear();
   }
 
-  DynamicAliasSetPtr<AliasSetTy> acquire() {
+  BoxedPtr<AliasSetTy> acquire() {
     auto RawMem =
 #if HAS_MEMORY_RESOURCE
         Alloc.allocate(1)
diff --git a/include/phasar/PhasarLLVM/Pointer/PointsToInfo.h b/include/phasar/Pointer/PointsToInfo.h
similarity index 99%
rename from include/phasar/PhasarLLVM/Pointer/PointsToInfo.h
rename to include/phasar/Pointer/PointsToInfo.h
index d25ae8706..c5511ec2b 100644
--- a/include/phasar/PhasarLLVM/Pointer/PointsToInfo.h
+++ b/include/phasar/Pointer/PointsToInfo.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_POINTER_POINTSTOINFO_H
 #define PHASAR_PHASARLLVM_POINTER_POINTSTOINFO_H
 
-#include "phasar/PhasarLLVM/Pointer/PointsToInfoBase.h"
+#include "phasar/Pointer/PointsToInfoBase.h"
 #include "phasar/Utils/ByRef.h"
 
 #include <cassert>
diff --git a/include/phasar/PhasarLLVM/Pointer/PointsToInfoBase.h b/include/phasar/Pointer/PointsToInfoBase.h
similarity index 100%
rename from include/phasar/PhasarLLVM/Pointer/PointsToInfoBase.h
rename to include/phasar/Pointer/PointsToInfoBase.h
diff --git a/include/phasar/PhasarLLVM/TypeHierarchy/TypeHierarchy.h b/include/phasar/TypeHierarchy/TypeHierarchy.h
similarity index 97%
rename from include/phasar/PhasarLLVM/TypeHierarchy/TypeHierarchy.h
rename to include/phasar/TypeHierarchy/TypeHierarchy.h
index 4b8c40231..db9d9c8db 100644
--- a/include/phasar/PhasarLLVM/TypeHierarchy/TypeHierarchy.h
+++ b/include/phasar/TypeHierarchy/TypeHierarchy.h
@@ -10,7 +10,7 @@
 #ifndef PHASAR_PHASARLLVM_TYPEHIERARCHY_TYPEHIERARCHY_H_
 #define PHASAR_PHASARLLVM_TYPEHIERARCHY_TYPEHIERARCHY_H_
 
-#include "phasar/PhasarLLVM/TypeHierarchy/VFTable.h"
+#include "phasar/TypeHierarchy/VFTable.h"
 
 #include "llvm/Support/raw_ostream.h"
 
diff --git a/include/phasar/PhasarLLVM/TypeHierarchy/VFTable.h b/include/phasar/TypeHierarchy/VFTable.h
similarity index 100%
rename from include/phasar/PhasarLLVM/TypeHierarchy/VFTable.h
rename to include/phasar/TypeHierarchy/VFTable.h
diff --git a/include/phasar/Utils/BoxedPointer.h b/include/phasar/Utils/BoxedPointer.h
new file mode 100644
index 000000000..0d43ba825
--- /dev/null
+++ b/include/phasar/Utils/BoxedPointer.h
@@ -0,0 +1,210 @@
+/******************************************************************************
+ * Copyright (c) 2022 Philipp Schubert.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Fabian Schiebel and others
+ *****************************************************************************/
+
+#ifndef PHASAR_UTILS_BOXEDPOINTER_H
+#define PHASAR_UTILS_BOXEDPOINTER_H
+
+#include "llvm/ADT/DenseMapInfo.h"
+#include "llvm/ADT/DenseSet.h"
+#include "llvm/ADT/Hashing.h"
+
+#include <cstddef>
+
+namespace llvm {
+class Value;
+} // namespace llvm
+
+namespace psr {
+
+template <typename T> class BoxedConstPtr;
+/// A T** that behaves like a T*. Used as AliasSetPtr in LLVMAliasSet
+template <typename T> class BoxedPtr {
+public:
+  using value_type = T;
+
+  constexpr BoxedPtr() noexcept = default;
+  constexpr BoxedPtr(std::nullptr_t) noexcept {}
+  constexpr BoxedPtr(value_type **Value) noexcept : Value(Value) {
+    assert(Value != nullptr);
+  }
+  constexpr BoxedPtr(const BoxedPtr &) noexcept = default;
+  constexpr BoxedPtr &operator=(const BoxedPtr &) noexcept = default;
+  ~BoxedPtr() noexcept = default;
+
+  [[nodiscard]] constexpr value_type *get() noexcept { return *Value; }
+  [[nodiscard]] constexpr const value_type *get() const noexcept {
+    return *Value;
+  }
+
+  constexpr value_type *operator->() noexcept { return get(); }
+  constexpr const value_type *operator->() const noexcept { return get(); }
+
+  constexpr value_type &operator*() noexcept { return **Value; }
+  constexpr const value_type &operator*() const noexcept { return **Value; }
+
+  constexpr operator bool() const noexcept {
+    return Value && *Value != nullptr;
+  }
+
+  [[nodiscard]] constexpr value_type **value() noexcept { return Value; }
+  [[nodiscard]] constexpr value_type const *const *value() const noexcept {
+    return Value;
+  }
+
+  [[nodiscard]] friend constexpr llvm::hash_code
+  hash_value(BoxedPtr // NOLINT(readability-identifier-naming)
+                 Ptr) noexcept {
+    return llvm::hash_value(Ptr.Value);
+  }
+
+  [[nodiscard]] friend constexpr bool operator==(BoxedPtr LHS,
+                                                 BoxedPtr RHS) noexcept {
+    return LHS.Value == RHS.Value;
+  }
+  [[nodiscard]] friend constexpr bool operator!=(BoxedPtr LHS,
+                                                 BoxedPtr RHS) noexcept {
+    return !(LHS == RHS);
+  }
+
+  [[nodiscard]] friend constexpr bool operator<(BoxedPtr LHS,
+                                                BoxedPtr RHS) noexcept {
+    return LHS.Value < RHS.Value;
+  }
+  [[nodiscard]] friend constexpr bool operator>(BoxedPtr LHS,
+                                                BoxedPtr RHS) noexcept {
+    return LHS.Value > RHS.Value;
+  }
+
+  [[nodiscard]] friend constexpr bool operator<=(BoxedPtr LHS,
+                                                 BoxedPtr RHS) noexcept {
+    return LHS.Value <= RHS.Value;
+  }
+  [[nodiscard]] friend constexpr bool operator>=(BoxedPtr LHS,
+                                                 BoxedPtr RHS) noexcept {
+    return LHS.Value >= RHS.Value;
+  }
+
+private:
+  friend class BoxedConstPtr<value_type>;
+
+  value_type **Value = nullptr;
+};
+
+/// A T const** that behaves like a const T*.
+/// NOTE: This is different to const BoxedPtr<T> which
+/// propagates the const through all known layers of indirection
+template <typename T> class BoxedConstPtr : private BoxedPtr<T> {
+public:
+  using BoxedPtr<T>::BoxedPtr;
+  using BoxedPtr<T>::operator bool;
+  using typename BoxedPtr<T>::value_type;
+
+  constexpr BoxedConstPtr(BoxedPtr<T> Other) noexcept : BoxedPtr<T>(Other) {}
+
+  [[nodiscard]] constexpr const value_type *get() const noexcept {
+    return BoxedPtr<T>::get();
+  }
+
+  constexpr const value_type *operator->() const noexcept { return get(); }
+
+  constexpr const value_type &operator*() const noexcept {
+    return *BoxedPtr<T>::get();
+  }
+
+  [[nodiscard]] constexpr value_type const *const *value() const noexcept {
+    return BoxedPtr<T>::value();
+  }
+
+  [[nodiscard]] friend constexpr llvm::hash_code
+  hash_value(BoxedConstPtr // NOLINT(readability-identifier-naming)
+                 Ptr) noexcept {
+    return llvm::hash_value(Ptr.value());
+  }
+
+  [[nodiscard]] friend constexpr bool operator==(BoxedConstPtr LHS,
+                                                 BoxedConstPtr RHS) noexcept {
+    return LHS.value() == RHS.value();
+  }
+  [[nodiscard]] friend constexpr bool operator!=(BoxedConstPtr LHS,
+                                                 BoxedConstPtr RHS) noexcept {
+    return !(LHS == RHS);
+  }
+
+  [[nodiscard]] friend constexpr bool operator<(BoxedConstPtr LHS,
+                                                BoxedConstPtr RHS) noexcept {
+    return LHS.value() < RHS.value();
+  }
+  [[nodiscard]] friend constexpr bool operator>(BoxedConstPtr LHS,
+                                                BoxedConstPtr RHS) noexcept {
+    return LHS.value() > RHS.value();
+  }
+
+  [[nodiscard]] friend constexpr bool operator<=(BoxedConstPtr LHS,
+                                                 BoxedConstPtr RHS) noexcept {
+    return LHS.value() <= RHS.value();
+  }
+  [[nodiscard]] friend constexpr bool operator>=(BoxedConstPtr LHS,
+                                                 BoxedConstPtr RHS) noexcept {
+    return LHS.value() >= RHS.value();
+  }
+};
+
+} // namespace psr
+
+namespace std {
+template <typename C> struct hash<psr::BoxedPtr<C>> {
+  constexpr size_t operator()(psr::BoxedPtr<C> Ptr) const noexcept {
+    return std::hash<C **>{}(Ptr.value());
+  }
+};
+template <typename C> struct hash<psr::BoxedConstPtr<C>> {
+  constexpr size_t operator()(psr::BoxedConstPtr<C> Ptr) const noexcept {
+    return std::hash<C const *const *>{}(Ptr.value());
+  }
+};
+} // namespace std
+
+namespace llvm {
+template <typename C> struct DenseMapInfo<psr::BoxedPtr<C>> {
+  inline static psr::BoxedPtr<C> getEmptyKey() noexcept {
+    return DenseMapInfo<C **>::getEmptyKey();
+  }
+  inline static psr::BoxedPtr<C> getTombstoneKey() noexcept {
+    return DenseMapInfo<C **>::getTombstoneKey();
+  }
+
+  inline static bool isEqual(psr::BoxedPtr<C> LHS,
+                             psr::BoxedPtr<C> RHS) noexcept {
+    return LHS == RHS;
+  }
+
+  inline static unsigned getHashValue(psr::BoxedPtr<C> Ptr) noexcept {
+    return hash_value(Ptr);
+  }
+};
+template <typename C> struct DenseMapInfo<psr::BoxedConstPtr<C>> {
+  inline static psr::BoxedConstPtr<C> getEmptyKey() noexcept {
+    return DenseMapInfo<C **>::getEmptyKey();
+  }
+  inline static psr::BoxedConstPtr<C> getTombstoneKey() noexcept {
+    return DenseMapInfo<C **>::getTombstoneKey();
+  }
+
+  inline static bool isEqual(psr::BoxedConstPtr<C> LHS,
+                             psr::BoxedConstPtr<C> RHS) noexcept {
+    return LHS == RHS;
+  }
+
+  inline static unsigned getHashValue(psr::BoxedConstPtr<C> Ptr) noexcept {
+    return hash_value(Ptr);
+  }
+};
+} // namespace llvm
+
+#endif // PHASAR_UTILS_BOXEDPOINTER_H
diff --git a/include/phasar/Utils/ByRef.h b/include/phasar/Utils/ByRef.h
index 57372a4db..4cd72f550 100644
--- a/include/phasar/Utils/ByRef.h
+++ b/include/phasar/Utils/ByRef.h
@@ -13,6 +13,7 @@
 #include <type_traits>
 
 namespace psr {
+
 template <typename T>
 static constexpr bool CanEfficientlyPassByValue =
     sizeof(T) <= 2 * sizeof(void *) && std::is_trivially_copyable_v<T>;
diff --git a/include/phasar/PhasarLLVM/Utils/DOTGraph.h b/include/phasar/Utils/DOTGraph.h
similarity index 100%
rename from include/phasar/PhasarLLVM/Utils/DOTGraph.h
rename to include/phasar/Utils/DOTGraph.h
diff --git a/include/phasar/Utils/EnumFlags.h b/include/phasar/Utils/EnumFlags.h
index d63f5c4a2..b02c25a34 100644
--- a/include/phasar/Utils/EnumFlags.h
+++ b/include/phasar/Utils/EnumFlags.h
@@ -14,80 +14,74 @@
 
 namespace psr {
 
-template <typename T,
-          typename = typename std::enable_if_t<std::is_enum<T>::value, T>>
-class EnumFlagAutoBool {
-  T Val;
+template <typename T, typename = std::enable_if_t<std::is_enum_v<T>>>
+struct EnumFlagAutoBool {
+  T Value;
 
-public:
-  constexpr EnumFlagAutoBool(T Val) noexcept : Val(Val) {}
-  constexpr operator T() const noexcept { return Val; }
+  constexpr operator T() const noexcept { return Value; }
   constexpr explicit operator bool() const noexcept {
-    return static_cast<std::underlying_type_t<T>>(Val) != 0;
+    return static_cast<std::underlying_type_t<T>>(Value) != 0;
   }
 };
 
-template <typename T,
-          typename = typename std::enable_if_t<std::is_enum<T>::value, T>>
+template <typename T, typename = std::enable_if_t<std::is_enum_v<T>>>
 constexpr EnumFlagAutoBool<T> operator&(T Lhs, T Rhs) noexcept {
-  return static_cast<T>(static_cast<typename std::underlying_type_t<T>>(Lhs) &
-                        static_cast<typename std::underlying_type_t<T>>(Rhs));
+  return {static_cast<T>(static_cast<std::underlying_type_t<T>>(Lhs) &
+                         static_cast<std::underlying_type_t<T>>(Rhs))};
 }
 
-template <typename T,
-          typename = typename std::enable_if_t<std::is_enum<T>::value, T>>
+template <typename T, typename = std::enable_if_t<std::is_enum_v<T>>>
 constexpr void operator&=(T &Lhs, T Rhs) noexcept {
-  Lhs = static_cast<T>(static_cast<typename std::underlying_type_t<T>>(Lhs) &
-                       static_cast<typename std::underlying_type_t<T>>(Rhs));
+  Lhs = Lhs & Rhs;
 }
 
-template <typename T,
-          typename = typename std::enable_if_t<std::is_enum<T>::value, T>>
+template <typename T, typename = std::enable_if_t<std::is_enum_v<T>>>
 constexpr T operator|(T Lhs, T Rhs) noexcept {
-  return static_cast<T>(static_cast<typename std::underlying_type_t<T>>(Lhs) |
-                        static_cast<typename std::underlying_type_t<T>>(Rhs));
+  return static_cast<T>(static_cast<std::underlying_type_t<T>>(Lhs) |
+                        static_cast<std::underlying_type_t<T>>(Rhs));
 }
 
-template <typename T,
-          typename = typename std::enable_if_t<std::is_enum<T>::value, T>>
+template <typename T, typename = std::enable_if_t<std::is_enum_v<T>>>
 constexpr void operator|=(T &Lhs, T Rhs) noexcept {
-  Lhs = static_cast<T>(static_cast<typename std::underlying_type_t<T>>(Lhs) |
-                       static_cast<typename std::underlying_type_t<T>>(Rhs));
+  Lhs = Lhs | Rhs;
 }
 
-template <typename T,
-          typename = typename std::enable_if_t<std::is_enum<T>::value, T>>
+template <typename T, typename = std::enable_if_t<std::is_enum_v<T>>>
 constexpr T operator^(T Lhs, T Rhs) noexcept {
-  return static_cast<T>(static_cast<typename std::underlying_type_t<T>>(Lhs) ^
-                        static_cast<typename std::underlying_type_t<T>>(Rhs));
+  return static_cast<T>(static_cast<std::underlying_type_t<T>>(Lhs) ^
+                        static_cast<std::underlying_type_t<T>>(Rhs));
 }
 
-template <typename T,
-          typename = typename std::enable_if_t<std::is_enum<T>::value, T>>
+template <typename T, typename = std::enable_if_t<std::is_enum_v<T>>>
 constexpr void operator^=(T &Lhs, T Rhs) noexcept {
-  Lhs = static_cast<T>(static_cast<typename std::underlying_type_t<T>>(Lhs) ^
-                       static_cast<typename std::underlying_type_t<T>>(Rhs));
+  Lhs = Lhs ^ Rhs;
 }
 
-template <typename T,
-          typename = typename std::enable_if_t<std::is_enum<T>::value, T>>
+template <typename T, typename = std::enable_if_t<std::is_enum_v<T>>>
 constexpr T operator~(T Rhs) noexcept {
-  return static_cast<T>(~static_cast<typename std::underlying_type_t<T>>(Rhs));
+  return static_cast<T>(~static_cast<std::underlying_type_t<T>>(Rhs));
 }
 
-template <typename T,
-          typename = typename std::enable_if_t<std::is_enum<T>::value, T>>
-constexpr void setFlag(T &This, T Flag, bool Set = true) noexcept {
+template <typename T, typename = std::enable_if_t<std::is_enum_v<T>>>
+constexpr void setFlag(T &This, T Flag) noexcept {
+  This |= Flag;
+}
+template <typename T, typename = std::enable_if_t<std::is_enum_v<T>>>
+constexpr void unsetFlag(T &This, T Flag) noexcept {
+  This &= ~Flag;
+}
+template <typename T, typename = std::enable_if_t<std::is_enum_v<T>>>
+constexpr void setFlag(T &This, T Flag, bool Set) noexcept {
   if (Set) {
-    This |= Flag;
+    setFlag(This, Flag);
   } else {
-    This &= ~Flag;
+    unsetFlag(This, Flag);
   }
 }
-template <typename T,
-          typename = typename std::enable_if_t<std::is_enum<T>::value, T>>
+
+template <typename T, typename = std::enable_if_t<std::is_enum_v<T>>>
 constexpr bool hasFlag(T This, T Flag) noexcept {
-  return static_cast<bool>(This & Flag);
+  return (This & Flag) == Flag;
 }
 } // namespace psr
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/JoinLattice.h b/include/phasar/Utils/JoinLattice.h
similarity index 100%
rename from include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/JoinLattice.h
rename to include/phasar/Utils/JoinLattice.h
diff --git a/include/phasar/Utils/Printer.h b/include/phasar/Utils/Printer.h
new file mode 100644
index 000000000..c30e21401
--- /dev/null
+++ b/include/phasar/Utils/Printer.h
@@ -0,0 +1,113 @@
+/******************************************************************************
+ * Copyright (c) 2017 Philipp Schubert.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Philipp Schubert and others
+ *****************************************************************************/
+
+#ifndef PHASAR_PHASARLLVM_UTILS_PRINTER_H
+#define PHASAR_PHASARLLVM_UTILS_PRINTER_H
+
+#include "llvm/Support/raw_ostream.h"
+
+#include <functional>
+#include <string>
+
+namespace psr {
+
+template <typename P, typename T>
+std::string toStringBuilder(void (P::*Printer)(llvm::raw_ostream &, T) const,
+                            const P *This, const T &Arg) {
+  std::string Buffer;
+  llvm::raw_string_ostream StrS(Buffer);
+  std::invoke(Printer, This, std::ref(StrS), Arg);
+  return Buffer;
+}
+
+template <typename N> struct NodePrinterBase {
+  virtual ~NodePrinterBase() = default;
+
+  virtual void printNode(llvm::raw_ostream &OS, N Stmt) const = 0;
+
+  [[nodiscard]] std::string NtoString(N Stmt) const { // NOLINT
+    return toStringBuilder(&NodePrinterBase::printNode, this, Stmt);
+  }
+};
+template <typename AnalysisDomainTy>
+using NodePrinter = NodePrinterBase<typename AnalysisDomainTy::n_t>;
+
+template <typename D> struct DataFlowFactPrinterBase {
+  virtual ~DataFlowFactPrinterBase() = default;
+
+  virtual void printDataFlowFact(llvm::raw_ostream &OS, D Fact) const = 0;
+
+  [[nodiscard]] std::string DtoString(D Fact) const { // NOLINT
+    return toStringBuilder(&DataFlowFactPrinterBase::printDataFlowFact, this,
+                           Fact);
+  }
+};
+template <typename AnalysisDomainTy>
+using DataFlowFactPrinter =
+    DataFlowFactPrinterBase<typename AnalysisDomainTy::d_t>;
+
+template <typename V> struct ValuePrinter {
+  virtual ~ValuePrinter() = default;
+
+  virtual void printValue(llvm::raw_ostream &OS, V Val) const = 0;
+
+  [[nodiscard]] std::string VtoString(V Val) const { // NOLINT
+    return toStringBuilder(&ValuePrinter::printValue, this, Val);
+  }
+};
+
+template <typename T> struct TypePrinter {
+  virtual ~TypePrinter() = default;
+
+  virtual void printType(llvm::raw_ostream &OS, T Ty) const = 0;
+
+  [[nodiscard]] std::string TtoString(T Ty) const { // NOLINT
+    return toStringBuilder(&TypePrinter::printType, this, Ty);
+  }
+};
+
+template <typename AnalysisDomainTy> struct EdgeFactPrinter {
+  using l_t = typename AnalysisDomainTy::l_t;
+
+  virtual ~EdgeFactPrinter() = default;
+
+  virtual void printEdgeFact(llvm::raw_ostream &OS, l_t L) const = 0;
+
+  [[nodiscard]] std::string LtoString(l_t L) const { // NOLINT
+    return toStringBuilder(&EdgeFactPrinter::printEdgeFact, this, L);
+  }
+};
+
+template <typename AnalysisDomainTy> struct FunctionPrinter {
+  using F = typename AnalysisDomainTy::f_t;
+
+  virtual ~FunctionPrinter() = default;
+
+  virtual void printFunction(llvm::raw_ostream &OS, F Func) const = 0;
+
+  [[nodiscard]] std::string FtoString(F Func) const { // NOLINT
+    return toStringBuilder(&FunctionPrinter::printFunction, this, Func);
+  }
+};
+
+template <typename ContainerTy> struct ContainerPrinter {
+  virtual ~ContainerPrinter() = default;
+
+  virtual void printContainer(llvm::raw_ostream &OS,
+                              ContainerTy Container) const = 0;
+
+  [[nodiscard]] std::string
+  ContainertoString(ContainerTy Container) const { // NOLINT
+    return toStringBuilder(&ContainerPrinter::printContainer, this, Container);
+  }
+};
+
+} // namespace psr
+
+#endif
diff --git a/include/phasar/Utils/Table.h b/include/phasar/Utils/Table.h
index 4141bf23a..6b5511f64 100644
--- a/include/phasar/Utils/Table.h
+++ b/include/phasar/Utils/Table.h
@@ -17,7 +17,8 @@
 #ifndef PHASAR_UTILS_TABLE_H_
 #define PHASAR_UTILS_TABLE_H_
 
-#include <algorithm>
+#include "llvm/Support/raw_ostream.h"
+
 #include <set>
 #include <tuple>
 #include <unordered_map>
diff --git a/include/phasar/Utils/TypeTraits.h b/include/phasar/Utils/TypeTraits.h
index cc1bcd58f..1a7e52e4e 100644
--- a/include/phasar/Utils/TypeTraits.h
+++ b/include/phasar/Utils/TypeTraits.h
@@ -10,8 +10,6 @@
 #ifndef PHASAR_UTILS_TYPETRAITS_H
 #define PHASAR_UTILS_TYPETRAITS_H
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSIDESolverConfig.h"
-
 #include "llvm/Support/raw_ostream.h"
 
 #include <string_view>
@@ -25,12 +23,12 @@ namespace psr {
 namespace detail {
 
 template <typename T, typename = void>
-struct is_iterable : public std::false_type {}; // NOLINT
+struct is_iterable : std::false_type {}; // NOLINT
 template <typename T>
 struct is_iterable<T, std::void_t< // NOLINT
                           decltype(std::declval<T>().begin()),
-                          decltype(std::declval<T>().end())>>
-    : public std::true_type {};
+                          decltype(std::declval<T>().end())>> : std::true_type {
+};
 template <typename T, typename U, typename = void>
 struct is_iterable_over : std::false_type {}; // NOLINT
 template <typename T, typename U>
@@ -41,20 +39,20 @@ struct is_iterable_over<
         std::is_convertible_v<decltype(*std::declval<T>().begin()), U>>>
     : std::true_type {};
 
-template <typename T> struct is_pair : public std::false_type {}; // NOLINT
+template <typename T> struct is_pair : std::false_type {}; // NOLINT
 template <typename U, typename V>
-struct is_pair<std::pair<U, V>> : public std::true_type {}; // NOLINT
+struct is_pair<std::pair<U, V>> : std::true_type {}; // NOLINT
 
-template <typename T> struct is_tuple : public std::false_type {}; // NOLINT
+template <typename T> struct is_tuple : std::false_type {}; // NOLINT
 template <typename... Elems>
-struct is_tuple<std::tuple<Elems...>> : public std::true_type {}; // NOLINT
+struct is_tuple<std::tuple<Elems...>> : std::true_type {}; // NOLINT
 
 template <typename T, typename OS, typename = OS &>
-struct is_printable : public std::false_type {}; // NOLINT
+struct is_printable : std::false_type {}; // NOLINT
 template <typename T, typename OS>
 struct is_printable< // NOLINT
     T, OS, decltype(std::declval<OS &>() << std::declval<T>())>
-    : public std::true_type {};
+    : std::true_type {};
 
 template <typename T>
 using is_llvm_printable = is_printable<T, llvm::raw_ostream>; // NOLINT
@@ -63,9 +61,9 @@ template <typename T>
 using is_std_printable = is_printable<T, std::ostream>; // NOLINT
 
 template <typename T, typename Enable = std::string>
-struct has_str : public std::false_type {}; // NOLINT
+struct has_str : std::false_type {}; // NOLINT
 template <typename T>
-struct has_str<T, decltype(std::declval<T>().str())> : public std::true_type {
+struct has_str<T, decltype(std::declval<T>().str())> : std::true_type {
 }; // NOLINT
 
 template <typename T, typename = void>
@@ -87,13 +85,6 @@ template <typename T>
 struct is_llvm_hashable<T, decltype(hash_value(std::declval<T>()))> // NOLINT
     : std::true_type {};
 
-template <typename T, typename = void>
-struct has_setIFDSIDESolverConfig : std::false_type {};
-template <typename T>
-struct has_setIFDSIDESolverConfig<
-    T, decltype(std::declval<T>().setIFDSIDESolverConfig(
-           std::declval<IFDSIDESolverConfig>()))> : std::true_type {};
-
 template <template <typename> typename Base, typename Derived>
 class template_arg {
 private:
@@ -156,10 +147,6 @@ template <typename T>
 constexpr bool is_llvm_hashable_v = // NOLINT
     detail::is_llvm_hashable<T>::value;
 
-template <typename T>
-constexpr bool has_setIFDSIDESolverConfig_v = // NOLINT
-    detail::has_setIFDSIDESolverConfig<T>::value;
-
 template <typename T> struct is_variant : std::false_type {}; // NOLINT
 
 template <typename... Args>
@@ -177,7 +164,7 @@ constexpr bool is_crtp_base_of_v = // NOLINT
     detail::is_crtp_base_of<Base, Derived>::value;
 
 #if __cplusplus < 202002L
-template <typename T> struct type_identity { using type = T; }; // NOLINT
+template <typename T> struct type_identity { using type = T; };
 #else
 template <typename T> using type_identity = std::type_identity<T>;
 #endif
diff --git a/include/phasar/Utils/Utilities.h b/include/phasar/Utils/Utilities.h
index c1f2add61..512345a2e 100644
--- a/include/phasar/Utils/Utilities.h
+++ b/include/phasar/Utils/Utilities.h
@@ -30,16 +30,11 @@ namespace psr {
 
 std::string createTimeStamp();
 
-bool isConstructor(const std::string &MangledName);
-
-std::string debasify(const std::string &Name);
+bool isConstructor(llvm::StringRef MangledName);
 
 const llvm::Type *stripPointer(const llvm::Type *Pointer);
 
-bool isMangled(const std::string &Name);
-
-std::vector<std::string> splitString(const std::string &Str,
-                                     const std::string &Delimiter);
+bool isMangled(llvm::StringRef Name);
 
 template <typename T>
 std::set<std::set<T>> computePowerSet(const std::set<T> &S) {
@@ -162,11 +157,10 @@ struct StringIDLess {
 template <typename Fn> class scope_exit { // NOLINT
 public:
   template <typename FFn, typename = decltype(std::declval<FFn>()())>
-  scope_exit(FFn &&F) noexcept(std::is_nothrow_constructible_v<Fn, FFn> ||
-                               std::is_nothrow_constructible_v<Fn, FFn &>)
+  scope_exit(FFn &&F) noexcept(std::is_nothrow_constructible_v<Fn, FFn &&>)
       : F(std::forward<FFn>(F)) {}
 
-  ~scope_exit() { F(); }
+  ~scope_exit() noexcept { F(); }
 
   scope_exit(const scope_exit &) = delete;
   scope_exit(scope_exit &&) = delete;
diff --git a/lib/PhasarLLVM/AnalysisStrategy/CMakeLists.txt b/lib/AnalysisStrategy/CMakeLists.txt
similarity index 98%
rename from lib/PhasarLLVM/AnalysisStrategy/CMakeLists.txt
rename to lib/AnalysisStrategy/CMakeLists.txt
index 7a97546d2..3b205207d 100644
--- a/lib/PhasarLLVM/AnalysisStrategy/CMakeLists.txt
+++ b/lib/AnalysisStrategy/CMakeLists.txt
@@ -6,7 +6,6 @@ set(PHASAR_LINK_LIBS
 )
 
 set(LLVM_LINK_COMPONENTS
-  Core
   Support
 )
 
diff --git a/lib/PhasarLLVM/AnalysisStrategy/Strategies.cpp b/lib/AnalysisStrategy/Strategies.cpp
similarity index 86%
rename from lib/PhasarLLVM/AnalysisStrategy/Strategies.cpp
rename to lib/AnalysisStrategy/Strategies.cpp
index b38998c15..a05ba5848 100644
--- a/lib/PhasarLLVM/AnalysisStrategy/Strategies.cpp
+++ b/lib/AnalysisStrategy/Strategies.cpp
@@ -7,7 +7,7 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/AnalysisStrategy/Strategies.h"
+#include "phasar/AnalysisStrategy/Strategies.h"
 
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Support/raw_ostream.h"
@@ -21,7 +21,7 @@ std::string toString(const AnalysisStrategy &S) {
   case AnalysisStrategy::NAME:                                                 \
     return #NAME;                                                              \
     break;
-#include "phasar/PhasarLLVM/AnalysisStrategy/Strategies.def"
+#include "phasar/AnalysisStrategy/Strategies.def"
   case AnalysisStrategy::None:
     return "None";
   }
@@ -31,13 +31,13 @@ AnalysisStrategy toAnalysisStrategy(llvm::StringRef S) {
   AnalysisStrategy Type = llvm::StringSwitch<AnalysisStrategy>(S)
 #define ANALYSIS_STRATEGY_TYPES(NAME, CMDFLAG, DESC)                           \
   .Case(#NAME, AnalysisStrategy::NAME)
-#include "phasar/PhasarLLVM/AnalysisStrategy/Strategies.def"
+#include "phasar/AnalysisStrategy/Strategies.def"
                               .Default(AnalysisStrategy::None);
   if (Type == AnalysisStrategy::None) {
     Type = llvm::StringSwitch<AnalysisStrategy>(S)
 #define ANALYSIS_STRATEGY_TYPES(NAME, CMDFLAG, DESC)                           \
   .Case(CMDFLAG, AnalysisStrategy::NAME)
-#include "phasar/PhasarLLVM/AnalysisStrategy/Strategies.def"
+#include "phasar/AnalysisStrategy/Strategies.def"
                .Default(AnalysisStrategy::None);
   }
   return Type;
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 8891078dd..c484c6e63 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,3 +1,4 @@
+add_subdirectory(AnalysisStrategy)
 add_subdirectory(PhasarLLVM)
 add_subdirectory(PhasarPass)
 add_subdirectory(PhasarClang)
@@ -5,3 +6,5 @@ add_subdirectory(DB)
 add_subdirectory(Config)
 add_subdirectory(Utils)
 add_subdirectory(Controller)
+add_subdirectory(Pointer)
+add_subdirectory(ControlFlow)
diff --git a/lib/ControlFlow/CMakeLists.txt b/lib/ControlFlow/CMakeLists.txt
new file mode 100644
index 000000000..b757c3d62
--- /dev/null
+++ b/lib/ControlFlow/CMakeLists.txt
@@ -0,0 +1,26 @@
+file(GLOB_RECURSE CONTROLFLOW_SRC *.h *.cpp)
+
+set(PHASAR_LINK_LIBS
+)
+
+set(LLVM_LINK_COMPONENTS
+  Support
+)
+
+if(BUILD_SHARED_LIBS)
+  add_phasar_library(phasar_controlflow
+    SHARED
+    ${CONTROLFLOW_SRC}
+  )
+else()
+  add_phasar_library(phasar_controlflow
+    STATIC
+    ${CONTROLFLOW_SRC}
+  )
+endif()
+
+set_target_properties(phasar_controlflow
+  PROPERTIES
+  LINKER_LANGUAGE CXX
+  PREFIX "lib"
+)
diff --git a/lib/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.cpp b/lib/ControlFlow/CallGraphAnalysisType.cpp
similarity index 84%
rename from lib/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.cpp
rename to lib/ControlFlow/CallGraphAnalysisType.cpp
index c3398de8d..64473cc95 100644
--- a/lib/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.cpp
+++ b/lib/ControlFlow/CallGraphAnalysisType.cpp
@@ -7,7 +7,7 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.h"
+#include "phasar/ControlFlow/CallGraphAnalysisType.h"
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/StringSwitch.h"
@@ -17,7 +17,7 @@ std::string psr::toString(CallGraphAnalysisType CGA) {
 #define CALL_GRAPH_ANALYSIS_TYPE(NAME, CMDFLAG, DESC)                          \
   case CallGraphAnalysisType::NAME:                                            \
     return #NAME;
-#include "phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.def"
+#include "phasar/ControlFlow/CallGraphAnalysisType.def"
   case CallGraphAnalysisType::Invalid:
     return "Invalid";
   }
@@ -27,13 +27,13 @@ psr::CallGraphAnalysisType psr::toCallGraphAnalysisType(llvm::StringRef S) {
   CallGraphAnalysisType Type = llvm::StringSwitch<CallGraphAnalysisType>(S)
 #define CALL_GRAPH_ANALYSIS_TYPE(NAME, CMDFLAG, DESC)                          \
   .Case(#NAME, CallGraphAnalysisType::NAME)
-#include "phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.def"
+#include "phasar/ControlFlow/CallGraphAnalysisType.def"
                                    .Default(CallGraphAnalysisType::Invalid);
   if (Type == CallGraphAnalysisType::Invalid) {
     Type = llvm::StringSwitch<CallGraphAnalysisType>(S)
 #define CALL_GRAPH_ANALYSIS_TYPE(NAME, CMDFLAG, DESC)                          \
   .Case(CMDFLAG, CallGraphAnalysisType::NAME)
-#include "phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.def"
+#include "phasar/ControlFlow/CallGraphAnalysisType.def"
                .Default(CallGraphAnalysisType::Invalid);
   }
   return Type;
diff --git a/lib/PhasarLLVM/ControlFlow/SpecialMemberFunctionType.cpp b/lib/ControlFlow/SpecialMemberFunctionType.cpp
similarity index 83%
rename from lib/PhasarLLVM/ControlFlow/SpecialMemberFunctionType.cpp
rename to lib/ControlFlow/SpecialMemberFunctionType.cpp
index fd832a891..886513f03 100644
--- a/lib/PhasarLLVM/ControlFlow/SpecialMemberFunctionType.cpp
+++ b/lib/ControlFlow/SpecialMemberFunctionType.cpp
@@ -7,13 +7,11 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/ControlFlow/SpecialMemberFunctionType.h"
+#include "phasar/ControlFlow/SpecialMemberFunctionType.h"
 
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Support/raw_ostream.h"
 
-using namespace psr;
-
 std::string psr::toString(SpecialMemberFunctionType SMFT) {
   switch (SMFT) {
   default:
@@ -21,17 +19,17 @@ std::string psr::toString(SpecialMemberFunctionType SMFT) {
   case SpecialMemberFunctionType::TYPE:                                        \
     return NAME;                                                               \
     break;
-#include "phasar/PhasarLLVM/ControlFlow/SpecialMemberFunctionType.def"
+#include "phasar/ControlFlow/SpecialMemberFunctionType.def"
   }
 }
 
-SpecialMemberFunctionType
+psr::SpecialMemberFunctionType
 psr::toSpecialMemberFunctionType(llvm::StringRef SMFT) {
   SpecialMemberFunctionType Type =
       llvm::StringSwitch<SpecialMemberFunctionType>(SMFT)
 #define SPECIAL_MEMBER_FUNCTION_TYPES(NAME, TYPE)                              \
   .Case(NAME, SpecialMemberFunctionType::TYPE)
-#include "phasar/PhasarLLVM/ControlFlow/SpecialMemberFunctionType.def"
+#include "phasar/ControlFlow/SpecialMemberFunctionType.def"
           .Default(SpecialMemberFunctionType::None);
   return Type;
 }
diff --git a/lib/Controller/AnalysisController.cpp b/lib/Controller/AnalysisController.cpp
index 4a82e7931..c019feda4 100644
--- a/lib/Controller/AnalysisController.cpp
+++ b/lib/Controller/AnalysisController.cpp
@@ -9,11 +9,11 @@
 
 #include "phasar/Controller/AnalysisController.h"
 
+#include "phasar/AnalysisStrategy/Strategies.h"
 #include "phasar/Controller/AnalysisControllerEmitterOptions.h"
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/Strategies.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/HelperAnalyses.h"
 #include "phasar/PhasarLLVM/Passes/GeneralStatisticsAnalysis.h"
 #include "phasar/PhasarLLVM/Utils/DataFlowAnalysisType.h"
 #include "phasar/Utils/Utilities.h"
diff --git a/lib/Controller/AnalysisControllerXIDECSTDIOTS.cpp b/lib/Controller/AnalysisControllerXIDECSTDIOTS.cpp
index 25d9c86a6..68cb0c0f4 100644
--- a/lib/Controller/AnalysisControllerXIDECSTDIOTS.cpp
+++ b/lib/Controller/AnalysisControllerXIDECSTDIOTS.cpp
@@ -8,8 +8,8 @@
  *****************************************************************************/
 
 #include "phasar/Controller/AnalysisController.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETypeStateAnalysis.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.h"
 
 namespace psr {
 
diff --git a/lib/Controller/AnalysisControllerXIDEIIA.cpp b/lib/Controller/AnalysisControllerXIDEIIA.cpp
index 035150e0c..5869dd5fe 100644
--- a/lib/Controller/AnalysisControllerXIDEIIA.cpp
+++ b/lib/Controller/AnalysisControllerXIDEIIA.cpp
@@ -8,7 +8,7 @@
  *****************************************************************************/
 
 #include "phasar/Controller/AnalysisController.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEInstInteractionAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysis.h"
 
 namespace psr {
 
diff --git a/lib/Controller/AnalysisControllerXIDELinearConst.cpp b/lib/Controller/AnalysisControllerXIDELinearConst.cpp
index ff61aa3e4..7f6210086 100644
--- a/lib/Controller/AnalysisControllerXIDELinearConst.cpp
+++ b/lib/Controller/AnalysisControllerXIDELinearConst.cpp
@@ -8,7 +8,7 @@
  *****************************************************************************/
 
 #include "phasar/Controller/AnalysisController.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysis.h"
 
 namespace psr {
 
diff --git a/lib/Controller/AnalysisControllerXIDEOpenSSLTS.cpp b/lib/Controller/AnalysisControllerXIDEOpenSSLTS.cpp
index 2a79408d8..b686680f0 100644
--- a/lib/Controller/AnalysisControllerXIDEOpenSSLTS.cpp
+++ b/lib/Controller/AnalysisControllerXIDEOpenSSLTS.cpp
@@ -8,8 +8,8 @@
  *****************************************************************************/
 
 #include "phasar/Controller/AnalysisController.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETypeStateAnalysis.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.h"
 
 namespace psr {
 
diff --git a/lib/Controller/AnalysisControllerXIDESolverTest.cpp b/lib/Controller/AnalysisControllerXIDESolverTest.cpp
index 19bc7853e..5c840dc50 100644
--- a/lib/Controller/AnalysisControllerXIDESolverTest.cpp
+++ b/lib/Controller/AnalysisControllerXIDESolverTest.cpp
@@ -8,7 +8,7 @@
  *****************************************************************************/
 
 #include "phasar/Controller/AnalysisController.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDESolverTest.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDESolverTest.h"
 
 namespace psr {
 
diff --git a/lib/Controller/AnalysisControllerXIDEXTaint.cpp b/lib/Controller/AnalysisControllerXIDEXTaint.cpp
index 963047d80..8813c0ff7 100644
--- a/lib/Controller/AnalysisControllerXIDEXTaint.cpp
+++ b/lib/Controller/AnalysisControllerXIDEXTaint.cpp
@@ -8,7 +8,7 @@
  *****************************************************************************/
 
 #include "phasar/Controller/AnalysisController.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEExtendedTaintAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.h"
 
 namespace psr {
 
diff --git a/lib/Controller/AnalysisControllerXIFDSConst.cpp b/lib/Controller/AnalysisControllerXIFDSConst.cpp
index 866cd4d5e..0dfc6c724 100644
--- a/lib/Controller/AnalysisControllerXIFDSConst.cpp
+++ b/lib/Controller/AnalysisControllerXIFDSConst.cpp
@@ -8,7 +8,7 @@
  *****************************************************************************/
 
 #include "phasar/Controller/AnalysisController.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSConstAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSConstAnalysis.h"
 
 namespace psr {
 
diff --git a/lib/Controller/AnalysisControllerXIFDSFieldSensTaint.cpp b/lib/Controller/AnalysisControllerXIFDSFieldSensTaint.cpp
index aa63144fa..0042d9400 100644
--- a/lib/Controller/AnalysisControllerXIFDSFieldSensTaint.cpp
+++ b/lib/Controller/AnalysisControllerXIFDSFieldSensTaint.cpp
@@ -8,7 +8,7 @@
  *****************************************************************************/
 
 #include "phasar/Controller/AnalysisController.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSFieldSensTaintAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSFieldSensTaintAnalysis.h"
 
 namespace psr {
 
diff --git a/lib/Controller/AnalysisControllerXIFDSSolverTest.cpp b/lib/Controller/AnalysisControllerXIFDSSolverTest.cpp
index a9b94be6d..ff45656e2 100644
--- a/lib/Controller/AnalysisControllerXIFDSSolverTest.cpp
+++ b/lib/Controller/AnalysisControllerXIFDSSolverTest.cpp
@@ -8,7 +8,7 @@
  *****************************************************************************/
 
 #include "phasar/Controller/AnalysisController.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSSolverTest.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSSolverTest.h"
 
 namespace psr {
 
diff --git a/lib/Controller/AnalysisControllerXIFDSTaint.cpp b/lib/Controller/AnalysisControllerXIFDSTaint.cpp
index 9146a738f..49fe79caa 100644
--- a/lib/Controller/AnalysisControllerXIFDSTaint.cpp
+++ b/lib/Controller/AnalysisControllerXIFDSTaint.cpp
@@ -8,7 +8,7 @@
  *****************************************************************************/
 
 #include "phasar/Controller/AnalysisController.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTaintAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysis.h"
 
 namespace psr {
 
diff --git a/lib/Controller/AnalysisControllerXIFDSType.cpp b/lib/Controller/AnalysisControllerXIFDSType.cpp
index d6513c3d5..2c90d8536 100644
--- a/lib/Controller/AnalysisControllerXIFDSType.cpp
+++ b/lib/Controller/AnalysisControllerXIFDSType.cpp
@@ -8,7 +8,7 @@
  *****************************************************************************/
 
 #include "phasar/Controller/AnalysisController.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTypeAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTypeAnalysis.h"
 
 namespace psr {
 
diff --git a/lib/Controller/AnalysisControllerXIFDSUninit.cpp b/lib/Controller/AnalysisControllerXIFDSUninit.cpp
index 917e32944..1e1772f76 100644
--- a/lib/Controller/AnalysisControllerXIFDSUninit.cpp
+++ b/lib/Controller/AnalysisControllerXIFDSUninit.cpp
@@ -8,7 +8,7 @@
  *****************************************************************************/
 
 #include "phasar/Controller/AnalysisController.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSUninitializedVariables.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariables.h"
 
 namespace psr {
 
diff --git a/lib/Controller/AnalysisControllerXInterMonoSolverTest.cpp b/lib/Controller/AnalysisControllerXInterMonoSolverTest.cpp
index fd992e433..f6de335f4 100644
--- a/lib/Controller/AnalysisControllerXInterMonoSolverTest.cpp
+++ b/lib/Controller/AnalysisControllerXInterMonoSolverTest.cpp
@@ -8,7 +8,7 @@
  *****************************************************************************/
 
 #include "phasar/Controller/AnalysisController.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoSolverTest.h"
+#include "phasar/PhasarLLVM/DataFlow/Mono/Problems/InterMonoSolverTest.h"
 
 namespace psr {
 
diff --git a/lib/Controller/AnalysisControllerXInterMonoTaint.cpp b/lib/Controller/AnalysisControllerXInterMonoTaint.cpp
index 938cd107f..2f9a6cbea 100644
--- a/lib/Controller/AnalysisControllerXInterMonoTaint.cpp
+++ b/lib/Controller/AnalysisControllerXInterMonoTaint.cpp
@@ -8,7 +8,7 @@
  *****************************************************************************/
 
 #include "phasar/Controller/AnalysisController.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoTaintAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/Mono/Problems/InterMonoTaintAnalysis.h"
 
 namespace psr {
 
diff --git a/lib/Controller/AnalysisControllerXIntraMonoFullConstant.cpp b/lib/Controller/AnalysisControllerXIntraMonoFullConstant.cpp
index ebfb70d0c..50013234f 100644
--- a/lib/Controller/AnalysisControllerXIntraMonoFullConstant.cpp
+++ b/lib/Controller/AnalysisControllerXIntraMonoFullConstant.cpp
@@ -8,7 +8,7 @@
  *****************************************************************************/
 
 #include "phasar/Controller/AnalysisController.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoFullConstantPropagation.h"
+#include "phasar/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoFullConstantPropagation.h"
 
 namespace psr {
 
diff --git a/lib/Controller/AnalysisControllerXIntraMonoSolverTest.cpp b/lib/Controller/AnalysisControllerXIntraMonoSolverTest.cpp
index 120c29db4..c3b61cf7e 100644
--- a/lib/Controller/AnalysisControllerXIntraMonoSolverTest.cpp
+++ b/lib/Controller/AnalysisControllerXIntraMonoSolverTest.cpp
@@ -8,7 +8,7 @@
  *****************************************************************************/
 
 #include "phasar/Controller/AnalysisController.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoSolverTest.h"
+#include "phasar/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoSolverTest.h"
 
 namespace psr {
 
diff --git a/lib/Controller/CMakeLists.txt b/lib/Controller/CMakeLists.txt
index df5a0a7b5..242ffcf4c 100644
--- a/lib/Controller/CMakeLists.txt
+++ b/lib/Controller/CMakeLists.txt
@@ -1,13 +1,13 @@
 file(GLOB_RECURSE CONTROLLER_SRC *.h *.cpp)
 
 set(PHASAR_LINK_LIBS
-  phasar_ifdside
+  phasar_llvm_ifdside
   phasar_mono
-  phasar_db
-  phasar_pointer
-  phasar_typehierarchy
-  phasar_controlflow
-  phasar_phasarllvm_utils
+  phasar_llvm_db
+  phasar_llvm_pointer
+  phasar_llvm_typehierarchy
+  phasar_llvm_controlflow
+  phasar_llvm_utils
   phasar_utils
   phasar_analysis_strategy
   phasar_taintconfig
diff --git a/lib/DB/CMakeLists.txt b/lib/DB/CMakeLists.txt
index 0b966a028..4579879ce 100644
--- a/lib/DB/CMakeLists.txt
+++ b/lib/DB/CMakeLists.txt
@@ -7,26 +7,10 @@ include_directories(
 set(PHASAR_LINK_LIBS
   phasar_passes
   phasar_utils
-  phasar_phasarllvm_utils
 )
 
 set(LLVM_LINK_COMPONENTS
   Support
-  Core
-  # Vectorize
-  # ScalarOpts
-  # Instrumentation
-  # ObjCARCOpts
-  # TransformUtils
-  # CodeGen
-  # Analysis
-  # ipo
-  IRReader
-  # InstCombine
-  Linker
-  BitWriter
-  Passes
-  Demangle
 )
 
 if(BUILD_SHARED_LIBS)
diff --git a/lib/PhasarLLVM/CMakeLists.txt b/lib/PhasarLLVM/CMakeLists.txt
index 1fed4f2a4..7d446b251 100644
--- a/lib/PhasarLLVM/CMakeLists.txt
+++ b/lib/PhasarLLVM/CMakeLists.txt
@@ -1,8 +1,34 @@
-add_subdirectory(AnalysisStrategy)
+add_subdirectory(DB)
 add_subdirectory(ControlFlow)
-add_subdirectory(DataFlowSolver)
+add_subdirectory(DataFlow)
 add_subdirectory(Passes)
 add_subdirectory(Pointer)
 add_subdirectory(TaintConfig)
 add_subdirectory(TypeHierarchy)
 add_subdirectory(Utils)
+
+file(GLOB PHASAR_LLVM_SRC *.h *.cpp)
+
+set(PHASAR_LINK_LIBS
+    phasar_llvm_pointer
+    phasar_llvm_db
+    phasar_llvm_controlflow
+    phasar_llvm_typehierarchy
+)
+
+set(LLVM_LINK_COMPONENTS
+  Core
+  Support
+)
+
+if(BUILD_SHARED_LIBS)
+  add_phasar_library(phasar_llvm
+    SHARED
+    ${PHASAR_LLVM_SRC}
+  )
+else()
+  add_phasar_library(phasar_llvm
+    STATIC
+    ${PHASAR_LLVM_SRC}
+  )
+endif()
diff --git a/lib/PhasarLLVM/ControlFlow/CMakeLists.txt b/lib/PhasarLLVM/ControlFlow/CMakeLists.txt
index 8be0f57c5..3f93e7e90 100644
--- a/lib/PhasarLLVM/ControlFlow/CMakeLists.txt
+++ b/lib/PhasarLLVM/ControlFlow/CMakeLists.txt
@@ -1,10 +1,11 @@
 file(GLOB_RECURSE CONTROLFLOW_SRC *.h *.cpp)
 
 set(PHASAR_LINK_LIBS
-  phasar_pointer
-  phasar_typehierarchy
+  phasar_llvm_pointer
+  phasar_llvm_typehierarchy
   phasar_db
   phasar_utils
+  phasar_controlflow
 )
 
 set(LLVM_LINK_COMPONENTS
@@ -14,18 +15,18 @@ set(LLVM_LINK_COMPONENTS
 )
 
 if(BUILD_SHARED_LIBS)
-  add_phasar_library(phasar_controlflow
+  add_phasar_library(phasar_llvm_controlflow
     SHARED
     ${CONTROLFLOW_SRC}
   )
 else()
-  add_phasar_library(phasar_controlflow
+  add_phasar_library(phasar_llvm_controlflow
     STATIC
     ${CONTROLFLOW_SRC}
   )
 endif()
 
-set_target_properties(phasar_controlflow
+set_target_properties(phasar_llvm_controlflow
   PROPERTIES
   LINKER_LANGUAGE CXX
   PREFIX "lib"
diff --git a/lib/PhasarLLVM/ControlFlow/LLVMBasedBackwardCFG.cpp b/lib/PhasarLLVM/ControlFlow/LLVMBasedBackwardCFG.cpp
index ca212bae9..5e042a41d 100644
--- a/lib/PhasarLLVM/ControlFlow/LLVMBasedBackwardCFG.cpp
+++ b/lib/PhasarLLVM/ControlFlow/LLVMBasedBackwardCFG.cpp
@@ -9,7 +9,7 @@
 
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardCFG.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 
 #include "llvm/IR/Instructions.h"
 
diff --git a/lib/PhasarLLVM/ControlFlow/LLVMBasedCFG.cpp b/lib/PhasarLLVM/ControlFlow/LLVMBasedCFG.cpp
index 148cdf376..de04d2865 100644
--- a/lib/PhasarLLVM/ControlFlow/LLVMBasedCFG.cpp
+++ b/lib/PhasarLLVM/ControlFlow/LLVMBasedCFG.cpp
@@ -9,8 +9,8 @@
 
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h"
 
+#include "phasar/ControlFlow/SpecialMemberFunctionType.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardCFG.h"
-#include "phasar/PhasarLLVM/ControlFlow/SpecialMemberFunctionType.h"
 #include "phasar/PhasarLLVM/Utils/LLVMIRToSrc.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"
diff --git a/lib/PhasarLLVM/ControlFlow/LLVMBasedICFG.cpp b/lib/PhasarLLVM/ControlFlow/LLVMBasedICFG.cpp
index 9dfebe366..39fbe6ef4 100644
--- a/lib/PhasarLLVM/ControlFlow/LLVMBasedICFG.cpp
+++ b/lib/PhasarLLVM/ControlFlow/LLVMBasedICFG.cpp
@@ -10,10 +10,10 @@
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
 
 #include "phasar/Config/Configuration.h"
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/ControlFlow/CallGraphAnalysisType.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h"
-#include "phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.h"
 #include "phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
diff --git a/lib/PhasarLLVM/ControlFlow/LLVMBasedICFGExportsImpl.cpp b/lib/PhasarLLVM/ControlFlow/LLVMBasedICFGExportsImpl.cpp
index 8702b69b6..dcdf5bcaa 100644
--- a/lib/PhasarLLVM/ControlFlow/LLVMBasedICFGExportsImpl.cpp
+++ b/lib/PhasarLLVM/ControlFlow/LLVMBasedICFGExportsImpl.cpp
@@ -7,9 +7,9 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Utils/LLVMIRToSrc.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Utilities.h"
diff --git a/lib/PhasarLLVM/ControlFlow/LLVMBasedICFGGlobalsImpl.cpp b/lib/PhasarLLVM/ControlFlow/LLVMBasedICFGGlobalsImpl.cpp
index b01075eb1..7d2ee5abf 100644
--- a/lib/PhasarLLVM/ControlFlow/LLVMBasedICFGGlobalsImpl.cpp
+++ b/lib/PhasarLLVM/ControlFlow/LLVMBasedICFGGlobalsImpl.cpp
@@ -7,8 +7,8 @@
  *     Philipp Schubert, Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"
 
diff --git a/lib/PhasarLLVM/ControlFlow/Resolver/RTAResolver.cpp b/lib/PhasarLLVM/ControlFlow/Resolver/RTAResolver.cpp
index 1d352326d..67d163df6 100644
--- a/lib/PhasarLLVM/ControlFlow/Resolver/RTAResolver.cpp
+++ b/lib/PhasarLLVM/ControlFlow/Resolver/RTAResolver.cpp
@@ -16,7 +16,7 @@
 
 #include "phasar/PhasarLLVM/ControlFlow/Resolver/RTAResolver.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"
diff --git a/lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp b/lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp
index 8a97a6b2e..54dc3e0d0 100644
--- a/lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp
+++ b/lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp
@@ -16,13 +16,13 @@
 
 #include "phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/ControlFlow/CallGraphAnalysisType.h"
 #include "phasar/PhasarLLVM/ControlFlow/Resolver/CHAResolver.h"
-#include "phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.h"
 #include "phasar/PhasarLLVM/ControlFlow/Resolver/DTAResolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/Resolver/NOResolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/Resolver/OTFResolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/Resolver/RTAResolver.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"
diff --git a/lib/PhasarLLVM/DB/CMakeLists.txt b/lib/PhasarLLVM/DB/CMakeLists.txt
new file mode 100644
index 000000000..cda931d3f
--- /dev/null
+++ b/lib/PhasarLLVM/DB/CMakeLists.txt
@@ -0,0 +1,31 @@
+file(GLOB_RECURSE PSR_LLVM_DB_SRC *.h *.cpp)
+
+set(PHASAR_LINK_LIBS
+  phasar_db
+  phasar_utils
+  phasar_llvm_utils
+)
+
+set(LLVM_LINK_COMPONENTS
+  Core
+  Support
+  IRReader
+)
+
+if(BUILD_SHARED_LIBS)
+  add_phasar_library(phasar_llvm_db
+    SHARED
+    ${PSR_LLVM_DB_SRC}
+  )
+else()
+  add_phasar_library(phasar_llvm_db
+    STATIC
+    ${PSR_LLVM_DB_SRC}
+  )
+endif()
+
+set_target_properties(phasar_llvm_db
+  PROPERTIES
+  LINKER_LANGUAGE CXX
+  PREFIX "lib"
+)
diff --git a/lib/DB/LLVMProjectIRDB.cpp b/lib/PhasarLLVM/DB/LLVMProjectIRDB.cpp
similarity index 99%
rename from lib/DB/LLVMProjectIRDB.cpp
rename to lib/PhasarLLVM/DB/LLVMProjectIRDB.cpp
index 981979994..17f05d6c8 100644
--- a/lib/DB/LLVMProjectIRDB.cpp
+++ b/lib/PhasarLLVM/DB/LLVMProjectIRDB.cpp
@@ -1,4 +1,5 @@
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+
 #include "phasar/Config/Configuration.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/CMakeLists.txt b/lib/PhasarLLVM/DataFlow/CMakeLists.txt
similarity index 100%
rename from lib/PhasarLLVM/DataFlowSolver/CMakeLists.txt
rename to lib/PhasarLLVM/DataFlow/CMakeLists.txt
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/CMakeLists.txt b/lib/PhasarLLVM/DataFlow/IfdsIde/CMakeLists.txt
similarity index 60%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/CMakeLists.txt
rename to lib/PhasarLLVM/DataFlow/IfdsIde/CMakeLists.txt
index 9e44e540a..7ab2b533a 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/CMakeLists.txt
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/CMakeLists.txt
@@ -3,10 +3,11 @@ file(GLOB_RECURSE IFDSIDE_SRC *.h *.cpp)
 set(PHASAR_LINK_LIBS
   phasar_config
   phasar_utils
-  phasar_pointer
-  phasar_typehierarchy
-  phasar_controlflow
-  phasar_phasarllvm_utils
+  phasar_llvm_pointer
+  phasar_llvm
+  phasar_llvm_typehierarchy
+  phasar_llvm_controlflow
+  phasar_llvm_utils
   phasar_db
   phasar_taintconfig
   ${Boost_LIBRARIES}
@@ -19,18 +20,18 @@ set(LLVM_LINK_COMPONENTS
 )
 
 if(BUILD_SHARED_LIBS)
-  add_phasar_library(phasar_ifdside
+  add_phasar_library(phasar_llvm_ifdside
     SHARED
     ${IFDSIDE_SRC}
   )
 else()
-  add_phasar_library(phasar_ifdside
+  add_phasar_library(phasar_llvm_ifdside
     STATIC
     ${IFDSIDE_SRC}
   )
 endif()
 
-set_target_properties(phasar_ifdside
+set_target_properties(phasar_llvm_ifdside
   PROPERTIES
   LINKER_LANGUAGE CXX
   PREFIX "lib"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/BranchSwitchInstFlowFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/BranchSwitchInstFlowFunction.cpp
similarity index 82%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/BranchSwitchInstFlowFunction.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/BranchSwitchInstFlowFunction.cpp
index 102fd2188..fa57a4022 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/BranchSwitchInstFlowFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/BranchSwitchInstFlowFunction.cpp
@@ -2,7 +2,12 @@
  * @author Sebastian Roland <seroland86@gmail.com>
  */
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/BranchSwitchInstFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/BranchSwitchInstFlowFunction.h"
+
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/Log.h"
+
+#include "llvm/IR/Instructions.h"
 
 namespace psr {
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CallToRetFlowFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CallToRetFlowFunction.cpp
similarity index 84%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CallToRetFlowFunction.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CallToRetFlowFunction.cpp
index 4a123ce5a..3cb8e05bb 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CallToRetFlowFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CallToRetFlowFunction.cpp
@@ -2,7 +2,9 @@
  * @author Sebastian Roland <seroland86@gmail.com>
  */
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CallToRetFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CallToRetFlowFunction.h"
+
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h"
 
 #include "llvm/IR/IntrinsicInst.h"
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CheckOperandsFlowFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CheckOperandsFlowFunction.cpp
similarity index 72%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CheckOperandsFlowFunction.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CheckOperandsFlowFunction.cpp
index 71248da9c..1fea56423 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CheckOperandsFlowFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CheckOperandsFlowFunction.cpp
@@ -2,7 +2,9 @@
  * @author Sebastian Roland <seroland86@gmail.com>
  */
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CheckOperandsFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CheckOperandsFlowFunction.h"
+
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h"
 
 namespace psr {
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.cpp
similarity index 93%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.cpp
index a36689cd9..ef95a157a 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.cpp
@@ -2,7 +2,9 @@
  * @author Sebastian Roland <seroland86@gmail.com>
  */
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/FlowFunctionBase.h"
+
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h"
 
 #include "llvm/IR/IntrinsicInst.h"
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GEPInstFlowFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GEPInstFlowFunction.cpp
similarity index 83%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GEPInstFlowFunction.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GEPInstFlowFunction.cpp
index 126be6417..091f23e11 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GEPInstFlowFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GEPInstFlowFunction.cpp
@@ -2,7 +2,11 @@
  * @author Sebastian Roland <seroland86@gmail.com>
  */
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GEPInstFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GEPInstFlowFunction.h"
+
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h"
+
+#include "llvm/IR/Instructions.h"
 
 namespace psr {
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GenerateFlowFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GenerateFlowFunction.cpp
similarity index 72%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GenerateFlowFunction.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GenerateFlowFunction.cpp
index 59f7cc0ac..d1ede49cf 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GenerateFlowFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GenerateFlowFunction.cpp
@@ -2,7 +2,7 @@
  * @author Sebastian Roland <seroland86@gmail.com>
  */
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GenerateFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GenerateFlowFunction.h"
 
 namespace psr {
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/IdentityFlowFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/IdentityFlowFunction.cpp
similarity index 63%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/IdentityFlowFunction.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/IdentityFlowFunction.cpp
index 06936bc84..d05b26a6d 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/IdentityFlowFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/IdentityFlowFunction.cpp
@@ -2,7 +2,7 @@
  * @author Sebastian Roland <seroland86@gmail.com>
  */
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/IdentityFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/IdentityFlowFunction.h"
 
 namespace psr {
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCallee.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCallee.cpp
similarity index 90%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCallee.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCallee.cpp
index eb0ec1f59..de90fb815 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCallee.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCallee.cpp
@@ -2,11 +2,10 @@
  * @author Sebastian Roland <seroland86@gmail.com>
  */
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCallee.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCallee.h"
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/Log.h"
-#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/Log.h"
 
 #include <algorithm>
 #include <tuple>
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCaller.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCaller.cpp
similarity index 89%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCaller.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCaller.cpp
index 586167584..90e374d53 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCaller.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCaller.cpp
@@ -2,11 +2,10 @@
  * @author Sebastian Roland <seroland86@gmail.com>
  */
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCaller.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCaller.h"
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/Log.h"
-#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/Log.h"
 
 #include <algorithm>
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemSetInstFlowFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemSetInstFlowFunction.cpp
similarity index 72%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemSetInstFlowFunction.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemSetInstFlowFunction.cpp
index 5d91cb7fc..857efded3 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemSetInstFlowFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemSetInstFlowFunction.cpp
@@ -2,7 +2,9 @@
  * @author Sebastian Roland <seroland86@gmail.com>
  */
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemSetInstFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemSetInstFlowFunction.h"
+
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h"
 
 #include "llvm/IR/IntrinsicInst.h"
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemTransferInstFlowFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemTransferInstFlowFunction.cpp
similarity index 90%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemTransferInstFlowFunction.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemTransferInstFlowFunction.cpp
index eece74642..c240bd71b 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemTransferInstFlowFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemTransferInstFlowFunction.cpp
@@ -2,7 +2,10 @@
  * @author Sebastian Roland <seroland86@gmail.com>
  */
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemTransferInstFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemTransferInstFlowFunction.h"
+
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/Log.h"
 
 #include "llvm/IR/IntrinsicInst.h"
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/PHINodeFlowFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/PHINodeFlowFunction.cpp
similarity index 74%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/PHINodeFlowFunction.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/PHINodeFlowFunction.cpp
index f37a7d34a..f2d244fd8 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/PHINodeFlowFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/PHINodeFlowFunction.cpp
@@ -2,7 +2,11 @@
  * @author Sebastian Roland <seroland86@gmail.com>
  */
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/PHINodeFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/PHINodeFlowFunction.h"
+
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h"
+
+#include "llvm/IR/Instructions.h"
 
 namespace psr {
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/ReturnInstFlowFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/ReturnInstFlowFunction.cpp
similarity index 81%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/ReturnInstFlowFunction.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/ReturnInstFlowFunction.cpp
index f36d02576..0e78ac814 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/ReturnInstFlowFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/ReturnInstFlowFunction.cpp
@@ -2,7 +2,9 @@
  * @author Sebastian Roland <seroland86@gmail.com>
  */
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/ReturnInstFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/ReturnInstFlowFunction.h"
+
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h"
 
 namespace psr {
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/StoreInstFlowFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/StoreInstFlowFunction.cpp
similarity index 95%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/StoreInstFlowFunction.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/StoreInstFlowFunction.cpp
index 648efd4c4..f147c1211 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/StoreInstFlowFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/StoreInstFlowFunction.cpp
@@ -2,7 +2,10 @@
  * @author Sebastian Roland <seroland86@gmail.com>
  */
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/StoreInstFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/StoreInstFlowFunction.h"
+
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/Log.h"
 
 namespace psr {
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAEndInstFlowFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAEndInstFlowFunction.cpp
similarity index 78%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAEndInstFlowFunction.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAEndInstFlowFunction.cpp
index d887896fa..61a46d55e 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAEndInstFlowFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAEndInstFlowFunction.cpp
@@ -2,7 +2,10 @@
  * @author Sebastian Roland <seroland86@gmail.com>
  */
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAEndInstFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAEndInstFlowFunction.h"
+
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/Log.h"
 
 #include "llvm/IR/IntrinsicInst.h"
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAStartInstFlowFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAStartInstFlowFunction.cpp
similarity index 80%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAStartInstFlowFunction.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAStartInstFlowFunction.cpp
index 1fc8386f9..c83c76541 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAStartInstFlowFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAStartInstFlowFunction.cpp
@@ -2,7 +2,10 @@
  * @author Sebastian Roland <seroland86@gmail.com>
  */
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAStartInstFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAStartInstFlowFunction.h"
+
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/Log.h"
 
 #include "llvm/IR/IntrinsicInst.h"
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovRetValWriter.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovRetValWriter.cpp
similarity index 95%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovRetValWriter.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovRetValWriter.cpp
index c33bc8354..036bdc37f 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovRetValWriter.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovRetValWriter.cpp
@@ -2,7 +2,7 @@
  * @author Sebastian Roland <seroland86@gmail.com>
  */
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovRetValWriter.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovRetValWriter.h"
 
 namespace psr {
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovWriter.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovWriter.cpp
similarity index 90%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovWriter.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovWriter.cpp
index 40e75d9b3..9730fff69 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovWriter.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovWriter.cpp
@@ -2,7 +2,7 @@
  * @author Sebastian Roland <seroland86@gmail.com>
  */
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovWriter.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovWriter.h"
 
 namespace psr {
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LineNumberWriter.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LineNumberWriter.cpp
similarity index 85%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LineNumberWriter.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LineNumberWriter.cpp
index 749ac717b..b4ac741cb 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LineNumberWriter.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LineNumberWriter.cpp
@@ -2,7 +2,7 @@
  * @author Sebastian Roland <seroland86@gmail.com>
  */
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LineNumberWriter.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LineNumberWriter.h"
 
 namespace psr {
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStats.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStats.cpp
similarity index 94%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStats.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStats.cpp
index c283021c2..c98e07db9 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStats.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStats.cpp
@@ -2,9 +2,9 @@
  * @author Sebastian Roland <seroland86@gmail.com>
  */
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStats.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStats.h"
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/Log.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/Log.h"
 
 #include "llvm/IR/DebugInfoMetadata.h"
 #include "llvm/IR/Function.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.cpp
similarity index 99%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.cpp
index 7542c6a61..24959d9f8 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.cpp
@@ -2,9 +2,9 @@
  * @author Sebastian Roland <seroland86@gmail.com>
  */
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h"
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/Log.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/Log.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
 #include "llvm/Analysis/PostDominators.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSIDESolverConfig.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSIDESolverConfig.cpp
similarity index 96%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSIDESolverConfig.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/IFDSIDESolverConfig.cpp
index 707a787e1..7e6d854ad 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSIDESolverConfig.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/IFDSIDESolverConfig.cpp
@@ -7,9 +7,8 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSIDESolverConfig.h"
+#include "phasar/DataFlow/IfdsIde/IFDSIDESolverConfig.h"
 
-#include <ios>
 #include <ostream>
 
 using namespace std;
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.cpp
similarity index 94%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.cpp
index d20443a97..6d174a857 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.cpp
@@ -1,4 +1,5 @@
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
+
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
 #include "llvm/IR/Constants.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocation.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocation.cpp
similarity index 98%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocation.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocation.cpp
index 6fa2b9aa2..da9898ee0 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocation.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocation.cpp
@@ -7,7 +7,7 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocation.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocation.h"
 
 #include "phasar/PhasarLLVM/Utils/BasicBlockOrdering.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocationFactory.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocationFactory.cpp
similarity index 99%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocationFactory.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocationFactory.cpp
index bd4c27b2b..d3a11d09c 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocationFactory.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocationFactory.cpp
@@ -7,7 +7,7 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocationFactory.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocationFactory.h"
 
 #include "phasar/Utils/Logger.h"
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.cpp
similarity index 74%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.cpp
index 26305b401..698c9306b 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.cpp
@@ -7,12 +7,12 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.h"
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinConstEdgeFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinConstEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.h"
 
 namespace psr::XTaint {
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/DebugEdgeIdentity.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/DebugEdgeIdentity.cpp
similarity index 91%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/DebugEdgeIdentity.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/DebugEdgeIdentity.cpp
index a309f06b8..e480d39a2 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/DebugEdgeIdentity.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/DebugEdgeIdentity.cpp
@@ -7,9 +7,9 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/DebugEdgeIdentity.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/DebugEdgeIdentity.h"
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionUtils.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
 namespace psr::XTaint {
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.cpp
similarity index 97%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.cpp
index 89167544d..c7570f6e3 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.cpp
@@ -7,7 +7,7 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.h"
 
 #include "phasar/PhasarLLVM/Utils/BasicBlockOrdering.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.cpp
similarity index 84%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.cpp
index e1c68acd3..7f8dccb0d 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.cpp
@@ -7,14 +7,14 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.h"
-
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionUtils.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinConstEdgeFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/KillIfSanitizedEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.h"
+
+#include "phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinConstEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/KillIfSanitizedEdgeFunction.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
 #include "llvm/IR/Instruction.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.cpp
similarity index 86%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.cpp
index 374714e3e..567198735 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.cpp
@@ -7,13 +7,13 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h"
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionUtils.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/DebugEdgeIdentity.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/DebugEdgeIdentity.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.h"
 #include "phasar/PhasarLLVM/Utils/BasicBlockOrdering.h"
 
 #include "llvm/ADT/DenseMap.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinConstEdgeFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinConstEdgeFunction.cpp
similarity index 82%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinConstEdgeFunction.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinConstEdgeFunction.cpp
index d51dbb075..19f732924 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinConstEdgeFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinConstEdgeFunction.cpp
@@ -7,13 +7,13 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinConstEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinConstEdgeFunction.h"
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionUtils.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
 #include "llvm/IR/Instruction.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.cpp
similarity index 91%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.cpp
index b2934760e..3d5f568b8 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.cpp
@@ -7,12 +7,12 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.h"
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinConstEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinConstEdgeFunction.h"
 #include "phasar/PhasarLLVM/Utils/BasicBlockOrdering.h"
 
 #include "llvm/ADT/SmallPtrSet.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/KillIfSanitizedEdgeFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/KillIfSanitizedEdgeFunction.cpp
similarity index 75%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/KillIfSanitizedEdgeFunction.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/KillIfSanitizedEdgeFunction.cpp
index 8a7414bdb..3ef0bbb1a 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/KillIfSanitizedEdgeFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/KillIfSanitizedEdgeFunction.cpp
@@ -7,12 +7,12 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/KillIfSanitizedEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/KillIfSanitizedEdgeFunction.h"
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinConstEdgeFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinConstEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.h"
 #include "phasar/PhasarLLVM/Utils/BasicBlockOrdering.h"
 
 #include "llvm/IR/Instruction.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/TransferEdgeFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/TransferEdgeFunction.cpp
similarity index 88%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/TransferEdgeFunction.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/TransferEdgeFunction.cpp
index 8747e94b0..5fcbf6ea5 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/TransferEdgeFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/TransferEdgeFunction.cpp
@@ -7,9 +7,9 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/TransferEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/TransferEdgeFunction.h"
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.h"
 #include "phasar/PhasarLLVM/Utils/BasicBlockOrdering.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintAnalysisBase.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintAnalysisBase.cpp
similarity index 94%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintAnalysisBase.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintAnalysisBase.cpp
index 32a26fd3b..a9aaf1412 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintAnalysisBase.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintAnalysisBase.cpp
@@ -1,4 +1,4 @@
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintAnalysisBase.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintAnalysisBase.h"
 
 #include "phasar/PhasarLLVM/TaintConfig/TaintConfig.h"
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.cpp
similarity index 74%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.cpp
index 9ff3bf951..3e6729877 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.cpp
@@ -7,14 +7,14 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.h"
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionUtils.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinConstEdgeFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinConstEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.h"
 
 namespace psr::XTaint {
 EdgeFunctionBase::EdgeFunctionBase(EFKind Kind, BasicBlockOrdering &BBO)
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEExtendedTaintAnalysis.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.cpp
similarity index 97%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEExtendedTaintAnalysis.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.cpp
index 792c711ea..5806bfbba 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEExtendedTaintAnalysis.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.cpp
@@ -7,19 +7,20 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEExtendedTaintAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.h"
 
+#include "phasar/DataFlow/IfdsIde/FlowFunctions.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/KillIfSanitizedEdgeFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/TransferEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/KillIfSanitizedEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/TransferEdgeFunction.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/PhasarLLVM/TaintConfig/TaintConfig.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
+#include "phasar/Pointer/PointsToInfo.h"
 #include "phasar/Utils/DebugOutput.h"
 #include "phasar/Utils/Logger.h"
 #include "phasar/Utils/Utilities.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/AllBot.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/AllBot.cpp
similarity index 80%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/AllBot.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/AllBot.cpp
index dd86dbf74..7a83996f6 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/AllBot.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/AllBot.cpp
@@ -7,10 +7,10 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/AllBot.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/AllBot.h"
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/JoinEdgeFunction.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/JoinEdgeFunction.h"
 
 namespace psr::glca {
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/BinaryEdgeFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/BinaryEdgeFunction.cpp
similarity index 87%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/BinaryEdgeFunction.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/BinaryEdgeFunction.cpp
index 6d88f9ece..a89fa690d 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/BinaryEdgeFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/BinaryEdgeFunction.cpp
@@ -7,10 +7,10 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/BinaryEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/BinaryEdgeFunction.h"
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/LCAEdgeFunctionComposer.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/LCAEdgeFunctionComposer.h"
 
 namespace psr::glca {
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.cpp
similarity index 90%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.cpp
index c1c9c2274..29681a625 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.cpp
@@ -7,7 +7,7 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.h"
 
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/GlobalVariable.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValue.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValue.cpp
similarity index 95%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValue.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValue.cpp
index 1c2302be4..a6ac2efbc 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValue.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValue.cpp
@@ -7,9 +7,9 @@
  *     Fabian Schiebel, Alexander Meinhold and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValue.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValue.h"
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.h"
 
 #include "llvm/ADT/APFloat.h"
 #include "llvm/IR/Constants.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.cpp
similarity index 92%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.cpp
index be8874fd1..27eb99372 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.cpp
@@ -7,7 +7,7 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.h"
 
 namespace psr::glca {
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/GenConstant.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/GenConstant.cpp
similarity index 86%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/GenConstant.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/GenConstant.cpp
index cfc1f0896..5027595d6 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/GenConstant.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/GenConstant.cpp
@@ -7,11 +7,11 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/GenConstant.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/GenConstant.h"
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/AllBot.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/JoinEdgeFunction.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/AllBot.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/JoinEdgeFunction.h"
 
 namespace psr::glca {
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.cpp
similarity index 93%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.cpp
index 249b34a1b..41e2b95d6 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.cpp
@@ -7,23 +7,23 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/ControlFlow/SpecialMemberFunctionType.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
+#include "phasar/DataFlow/IfdsIde/FlowFunctions.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/ControlFlow/SpecialMemberFunctionType.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionUtils.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMFlowFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/BinaryEdgeFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/GenConstant.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCalleeFlowFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCallerFlowFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/TypecastEdgeFunction.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFlowFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/BinaryEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/GenConstant.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCalleeFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCallerFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/TypecastEdgeFunction.h"
 #include "phasar/PhasarLLVM/Utils/LLVMIRToSrc.h"
 #include "phasar/Utils/Logger.h"
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/JoinEdgeFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/JoinEdgeFunction.cpp
similarity index 85%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/JoinEdgeFunction.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/JoinEdgeFunction.cpp
index 39655f62a..2077d0119 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/JoinEdgeFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/JoinEdgeFunction.cpp
@@ -7,13 +7,13 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/JoinEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/JoinEdgeFunction.h"
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/AllBot.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValue.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/GenConstant.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/LCAEdgeFunctionComposer.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/AllBot.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValue.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/GenConstant.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/LCAEdgeFunctionComposer.h"
 #include "phasar/Utils/Logger.h"
 
 namespace psr::glca {
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/LCAEdgeFunctionComposer.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/LCAEdgeFunctionComposer.cpp
similarity index 78%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/LCAEdgeFunctionComposer.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/LCAEdgeFunctionComposer.cpp
index 97620e0b5..e42fd995e 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/LCAEdgeFunctionComposer.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/LCAEdgeFunctionComposer.cpp
@@ -7,13 +7,13 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/LCAEdgeFunctionComposer.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/LCAEdgeFunctionComposer.h"
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/AllBot.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValue.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/GenConstant.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/JoinEdgeFunction.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/AllBot.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValue.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/GenConstant.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/JoinEdgeFunction.h"
 
 namespace psr::glca {
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCalleeFlowFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCalleeFlowFunction.cpp
similarity index 87%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCalleeFlowFunction.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCalleeFlowFunction.cpp
index 9bc72b03f..d00d89537 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCalleeFlowFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCalleeFlowFunction.cpp
@@ -7,11 +7,11 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCalleeFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCalleeFlowFunction.h"
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMFlowFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFlowFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
 namespace psr::glca {
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCallerFlowFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCallerFlowFunction.cpp
similarity index 91%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCallerFlowFunction.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCallerFlowFunction.cpp
index fbe97d819..731a7ecd5 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCallerFlowFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCallerFlowFunction.cpp
@@ -7,9 +7,9 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCallerFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCallerFlowFunction.h"
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.h"
 
 #include "llvm/IR/Function.h"
 #include "llvm/IR/InstrTypes.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/TypecastEdgeFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/TypecastEdgeFunction.cpp
similarity index 79%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/TypecastEdgeFunction.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/TypecastEdgeFunction.cpp
index 783aab081..f0c9f31f0 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/TypecastEdgeFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/TypecastEdgeFunction.cpp
@@ -7,11 +7,11 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/TypecastEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/TypecastEdgeFunction.h"
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/AllBot.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/JoinEdgeFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/LCAEdgeFunctionComposer.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/AllBot.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/JoinEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/LCAEdgeFunctionComposer.h"
 
 namespace psr::glca {
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEInstInteractionAnalysis.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysis.cpp
similarity index 97%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEInstInteractionAnalysis.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysis.cpp
index ea6650efb..2877e3086 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEInstInteractionAnalysis.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysis.cpp
@@ -7,7 +7,7 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEInstInteractionAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysis.h"
 
 #include "llvm/IR/Instruction.h"
 #include "llvm/IR/Instructions.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysis.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysis.cpp
similarity index 97%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysis.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysis.cpp
index 9aded54ab..e6c61836f 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysis.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysis.cpp
@@ -7,17 +7,16 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysis.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
+#include "phasar/DataFlow/IfdsIde/FlowFunctions.h"
+#include "phasar/DataFlow/IfdsIde/SolverResults.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionUtils.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/JoinLattice.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMFlowFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/SolverResults.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFlowFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMIRToSrc.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEProtoAnalysis.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEProtoAnalysis.cpp
similarity index 96%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEProtoAnalysis.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEProtoAnalysis.cpp
index 94b9b9623..a32db1804 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEProtoAnalysis.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEProtoAnalysis.cpp
@@ -7,11 +7,11 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEProtoAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEProtoAnalysis.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionUtils.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"
 #include "phasar/Utils/Utilities.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDESecureHeapPropagation.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDESecureHeapPropagation.cpp
similarity index 97%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDESecureHeapPropagation.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDESecureHeapPropagation.cpp
index 4da9246c2..3e5529bed 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDESecureHeapPropagation.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDESecureHeapPropagation.cpp
@@ -7,12 +7,12 @@
  *     Philipp Schubert, Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDESecureHeapPropagation.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDESecureHeapPropagation.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctionComposer.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionComposer.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Utils/LLVMIRToSrc.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDESolverTest.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDESolverTest.cpp
similarity index 94%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDESolverTest.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDESolverTest.cpp
index 9ea31032d..f7181983c 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDESolverTest.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDESolverTest.cpp
@@ -7,14 +7,16 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDESolverTest.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDESolverTest.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
+#include "phasar/DataFlow/IfdsIde/FlowFunctions.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionUtils.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
+#include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"
 #include "phasar/Utils/Utilities.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETypeStateAnalysis.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.cpp
similarity index 98%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETypeStateAnalysis.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.cpp
index 369169f4d..90fec4cc3 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETypeStateAnalysis.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.cpp
@@ -7,17 +7,16 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETypeStateAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctionComposer.h"
+#include "phasar/DataFlow/IfdsIde/FlowFunctions.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionComposer.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMFlowFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFlowFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
-#include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMIRToSrc.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSConstAnalysis.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSConstAnalysis.cpp
similarity index 97%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSConstAnalysis.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSConstAnalysis.cpp
index 1da87f581..ff78ca5ae 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSConstAnalysis.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSConstAnalysis.cpp
@@ -7,12 +7,13 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSConstAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSConstAnalysis.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMFlowFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFlowFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/PhasarLLVM/Utils/LLVMCXXShorthands.h"
 #include "phasar/PhasarLLVM/Utils/LLVMIRToSrc.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSFieldSensTaintAnalysis.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSFieldSensTaintAnalysis.cpp
similarity index 76%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSFieldSensTaintAnalysis.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSFieldSensTaintAnalysis.cpp
index fa8095519..7783558e2 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSFieldSensTaintAnalysis.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSFieldSensTaintAnalysis.cpp
@@ -2,30 +2,30 @@
  * @author Sebastian Roland <seroland86@gmail.com>
  */
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSFieldSensTaintAnalysis.h"
-
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/BranchSwitchInstFlowFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CallToRetFlowFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CheckOperandsFlowFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GEPInstFlowFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GenerateFlowFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/IdentityFlowFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCallee.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCaller.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemSetInstFlowFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemTransferInstFlowFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/PHINodeFlowFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/ReturnInstFlowFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/StoreInstFlowFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAEndInstFlowFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAStartInstFlowFunction.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovRetValWriter.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovWriter.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LineNumberWriter.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStats.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStatsWriter.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSFieldSensTaintAnalysis.h"
+
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/BranchSwitchInstFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CallToRetFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/CheckOperandsFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GEPInstFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/GenerateFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/IdentityFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCallee.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCaller.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemSetInstFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MemTransferInstFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/PHINodeFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/ReturnInstFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/StoreInstFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAEndInstFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/VAStartInstFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovRetValWriter.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LcovWriter.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/LineNumberWriter.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStats.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Stats/TraceStatsWriter.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h"
 
 #include "llvm/IR/IntrinsicInst.h"
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSProtoAnalysis.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSProtoAnalysis.cpp
similarity index 95%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSProtoAnalysis.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSProtoAnalysis.cpp
index 6ff93ccb8..bac4fa29c 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSProtoAnalysis.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSProtoAnalysis.cpp
@@ -7,10 +7,10 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSProtoAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSProtoAnalysis.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSSignAnalysis.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSSignAnalysis.cpp
similarity index 94%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSSignAnalysis.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSSignAnalysis.cpp
index c9acbd9f4..5c2c11172 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSSignAnalysis.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSSignAnalysis.cpp
@@ -7,10 +7,10 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSSignAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSSignAnalysis.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
 #include "llvm/IR/Function.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSSolverTest.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSSolverTest.cpp
similarity index 94%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSSolverTest.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSSolverTest.cpp
index 55fc2cafe..38724cbc7 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSSolverTest.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSSolverTest.cpp
@@ -7,10 +7,10 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSSolverTest.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSSolverTest.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTaintAnalysis.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysis.cpp
similarity index 97%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTaintAnalysis.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysis.cpp
index 60c8d36b8..8c585b680 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTaintAnalysis.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysis.cpp
@@ -7,11 +7,12 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTaintAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysis.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMFlowFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFlowFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/PhasarLLVM/TaintConfig/TaintConfigUtilities.h"
 #include "phasar/PhasarLLVM/Utils/LLVMIRToSrc.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTypeAnalysis.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTypeAnalysis.cpp
similarity index 92%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTypeAnalysis.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTypeAnalysis.cpp
index 20d97ff6f..321b67331 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTypeAnalysis.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTypeAnalysis.cpp
@@ -7,11 +7,13 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTypeAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTypeAnalysis.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h"
+#include "phasar/DataFlow/IfdsIde/FlowFunctions.h"
+#include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSUninitializedVariables.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariables.cpp
similarity index 98%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSUninitializedVariables.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariables.cpp
index 5875b9951..d84938937 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSUninitializedVariables.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariables.cpp
@@ -7,11 +7,11 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSUninitializedVariables.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariables.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowFunctions.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h"
+#include "phasar/DataFlow/IfdsIde/FlowFunctions.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
 #include "phasar/PhasarLLVM/Utils/LLVMIRToSrc.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.cpp
similarity index 97%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.cpp
index 0b90daf22..b6b8895ed 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.cpp
@@ -7,7 +7,7 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.h"
 
 #include "llvm/Support/ErrorHandling.h"
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFCTXDescription.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFCTXDescription.cpp
similarity index 97%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFCTXDescription.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFCTXDescription.cpp
index 896c9efca..ec2957402 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFCTXDescription.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFCTXDescription.cpp
@@ -7,9 +7,9 @@
  *     Philipp Schubert, Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFCTXDescription.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFCTXDescription.h"
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.h"
 
 #include "llvm/IR/Instruction.h"
 #include "llvm/IR/Value.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.cpp
similarity index 97%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.cpp
index dda406f51..89068b96f 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.cpp
@@ -7,7 +7,7 @@
  *     Philipp Schubert, Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.h"
 
 #include "llvm/Support/ErrorHandling.h"
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureHeapDescription.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureHeapDescription.cpp
similarity index 98%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureHeapDescription.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureHeapDescription.cpp
index 9d4e01f73..b0cc0cc87 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureHeapDescription.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureHeapDescription.cpp
@@ -7,7 +7,7 @@
  *     Philipp Schubert, Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureHeapDescription.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureHeapDescription.h"
 
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Support/ErrorHandling.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureMemoryDescription.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureMemoryDescription.cpp
similarity index 97%
rename from lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureMemoryDescription.cpp
rename to lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureMemoryDescription.cpp
index 4277b36cd..f5b383ef2 100644
--- a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureMemoryDescription.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureMemoryDescription.cpp
@@ -7,7 +7,7 @@
  *     Philipp Schubert, Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureMemoryDescription.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureMemoryDescription.h"
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/StringSwitch.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/Mono/CMakeLists.txt b/lib/PhasarLLVM/DataFlow/Mono/CMakeLists.txt
similarity index 90%
rename from lib/PhasarLLVM/DataFlowSolver/Mono/CMakeLists.txt
rename to lib/PhasarLLVM/DataFlow/Mono/CMakeLists.txt
index 573443d60..9c11f2066 100644
--- a/lib/PhasarLLVM/DataFlowSolver/Mono/CMakeLists.txt
+++ b/lib/PhasarLLVM/DataFlow/Mono/CMakeLists.txt
@@ -3,8 +3,8 @@ file(GLOB_RECURSE MONO_SRC *.h *.cpp)
 set(PHASAR_LINK_LIBS
   phasar_config
   phasar_utils
-  phasar_phasarllvm_utils
-  phasar_controlflow
+  phasar_llvm_utils
+  phasar_llvm_controlflow
   phasar_db
   phasar_taintconfig
 )
diff --git a/lib/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoFullConstantPropagation.cpp b/lib/PhasarLLVM/DataFlow/Mono/Problems/InterMonoFullConstantPropagation.cpp
similarity index 97%
rename from lib/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoFullConstantPropagation.cpp
rename to lib/PhasarLLVM/DataFlow/Mono/Problems/InterMonoFullConstantPropagation.cpp
index cfd57c435..ec4ce482b 100644
--- a/lib/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoFullConstantPropagation.cpp
+++ b/lib/PhasarLLVM/DataFlow/Mono/Problems/InterMonoFullConstantPropagation.cpp
@@ -7,10 +7,11 @@
  *     Philipp Schubert, Linus Jungemann and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoFullConstantPropagation.h"
+#include "phasar/PhasarLLVM/DataFlow/Mono/Problems/InterMonoFullConstantPropagation.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/BitVectorSet.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoSolverTest.cpp b/lib/PhasarLLVM/DataFlow/Mono/Problems/InterMonoSolverTest.cpp
similarity index 97%
rename from lib/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoSolverTest.cpp
rename to lib/PhasarLLVM/DataFlow/Mono/Problems/InterMonoSolverTest.cpp
index 8e7f5f9f2..c86df2593 100644
--- a/lib/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoSolverTest.cpp
+++ b/lib/PhasarLLVM/DataFlow/Mono/Problems/InterMonoSolverTest.cpp
@@ -7,9 +7,10 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoSolverTest.h"
+#include "phasar/PhasarLLVM/DataFlow/Mono/Problems/InterMonoSolverTest.h"
 
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoTaintAnalysis.cpp b/lib/PhasarLLVM/DataFlow/Mono/Problems/InterMonoTaintAnalysis.cpp
similarity index 98%
rename from lib/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoTaintAnalysis.cpp
rename to lib/PhasarLLVM/DataFlow/Mono/Problems/InterMonoTaintAnalysis.cpp
index 7be424046..411491eff 100644
--- a/lib/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoTaintAnalysis.cpp
+++ b/lib/PhasarLLVM/DataFlow/Mono/Problems/InterMonoTaintAnalysis.cpp
@@ -7,10 +7,10 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoTaintAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/Mono/Problems/InterMonoTaintAnalysis.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/PhasarLLVM/TaintConfig/TaintConfig.h"
 #include "phasar/PhasarLLVM/TaintConfig/TaintConfigUtilities.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoFullConstantPropagation.cpp b/lib/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoFullConstantPropagation.cpp
similarity index 97%
rename from lib/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoFullConstantPropagation.cpp
rename to lib/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoFullConstantPropagation.cpp
index 5b188133b..4c223bcd7 100644
--- a/lib/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoFullConstantPropagation.cpp
+++ b/lib/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoFullConstantPropagation.cpp
@@ -7,11 +7,12 @@
  *     Philipp Schubert, Linus Jungemann and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoFullConstantPropagation.h"
+#include "phasar/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoFullConstantPropagation.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/BitVectorSet.h"
diff --git a/lib/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoSolverTest.cpp b/lib/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoSolverTest.cpp
similarity index 94%
rename from lib/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoSolverTest.cpp
rename to lib/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoSolverTest.cpp
index 9a457e1c1..5becbc3c6 100644
--- a/lib/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoSolverTest.cpp
+++ b/lib/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoSolverTest.cpp
@@ -14,10 +14,11 @@
  *      Author: philipp
  */
 
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoSolverTest.h"
+#include "phasar/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoSolverTest.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoUninitVariables.cpp b/lib/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoUninitVariables.cpp
similarity index 95%
rename from lib/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoUninitVariables.cpp
rename to lib/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoUninitVariables.cpp
index e6341403d..892cf558d 100644
--- a/lib/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoUninitVariables.cpp
+++ b/lib/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoUninitVariables.cpp
@@ -7,10 +7,11 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoUninitVariables.h"
+#include "phasar/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoUninitVariables.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/BitVectorSet.h"
diff --git a/lib/PhasarLLVM/AnalysisStrategy/HelperAnalyses.cpp b/lib/PhasarLLVM/HelperAnalyses.cpp
similarity index 96%
rename from lib/PhasarLLVM/AnalysisStrategy/HelperAnalyses.cpp
rename to lib/PhasarLLVM/HelperAnalyses.cpp
index f530c9fbf..42700df9d 100644
--- a/lib/PhasarLLVM/AnalysisStrategy/HelperAnalyses.cpp
+++ b/lib/PhasarLLVM/HelperAnalyses.cpp
@@ -1,7 +1,7 @@
-#include "phasar/PhasarLLVM/AnalysisStrategy/HelperAnalyses.h"
+#include "phasar/PhasarLLVM/HelperAnalyses.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 
diff --git a/lib/PhasarLLVM/Pointer/CMakeLists.txt b/lib/PhasarLLVM/Pointer/CMakeLists.txt
index 62efdf9d0..b01e8274d 100644
--- a/lib/PhasarLLVM/Pointer/CMakeLists.txt
+++ b/lib/PhasarLLVM/Pointer/CMakeLists.txt
@@ -3,6 +3,9 @@ file(GLOB_RECURSE POINTER_SRC *.h *.cpp)
 set(PHASAR_LINK_LIBS
   phasar_utils
   phasar_db
+  phasar_pointer
+  phasar_llvm_utils
+  phasar_llvm_db
 )
 
 set(LLVM_LINK_COMPONENTS
@@ -15,24 +18,24 @@ set(LLVM_LINK_COMPONENTS
 
 # Handle the library files
 if(BUILD_SHARED_LIBS)
-  add_phasar_library(phasar_pointer
+  add_phasar_library(phasar_llvm_pointer
     SHARED
     ${POINTER_SRC}
   )
 else()
-  add_phasar_library(phasar_pointer
+  add_phasar_library(phasar_llvm_pointer
     STATIC
     ${POINTER_SRC}
   )
 endif()
 
 find_package(Boost COMPONENTS graph REQUIRED)
-target_link_libraries(phasar_pointer
+target_link_libraries(phasar_llvm_pointer
   LINK_PUBLIC
   ${Boost_LIBRARIES}
 )
 
-set_target_properties(phasar_pointer
+set_target_properties(phasar_llvm_pointer
   PROPERTIES
   LINKER_LANGUAGE CXX
   PREFIX "lib"
diff --git a/lib/PhasarLLVM/Pointer/LLVMAliasGraph.cpp b/lib/PhasarLLVM/Pointer/LLVMAliasGraph.cpp
index 01f84e9f5..b9cc927db 100644
--- a/lib/PhasarLLVM/Pointer/LLVMAliasGraph.cpp
+++ b/lib/PhasarLLVM/Pointer/LLVMAliasGraph.cpp
@@ -9,7 +9,7 @@
 
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasGraph.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMPointsToUtils.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
diff --git a/lib/PhasarLLVM/Pointer/LLVMAliasInfo.cpp b/lib/PhasarLLVM/Pointer/LLVMAliasInfo.cpp
index ba37ad947..6fec11ef9 100644
--- a/lib/PhasarLLVM/Pointer/LLVMAliasInfo.cpp
+++ b/lib/PhasarLLVM/Pointer/LLVMAliasInfo.cpp
@@ -7,7 +7,7 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/Pointer/AliasInfoBase.h"
+#include "phasar/Pointer/AliasInfoBase.h"
 
 #include "llvm/IR/Instruction.h"
 #include "llvm/IR/Instructions.h"
diff --git a/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp b/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp
index 1e8f851cd..e7f1211e5 100644
--- a/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp
+++ b/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp
@@ -9,12 +9,11 @@
 
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/Pointer/AliasInfoTraits.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
-#include "phasar/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMPointsToUtils.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
+#include "phasar/Utils/BoxedPointer.h"
 #include "phasar/Utils/Logger.h"
 #include "phasar/Utils/NlohmannLogging.h"
 
@@ -50,10 +49,9 @@
 
 namespace psr {
 
-template class DynamicAliasSetPtr<>;
-template class DynamicAliasSetConstPtr<>;
-template class AliasSetOwner<DefaultAATraits<
-    const llvm::Value *, const llvm::Instruction *>::AliasSetTy>;
+template class BoxedPtr<LLVMAliasInfo::AliasSetTy>;
+template class BoxedConstPtr<LLVMAliasInfo::AliasSetTy>;
+template class AliasSetOwner<LLVMAliasInfo::AliasSetTy>;
 
 LLVMAliasSet::LLVMAliasSet(LLVMProjectIRDB *IRDB, bool UseLazyEvaluation,
                            AliasAnalysisType PATy)
@@ -222,8 +220,8 @@ void LLVMAliasSet::mergeAliasSets(const llvm::Value *V1,
   mergeAliasSets(SearchV1->second, SearchV2->second);
 }
 
-void LLVMAliasSet::mergeAliasSets(DynamicAliasSetPtr<AliasSetTy> PTS1,
-                                  DynamicAliasSetPtr<AliasSetTy> PTS2) {
+void LLVMAliasSet::mergeAliasSets(BoxedPtr<AliasSetTy> PTS1,
+                                  BoxedPtr<AliasSetTy> PTS2) {
   if (PTS1 == PTS2 || PTS1.get() == PTS2.get()) {
     return;
   }
@@ -552,7 +550,7 @@ AliasResult LLVMAliasSet::alias(const llvm::Value *V1, const llvm::Value *V2,
                                   : AliasResult::NoAlias;
 }
 
-auto LLVMAliasSet::getEmptyAliasSet() -> DynamicAliasSetPtr<AliasSetTy> {
+auto LLVMAliasSet::getEmptyAliasSet() -> BoxedPtr<AliasSetTy> {
   static AliasSetTy EmptySet{};
   static AliasSetTy *EmptySetPtr = &EmptySet;
   return &EmptySetPtr;
diff --git a/lib/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.cpp b/lib/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.cpp
index 5f523d7c6..116fc022c 100644
--- a/lib/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.cpp
+++ b/lib/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.cpp
@@ -9,7 +9,7 @@
 
 #include "phasar/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMPointsToUtils.h"
 
 #include "llvm/ADT/SetVector.h"
diff --git a/lib/PhasarLLVM/TaintConfig/CMakeLists.txt b/lib/PhasarLLVM/TaintConfig/CMakeLists.txt
index bbe3cd5a5..f795ea837 100644
--- a/lib/PhasarLLVM/TaintConfig/CMakeLists.txt
+++ b/lib/PhasarLLVM/TaintConfig/CMakeLists.txt
@@ -3,7 +3,8 @@ file(GLOB_RECURSE TAINTCONFIG_SRC *.h *.cpp)
 set(PHASAR_LINK_LIBS
   phasar_utils
   phasar_db
-  phasar_phasarllvm_utils
+  phasar_llvm_db
+  phasar_llvm_utils
 )
 
 set(LLVM_LINK_COMPONENTS
diff --git a/lib/PhasarLLVM/TaintConfig/TaintConfig.cpp b/lib/PhasarLLVM/TaintConfig/TaintConfig.cpp
index 1fdb47082..166733859 100644
--- a/lib/PhasarLLVM/TaintConfig/TaintConfig.cpp
+++ b/lib/PhasarLLVM/TaintConfig/TaintConfig.cpp
@@ -9,7 +9,7 @@
 
 #include "phasar/PhasarLLVM/TaintConfig/TaintConfig.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Utils/Annotation.h"
 #include "phasar/PhasarLLVM/Utils/LLVMIRToSrc.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
diff --git a/lib/PhasarLLVM/TypeHierarchy/CMakeLists.txt b/lib/PhasarLLVM/TypeHierarchy/CMakeLists.txt
index 2da9f80f7..1094db186 100644
--- a/lib/PhasarLLVM/TypeHierarchy/CMakeLists.txt
+++ b/lib/PhasarLLVM/TypeHierarchy/CMakeLists.txt
@@ -13,24 +13,24 @@ set(LLVM_LINK_COMPONENTS
 
 # Handle the library files
 if(BUILD_SHARED_LIBS)
-  add_phasar_library(phasar_typehierarchy
+  add_phasar_library(phasar_llvm_typehierarchy
     SHARED
     ${TYPEHIERARCHY_SRC}
   )
 else()
-  add_phasar_library(phasar_typehierarchy
+  add_phasar_library(phasar_llvm_typehierarchy
     STATIC
     ${TYPEHIERARCHY_SRC}
   )
 endif()
 
 find_package(Boost COMPONENTS graph REQUIRED)
-target_link_libraries(phasar_typehierarchy
+target_link_libraries(phasar_llvm_typehierarchy
   LINK_PUBLIC
   ${Boost_LIBRARIES}
 )
 
-set_target_properties(phasar_typehierarchy
+set_target_properties(phasar_llvm_typehierarchy
   PROPERTIES
   LINKER_LANGUAGE CXX
   PREFIX "lib"
diff --git a/lib/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.cpp b/lib/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.cpp
index 9a673c6df..33f39a93a 100644
--- a/lib/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.cpp
+++ b/lib/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.cpp
@@ -17,7 +17,7 @@
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 
 #include "phasar/Config/Configuration.h"
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"
 #include "phasar/Utils/NlohmannLogging.h"
diff --git a/lib/PhasarLLVM/Utils/BinaryDomain.cpp b/lib/PhasarLLVM/Utils/BinaryDomain.cpp
index 58870caef..e69a8c9bc 100644
--- a/lib/PhasarLLVM/Utils/BinaryDomain.cpp
+++ b/lib/PhasarLLVM/Utils/BinaryDomain.cpp
@@ -7,7 +7,7 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/Utils/BinaryDomain.h"
+#include "phasar/Domain/BinaryDomain.h"
 
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/raw_ostream.h"
diff --git a/lib/PhasarLLVM/Utils/CMakeLists.txt b/lib/PhasarLLVM/Utils/CMakeLists.txt
index 1c7a41c5a..6c05a4112 100644
--- a/lib/PhasarLLVM/Utils/CMakeLists.txt
+++ b/lib/PhasarLLVM/Utils/CMakeLists.txt
@@ -14,22 +14,22 @@ set(LLVM_LINK_COMPONENTS
 
 # Handle the library files
 if(BUILD_SHARED_LIBS)
-  add_phasar_library(phasar_phasarllvm_utils
+  add_phasar_library(phasar_llvm_utils
     SHARED
     ${UTILS_SRC}
   )
 else()
-  add_phasar_library(phasar_phasarllvm_utils
+  add_phasar_library(phasar_llvm_utils
     STATIC
     ${UTILS_SRC}
   )
 endif()
 
-target_link_libraries(phasar_phasarllvm_utils
+target_link_libraries(phasar_llvm_utils
   LINK_PUBLIC
 )
 
-set_target_properties(phasar_phasarllvm_utils
+set_target_properties(phasar_llvm_utils
   PROPERTIES
   LINKER_LANGUAGE CXX
   PREFIX "lib"
diff --git a/lib/PhasarLLVM/Utils/IOFormat.cpp b/lib/PhasarLLVM/Utils/IOFormat.cpp
deleted file mode 100644
index 20954a8df..000000000
--- a/lib/PhasarLLVM/Utils/IOFormat.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2020 Philipp Schubert.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Philipp Schubert and others
- *****************************************************************************/
-
-#include "phasar/PhasarLLVM/Utils/IOFormat.h"
-
-#include "llvm/ADT/StringSwitch.h"
-#include "llvm/Support/raw_ostream.h"
-
-#include <string>
-
-using namespace psr;
-using namespace std;
-
-namespace psr {
-
-std::string toString(const IOFormat &D) {
-  switch (D) {
-  default:
-#define IO_FORMAT_TYPES(NAME, CMDFLAG, TYPE)                                   \
-  case IOFormat::TYPE:                                                         \
-    return NAME;                                                               \
-    break;
-#include "phasar/PhasarLLVM/Utils/IOFormat.def"
-  }
-}
-
-IOFormat toIOFormat(const std::string &S) {
-  IOFormat Type = llvm::StringSwitch<IOFormat>(S)
-#define IO_FORMAT_TYPES(NAME, CMDFLAG, TYPE) .Case(NAME, IOFormat::TYPE)
-#include "phasar/PhasarLLVM/Utils/IOFormat.def"
-                      .Default(IOFormat::None);
-  if (Type == IOFormat::None) {
-    Type = llvm::StringSwitch<IOFormat>(S)
-#define IO_FORMAT_TYPES(NAME, CMDFLAG, TYPE) .Case(CMDFLAG, IOFormat::TYPE)
-#include "phasar/PhasarLLVM/Utils/IOFormat.def"
-               .Default(IOFormat::None);
-  }
-  return Type;
-}
-
-llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, const IOFormat &D) {
-  return OS << toString(D);
-}
-} // namespace psr
diff --git a/lib/PhasarLLVM/Utils/LLVMShorthands.cpp b/lib/PhasarLLVM/Utils/LLVMShorthands.cpp
index 40d123802..10b7a7b18 100644
--- a/lib/PhasarLLVM/Utils/LLVMShorthands.cpp
+++ b/lib/PhasarLLVM/Utils/LLVMShorthands.cpp
@@ -17,7 +17,7 @@
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
 #include "phasar/Config/Configuration.h"
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/Utils/Logger.h"
 #include "phasar/Utils/Utilities.h"
 
@@ -263,7 +263,7 @@ bool LLVMValueIDLess::operator()(const llvm::Value *Lhs,
                                  const llvm::Value *Rhs) const {
   std::string LhsId = getMetaDataID(Lhs);
   std::string RhsId = getMetaDataID(Rhs);
-  return Sless(LhsId, RhsId);
+  return StringIDLess{}(LhsId, RhsId);
 }
 
 int getFunctionArgumentNr(const llvm::Argument *Arg) {
diff --git a/lib/PhasarLLVM/Utils/Scopes.cpp b/lib/PhasarLLVM/Utils/Scopes.cpp
deleted file mode 100644
index f349e343b..000000000
--- a/lib/PhasarLLVM/Utils/Scopes.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2017 Philipp Schubert.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Philipp Schubert and others
- *****************************************************************************/
-
-#include "phasar/PhasarLLVM/Utils/Scopes.h"
-
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/raw_ostream.h"
-
-llvm::raw_ostream &psr::operator<<(llvm::raw_ostream &OS, Scope S) {
-  switch (S) {
-  case Scope::function:
-    return OS << "function";
-  case Scope::module:
-    return OS << "module";
-  case Scope::project:
-    return OS << "project";
-  }
-  llvm_unreachable("All scopes should be handled in the switch above");
-}
diff --git a/lib/PhasarLLVM/Utils/SummaryStrategy.cpp b/lib/PhasarLLVM/Utils/SummaryStrategy.cpp
deleted file mode 100644
index 6ccc219ce..000000000
--- a/lib/PhasarLLVM/Utils/SummaryStrategy.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2017 Philipp Schubert.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Philipp Schubert and others
- *****************************************************************************/
-
-#include "phasar/PhasarLLVM/Utils/SummaryStrategy.h"
-
-#include "llvm/Support/raw_ostream.h"
-
-namespace psr {
-
-const std::map<SummaryGenerationStrategy, std::string>
-    SummaryGenerationStrategyToString = {
-        {SummaryGenerationStrategy::always_all, "always_all"},
-        {SummaryGenerationStrategy::always_none, "always_none"},
-        {SummaryGenerationStrategy::all_and_none, "all_and_none"},
-        {SummaryGenerationStrategy::powerset, "powerset"},
-        {SummaryGenerationStrategy::all_observed, "all_observed"}};
-
-const std::map<std::string, SummaryGenerationStrategy>
-    StringToSummaryGenerationStrategy = {
-        {"always_all", SummaryGenerationStrategy::always_all},
-        {"always_none", SummaryGenerationStrategy::always_none},
-        {"all_and_none", SummaryGenerationStrategy::all_and_none},
-        {"powerset", SummaryGenerationStrategy::powerset},
-        {"all_observed", SummaryGenerationStrategy::all_observed}
-
-};
-
-llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
-                              const SummaryGenerationStrategy &S) {
-  return OS << SummaryGenerationStrategyToString.at(S);
-}
-} // namespace psr
diff --git a/lib/PhasarLLVM/Utils/phasar_phasarllvm_utils-config.cmake b/lib/PhasarLLVM/Utils/phasar_phasarllvm_utils-config.cmake
deleted file mode 100644
index ba8353aaa..000000000
--- a/lib/PhasarLLVM/Utils/phasar_phasarllvm_utils-config.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-set(PHASAR_phasarllvm_utils_COMPONENT_FOUND 1)
-
-list(APPEND
-  PHASAR_LLVM_DEPS
-  Support
-  Core)
-
-list(APPEND
-  PHASAR_PHASARLLVM_UTILS_DEPS
-  config
-  utils
-)
-
-foreach(dep ${PHASAR_PHASARLLVM_UTILS_DEPS})
-  list(APPEND
-    PHASAR_NEEDED_LIBS
-    phasar::phasar_${dep}
-  )
-  if(NOT (${PHASAR_${dep}_COMPONENT_FOUND}))
-    find_package(phasar COMPONENTS ${dep})
-  endif()
-endforeach()
-
-list(APPEND
-  PHASAR_NEEDED_LIBS
-  phasar::phasar_phasarllvm_utils
-)
diff --git a/lib/PhasarPass/CMakeLists.txt b/lib/PhasarPass/CMakeLists.txt
index 0bc0e6108..cec9dc7b5 100644
--- a/lib/PhasarPass/CMakeLists.txt
+++ b/lib/PhasarPass/CMakeLists.txt
@@ -2,14 +2,14 @@ file(GLOB_RECURSE PHASARPASS_SRC *.h *.cpp)
 
 set(PHASAR_LINK_LIBS
   phasar_config
-  phasar_controlflow
-  phasar_db
-  phasar_ifdside
+  phasar_llvm_controlflow
+  phasar_llvm_db
+  phasar_llvm_ifdside
   phasar_mono
   phasar_passes
-  phasar_phasarllvm_utils
-  phasar_pointer
-  phasar_typehierarchy
+  phasar_llvm_utils
+  phasar_llvm_pointer
+  phasar_llvm_typehierarchy
   phasar_utils
 )
 
diff --git a/lib/PhasarPass/PhasarPass.cpp b/lib/PhasarPass/PhasarPass.cpp
index 3018176aa..185510a04 100644
--- a/lib/PhasarPass/PhasarPass.cpp
+++ b/lib/PhasarPass/PhasarPass.cpp
@@ -9,27 +9,27 @@
 
 #include "phasar/PhasarPass/PhasarPass.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/ControlFlow/CallGraphAnalysisType.h"
+#include "phasar/DataFlow/IfdsIde/Solver/IDESolver.h"
+#include "phasar/DataFlow/IfdsIde/Solver/IFDSSolver.h"
+#include "phasar/DataFlow/Mono/Solver/InterMonoSolver.h"
+#include "phasar/DataFlow/Mono/Solver/IntraMonoSolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEInstInteractionAnalysis.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysis.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDESolverTest.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETypeStateAnalysis.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSConstAnalysis.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSSolverTest.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTaintAnalysis.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTypeAnalysis.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSUninitializedVariables.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IFDSSolver.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoSolverTest.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoTaintAnalysis.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoFullConstantPropagation.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoSolverTest.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Solver/InterMonoSolver.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Solver/IntraMonoSolver.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDESolverTest.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSConstAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSSolverTest.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTypeAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariables.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.h"
+#include "phasar/PhasarLLVM/DataFlow/Mono/Problems/InterMonoSolverTest.h"
+#include "phasar/PhasarLLVM/DataFlow/Mono/Problems/InterMonoTaintAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoFullConstantPropagation.h"
+#include "phasar/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoSolverTest.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/TaintConfig/TaintConfig.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
diff --git a/lib/PhasarLLVM/Pointer/AliasAnalysisType.cpp b/lib/Pointer/AliasAnalysisType.cpp
similarity index 83%
rename from lib/PhasarLLVM/Pointer/AliasAnalysisType.cpp
rename to lib/Pointer/AliasAnalysisType.cpp
index 177b2d109..d958fae7b 100644
--- a/lib/PhasarLLVM/Pointer/AliasAnalysisType.cpp
+++ b/lib/Pointer/AliasAnalysisType.cpp
@@ -1,4 +1,4 @@
-#include "phasar/PhasarLLVM/Pointer/AliasAnalysisType.h"
+#include "phasar/Pointer/AliasAnalysisType.h"
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/StringSwitch.h"
@@ -9,7 +9,7 @@ std::string psr::toString(AliasAnalysisType PA) {
 #define ALIAS_ANALYSIS_TYPE(NAME, CMDFLAG, DESC)                               \
   case AliasAnalysisType::NAME:                                                \
     return #NAME;
-#include "phasar/PhasarLLVM/Pointer/AliasAnalysisType.def"
+#include "phasar/Pointer/AliasAnalysisType.def"
   case AliasAnalysisType::Invalid:
     return "Invalid";
   }
@@ -19,13 +19,13 @@ psr::AliasAnalysisType psr::toAliasAnalysisType(llvm::StringRef S) {
   AliasAnalysisType Type = llvm::StringSwitch<AliasAnalysisType>(S)
 #define ALIAS_ANALYSIS_TYPE(NAME, CMDFLAG, TYPE)                               \
   .Case(#NAME, AliasAnalysisType::NAME)
-#include "phasar/PhasarLLVM/Pointer/AliasAnalysisType.def"
+#include "phasar/Pointer/AliasAnalysisType.def"
                                .Default(AliasAnalysisType::Invalid);
   if (Type == AliasAnalysisType::Invalid) {
     Type = llvm::StringSwitch<AliasAnalysisType>(S)
 #define ALIAS_ANALYSIS_TYPE(NAME, CMDFLAG, TYPE)                               \
   .Case(CMDFLAG, AliasAnalysisType::NAME)
-#include "phasar/PhasarLLVM/Pointer/AliasAnalysisType.def"
+#include "phasar/Pointer/AliasAnalysisType.def"
                .Default(AliasAnalysisType::Invalid);
   }
   return Type;
diff --git a/lib/PhasarLLVM/Pointer/AliasInfo.cpp b/lib/Pointer/AliasInfo.cpp
similarity index 63%
rename from lib/PhasarLLVM/Pointer/AliasInfo.cpp
rename to lib/Pointer/AliasInfo.cpp
index 05098dd23..75a9e69df 100644
--- a/lib/PhasarLLVM/Pointer/AliasInfo.cpp
+++ b/lib/Pointer/AliasInfo.cpp
@@ -1,7 +1,6 @@
-#include "phasar/PhasarLLVM/Pointer/AliasInfo.h"
+#include "phasar/Pointer/AliasInfo.h"
 
-#include "phasar/PhasarLLVM/Pointer/AliasInfoBase.h"
-#include "phasar/PhasarLLVM/Pointer/DynamicAliasSetPtr.h"
+#include "phasar/Pointer/AliasInfoBase.h"
 
 namespace psr {
 static_assert(
diff --git a/lib/PhasarLLVM/Pointer/AliasResult.cpp b/lib/Pointer/AliasResult.cpp
similarity index 92%
rename from lib/PhasarLLVM/Pointer/AliasResult.cpp
rename to lib/Pointer/AliasResult.cpp
index 60754fc5e..c0e785131 100644
--- a/lib/PhasarLLVM/Pointer/AliasResult.cpp
+++ b/lib/Pointer/AliasResult.cpp
@@ -7,7 +7,7 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/Pointer/AliasResult.h"
+#include "phasar/Pointer/AliasResult.h"
 
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Support/ErrorHandling.h"
@@ -20,7 +20,7 @@ std::string psr::toString(AliasResult AR) {
 #define ALIAS_RESULT_TYPE(NAME)                                                \
   case AliasResult::NAME:                                                      \
     return #NAME;
-#include "phasar/PhasarLLVM/Pointer/AliasResult.def"
+#include "phasar/Pointer/AliasResult.def"
   }
   llvm_unreachable(
       "All AliasResult alternatives should be handled in the switch above");
diff --git a/lib/Pointer/CMakeLists.txt b/lib/Pointer/CMakeLists.txt
new file mode 100644
index 000000000..791168961
--- /dev/null
+++ b/lib/Pointer/CMakeLists.txt
@@ -0,0 +1,29 @@
+file(GLOB_RECURSE POINTER_SRC *.h *.cpp)
+
+set(PHASAR_LINK_LIBS
+  phasar_utils
+  phasar_db
+)
+
+set(LLVM_LINK_COMPONENTS
+  Support
+)
+
+# Handle the library files
+if(BUILD_SHARED_LIBS)
+  add_phasar_library(phasar_pointer
+    SHARED
+    ${POINTER_SRC}
+  )
+else()
+  add_phasar_library(phasar_pointer
+    STATIC
+    ${POINTER_SRC}
+  )
+endif()
+
+set_target_properties(phasar_pointer
+  PROPERTIES
+  LINKER_LANGUAGE CXX
+  PREFIX "lib"
+)
diff --git a/lib/PhasarLLVM/Pointer/PointsToInfo.cpp b/lib/Pointer/PointsToInfo.cpp
similarity index 97%
rename from lib/PhasarLLVM/Pointer/PointsToInfo.cpp
rename to lib/Pointer/PointsToInfo.cpp
index 5c861a8ec..3f7678e0b 100644
--- a/lib/PhasarLLVM/Pointer/PointsToInfo.cpp
+++ b/lib/Pointer/PointsToInfo.cpp
@@ -7,9 +7,9 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/Pointer/PointsToInfo.h"
+#include "phasar/Pointer/PointsToInfo.h"
 
-#include "phasar/PhasarLLVM/Pointer/PointsToInfoBase.h"
+#include "phasar/Pointer/PointsToInfoBase.h"
 #include "phasar/Utils/ByRef.h"
 
 #include "llvm/ADT/DenseMapInfo.h"
diff --git a/lib/PhasarLLVM/Utils/DOTGraph.cpp b/lib/Utils/DOTGraph.cpp
similarity index 99%
rename from lib/PhasarLLVM/Utils/DOTGraph.cpp
rename to lib/Utils/DOTGraph.cpp
index 9c853935d..49736cd2b 100644
--- a/lib/PhasarLLVM/Utils/DOTGraph.cpp
+++ b/lib/Utils/DOTGraph.cpp
@@ -14,7 +14,7 @@
  *      Author: rleer
  */
 
-#include "phasar/PhasarLLVM/Utils/DOTGraph.h"
+#include "phasar/Utils/DOTGraph.h"
 
 #include "nlohmann/json.hpp"
 
diff --git a/lib/Utils/Utilities.cpp b/lib/Utils/Utilities.cpp
index 5a048a289..1569047de 100644
--- a/lib/Utils/Utilities.cpp
+++ b/lib/Utils/Utilities.cpp
@@ -9,19 +9,16 @@
 
 #include "phasar/Utils/Utilities.h"
 
+#include "phasar/Utils/Logger.h"
+
+#include "llvm/ADT/StringExtras.h"
 #include "llvm/Demangle/Demangle.h"
 #include "llvm/IR/DerivedTypes.h"
 
-#include "boost/algorithm/string/classification.hpp"
 #include "boost/algorithm/string/find.hpp"
-#include "boost/algorithm/string/predicate.hpp"
-#include "boost/algorithm/string/split.hpp"
-#include "cxxabi.h"
 
 #include <algorithm>
 #include <chrono>
-#include <iterator>
-#include <ostream>
 
 using namespace std;
 using namespace psr;
@@ -38,7 +35,7 @@ std::string createTimeStamp() {
   return TimeStr;
 }
 
-bool isConstructor(const string &MangledName) {
+bool isConstructor(llvm::StringRef MangledName) {
   // WARNING: Doesn't work for templated classes, should
   // the best way to do it I can think of is to use a lexer
   // on the name to detect the constructor point explained
@@ -77,20 +74,22 @@ const llvm::Type *stripPointer(const llvm::Type *Pointer) {
   return Pointer;
 }
 
-bool isMangled(const string &Name) { return Name != llvm::demangle(Name); }
-
-vector<string> splitString(const string &Str, const string &Delimiter) {
-  vector<string> SplitStrings;
-  boost::split(SplitStrings, Str, boost::is_any_of(Delimiter),
-               boost::token_compress_on);
-  return SplitStrings;
-}
-
-ostream &operator<<(ostream &OS, const vector<bool> &Bits) {
-  for (auto Bit : Bits) {
-    OS << Bit;
+bool isMangled(llvm::StringRef Name) {
+  // See llvm/Demangle/Demangle.cpp
+  if (Name.startswith("_Z") || Name.startswith("___Z")) {
+    // Itanium ABI
+    return true;
+  }
+  if (Name.startswith("_R")) {
+    // Rust ABI
+    return true;
+  }
+  if (Name.startswith("_D")) {
+    // D ABI
+    return true;
   }
-  return OS;
+  // Microsoft ABI is a bit more complicated...
+  return Name != llvm::demangle(Name.str());
 }
 
 bool StringIDLess::operator()(const std::string &Lhs,
diff --git a/out/.gitkeep b/out/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 2c10344b5..64a97d80a 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_subdirectory(example-tool)
-add_subdirectory(phasar-llvm)
+add_subdirectory(phasar-cli)
diff --git a/tools/example-tool/CMakeLists.txt b/tools/example-tool/CMakeLists.txt
index b392639ee..60cfbe1e8 100644
--- a/tools/example-tool/CMakeLists.txt
+++ b/tools/example-tool/CMakeLists.txt
@@ -17,13 +17,17 @@ target_link_libraries(myphasartool
   phasar_config
   phasar_controller
   phasar_db
+  phasar_llvm_db
+  phasar_llvm_controlflow
   phasar_controlflow
-  phasar_ifdside
+  phasar_llvm_ifdside
   phasar_mono
   phasar_passes
+  phasar_llvm_pointer
   phasar_pointer
-  phasar_typehierarchy
-  phasar_phasarllvm_utils
+  phasar_llvm_typehierarchy
+  phasar_llvm
+  phasar_llvm_utils
   phasar_utils
   ${Boost_LIBRARIES}
   ${CMAKE_DL_LIBS}
diff --git a/tools/example-tool/myphasartool.cpp b/tools/example-tool/myphasartool.cpp
index 15efae72f..9d82236d1 100644
--- a/tools/example-tool/myphasartool.cpp
+++ b/tools/example-tool/myphasartool.cpp
@@ -7,15 +7,16 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/SimpleAnalysisConstructor.h"
+#include "phasar/ControlFlow/CallGraphAnalysisType.h"
+#include "phasar/DataFlow/IfdsIde/Solver/IDESolver.h"
+#include "phasar/DataFlow/IfdsIde/Solver/IFDSSolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysis.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSSolverTest.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IFDSSolver.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSSolverTest.h"
+#include "phasar/PhasarLLVM/HelperAnalyses.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 
 #include <filesystem>
diff --git a/tools/phasar-llvm/CMakeLists.txt b/tools/phasar-cli/CMakeLists.txt
similarity index 63%
rename from tools/phasar-llvm/CMakeLists.txt
rename to tools/phasar-cli/CMakeLists.txt
index 7372673a1..f696adea4 100644
--- a/tools/phasar-llvm/CMakeLists.txt
+++ b/tools/phasar-cli/CMakeLists.txt
@@ -11,31 +11,32 @@ set(LLVM_LINK_COMPONENTS
 
 # Build a stand-alone executable
 if(PHASAR_IN_TREE)
-  add_phasar_executable(phasar-llvm
-    phasar-llvm.cpp
+  add_phasar_executable(phasar-cli
+    phasar-cli.cpp
   )
 else()
-  add_executable(phasar-llvm
-    phasar-llvm.cpp
+  add_executable(phasar-cli
+    phasar-cli.cpp
   )
 endif()
 
 # Warning! There is a another listing of libraries inside cmake/phasar_macros.cmake.
 # If this list is altered the other one should be altered accordingly.
-target_link_libraries(phasar-llvm
+target_link_libraries(phasar-cli
   LINK_PUBLIC
   phasar_config
   phasar_controller
-  phasar_controlflow
-  phasar_phasarllvm_utils
+  phasar_llvm_controlflow
+  phasar_llvm_utils
   phasar_analysis_strategy
-  phasar_ifdside
+  phasar_llvm_ifdside
   phasar_utils
   phasar_mono
-  phasar_db
+  phasar_llvm_db
   phasar_passes
-  phasar_pointer
-  phasar_typehierarchy
+  phasar_llvm_pointer
+  phasar_llvm
+  phasar_llvm_typehierarchy
   ${SQLITE3_LIBRARY}
   ${Boost_LIBRARIES}
   ${CMAKE_DL_LIBS}
@@ -46,12 +47,12 @@ target_link_libraries(phasar-llvm
 
 if (NOT PHASAR_IN_TREE)
   if(USE_LLVM_FAT_LIB)
-    llvm_config(phasar-llvm USE_SHARED ${LLVM_LINK_COMPONENTS})
+    llvm_config(phasar-cli USE_SHARED ${LLVM_LINK_COMPONENTS})
   else()
-    llvm_config(phasar-llvm ${LLVM_LINK_COMPONENTS})
+    llvm_config(phasar-cli ${LLVM_LINK_COMPONENTS})
   endif()
 
-  install(TARGETS phasar-llvm
+  install(TARGETS phasar-cli
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib
     ARCHIVE DESTINATION lib
diff --git a/tools/phasar-llvm/phasar-llvm.cpp b/tools/phasar-cli/phasar-cli.cpp
similarity index 97%
rename from tools/phasar-llvm/phasar-llvm.cpp
rename to tools/phasar-cli/phasar-cli.cpp
index 81c42d8e7..e7f3571df 100644
--- a/tools/phasar-llvm/phasar-llvm.cpp
+++ b/tools/phasar-cli/phasar-cli.cpp
@@ -7,16 +7,16 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
+#include "phasar/AnalysisStrategy/Strategies.h"
 #include "phasar/Config/Configuration.h"
+#include "phasar/ControlFlow/CallGraphAnalysisType.h"
 #include "phasar/Controller/AnalysisController.h"
 #include "phasar/Controller/AnalysisControllerEmitterOptions.h"
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/Strategies.h"
-#include "phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/HelperAnalyses.h"
 #include "phasar/PhasarLLVM/Passes/GeneralStatisticsAnalysis.h"
-#include "phasar/PhasarLLVM/Pointer/AliasAnalysisType.h"
 #include "phasar/PhasarLLVM/Utils/DataFlowAnalysisType.h"
+#include "phasar/Pointer/AliasAnalysisType.h"
 #include "phasar/Utils/IO.h"
 #include "phasar/Utils/Logger.h"
 #include "phasar/Utils/Soundness.h"
@@ -87,7 +87,7 @@ cl::opt<AnalysisStrategy>
                 cl::values(
 #define ANALYSIS_STRATEGY_TYPES(NAME, CMDFLAG, DESC)                           \
   clEnumValN(AnalysisStrategy::NAME, CMDFLAG, DESC),
-#include "phasar/PhasarLLVM/AnalysisStrategy/Strategies.def"
+#include "phasar/AnalysisStrategy/Strategies.def"
                     clEnumValN(AnalysisStrategy::None, "none", "none")),
                 cl::init(AnalysisStrategy::WholeProgram), cl::cat(PsrCat),
                 cl::Hidden);
@@ -105,7 +105,7 @@ cl::opt<AliasAnalysisType> AliasTypeOpt(
     cl::values(
 #define ALIAS_ANALYSIS_TYPE(NAME, CMDFLAG, DESC)                               \
   clEnumValN(AliasAnalysisType::NAME, CMDFLAG, DESC),
-#include "phasar/PhasarLLVM/Pointer/AliasAnalysisType.def"
+#include "phasar/Pointer/AliasAnalysisType.def"
         clEnumValN(AliasAnalysisType::Invalid, "invalid", "invalid")),
     cl::init(AliasAnalysisType::CFLAnders), cl::cat(PsrCat));
 cl::alias AliasTypeAlias("P", cl::aliasopt(AliasTypeOpt),
@@ -117,7 +117,7 @@ cl::opt<CallGraphAnalysisType> CGTypeOpt(
     cl::values(
 #define CALL_GRAPH_ANALYSIS_TYPE(NAME, CMDFLAG, DESC)                          \
   clEnumValN(CallGraphAnalysisType::NAME, CMDFLAG, DESC),
-#include "phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.def"
+#include "phasar/ControlFlow/CallGraphAnalysisType.def"
         clEnumValN(CallGraphAnalysisType::Invalid, "invalid", "invalid")),
     cl::init(CallGraphAnalysisType::OTF), cl::cat(PsrCat));
 cl::alias CGTypeAlias("C", cl::aliasopt(CGTypeOpt),
diff --git a/unittests/PhasarLLVM/CMakeLists.txt b/unittests/PhasarLLVM/CMakeLists.txt
index cdca4ea54..da7063d21 100644
--- a/unittests/PhasarLLVM/CMakeLists.txt
+++ b/unittests/PhasarLLVM/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_subdirectory(ControlFlow)
-add_subdirectory(DataFlowSolver)
+add_subdirectory(DataFlow)
 add_subdirectory(Utils)
 # add_subdirectory(Passes)
 add_subdirectory(Pointer)
diff --git a/unittests/PhasarLLVM/ControlFlow/LLVMBasedBackwardCFGTest.cpp b/unittests/PhasarLLVM/ControlFlow/LLVMBasedBackwardCFGTest.cpp
index 33ea5c346..54db05639 100644
--- a/unittests/PhasarLLVM/ControlFlow/LLVMBasedBackwardCFGTest.cpp
+++ b/unittests/PhasarLLVM/ControlFlow/LLVMBasedBackwardCFGTest.cpp
@@ -1,7 +1,7 @@
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardCFG.h"
 
 #include "phasar/Config/Configuration.h"
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
 #include "llvm/IR/Function.h"
diff --git a/unittests/PhasarLLVM/ControlFlow/LLVMBasedCFGTest.cpp b/unittests/PhasarLLVM/ControlFlow/LLVMBasedCFGTest.cpp
index 3e2f3f669..26c8f30d2 100644
--- a/unittests/PhasarLLVM/ControlFlow/LLVMBasedCFGTest.cpp
+++ b/unittests/PhasarLLVM/ControlFlow/LLVMBasedCFGTest.cpp
@@ -1,8 +1,8 @@
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h"
 
 #include "phasar/Config/Configuration.h"
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/ControlFlow/SpecialMemberFunctionType.h"
+#include "phasar/ControlFlow/SpecialMemberFunctionType.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
 #include "llvm/IR/Function.h"
diff --git a/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFGExportTest.cpp b/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFGExportTest.cpp
index 3edb95489..b6aafefae 100644
--- a/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFGExportTest.cpp
+++ b/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFGExportTest.cpp
@@ -1,7 +1,8 @@
 #include "phasar/Config/Configuration.h"
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/ControlFlow/CallGraphAnalysisType.h"
+#include "phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMIRToSrc.h"
diff --git a/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFGGlobCtorDtorTest.cpp b/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFGGlobCtorDtorTest.cpp
index 441f79dde..0aafcff1d 100644
--- a/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFGGlobCtorDtorTest.cpp
+++ b/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFGGlobCtorDtorTest.cpp
@@ -8,10 +8,11 @@
  *****************************************************************************/
 
 #include "phasar/Config/Configuration.h"
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/DataFlow/IfdsIde/Solver/IDESolver.h"
+#include "phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysis.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysis.h"
 #include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
diff --git a/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFGTest.cpp b/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFGTest.cpp
index 4f2c3fbda..b3894ee04 100644
--- a/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFGTest.cpp
+++ b/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFGTest.cpp
@@ -1,8 +1,10 @@
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
 
 #include "phasar/Config/Configuration.h"
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.h"
+#include "phasar/ControlFlow/CallGraphAnalysisType.h"
+#include "phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h"
+#include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
diff --git a/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_CHATest.cpp b/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_CHATest.cpp
index fc21490f2..b062bdd4c 100644
--- a/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_CHATest.cpp
+++ b/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_CHATest.cpp
@@ -1,7 +1,7 @@
 #include "phasar/Config/Configuration.h"
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/ControlFlow/CallGraphAnalysisType.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
diff --git a/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_DTATest.cpp b/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_DTATest.cpp
index 62412cde6..07f5b80b9 100644
--- a/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_DTATest.cpp
+++ b/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_DTATest.cpp
@@ -1,7 +1,7 @@
 #include "phasar/Config/Configuration.h"
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/ControlFlow/CallGraphAnalysisType.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
diff --git a/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_OTFTest.cpp b/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_OTFTest.cpp
index 69239fe38..ba4df9fc7 100644
--- a/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_OTFTest.cpp
+++ b/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_OTFTest.cpp
@@ -1,9 +1,9 @@
 
 
 #include "phasar/Config/Configuration.h"
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/ControlFlow/CallGraphAnalysisType.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
diff --git a/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_RTATest.cpp b/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_RTATest.cpp
index 9ebfed3f0..7503bca44 100644
--- a/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_RTATest.cpp
+++ b/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_RTATest.cpp
@@ -1,7 +1,7 @@
 #include "phasar/Config/Configuration.h"
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/ControlFlow/CallGraphAnalysisType.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
diff --git a/unittests/PhasarLLVM/DataFlowSolver/CMakeLists.txt b/unittests/PhasarLLVM/DataFlow/CMakeLists.txt
similarity index 100%
rename from unittests/PhasarLLVM/DataFlowSolver/CMakeLists.txt
rename to unittests/PhasarLLVM/DataFlow/CMakeLists.txt
diff --git a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/CMakeLists.txt b/unittests/PhasarLLVM/DataFlow/IfdsIde/CMakeLists.txt
similarity index 100%
rename from unittests/PhasarLLVM/DataFlowSolver/IfdsIde/CMakeLists.txt
rename to unittests/PhasarLLVM/DataFlow/IfdsIde/CMakeLists.txt
diff --git a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionComposerTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/EdgeFunctionComposerTest.cpp
similarity index 95%
rename from unittests/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionComposerTest.cpp
rename to unittests/PhasarLLVM/DataFlow/IfdsIde/EdgeFunctionComposerTest.cpp
index 76ade34e9..2b75f674d 100644
--- a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionComposerTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/EdgeFunctionComposerTest.cpp
@@ -1,6 +1,6 @@
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionComposer.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctionComposer.h"
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysis.h"
 
 #include "gtest/gtest.h"
 
diff --git a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionSingletonFactoryTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/EdgeFunctionSingletonFactoryTest.cpp
similarity index 96%
rename from unittests/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionSingletonFactoryTest.cpp
rename to unittests/PhasarLLVM/DataFlow/IfdsIde/EdgeFunctionSingletonFactoryTest.cpp
index 5985c4f8d..ad82216c7 100644
--- a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionSingletonFactoryTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/EdgeFunctionSingletonFactoryTest.cpp
@@ -1,6 +1,6 @@
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionSingletonFactory.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctionSingletonFactory.h"
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
 
 #include "gtest/gtest.h"
 
diff --git a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/CMakeLists.txt b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/CMakeLists.txt
similarity index 100%
rename from unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/CMakeLists.txt
rename to unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/CMakeLists.txt
diff --git a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEExtendedTaintAnalysisTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysisTest.cpp
similarity index 96%
rename from unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEExtendedTaintAnalysisTest.cpp
rename to unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysisTest.cpp
index 715901c2c..81ba4c63b 100644
--- a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEExtendedTaintAnalysisTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysisTest.cpp
@@ -7,15 +7,15 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEExtendedTaintAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/SimpleAnalysisConstructor.h"
+#include "phasar/DataFlow/IfdsIde/Solver/IDESolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/HelperAnalyses.h"
 #include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TaintConfig/TaintConfig.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/Utils/DebugOutput.h"
diff --git a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCATest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCATest.cpp
similarity index 92%
rename from unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCATest.cpp
rename to unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCATest.cpp
index 925445a86..1b1a134d9 100644
--- a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCATest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCATest.cpp
@@ -7,15 +7,16 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/SimpleAnalysisConstructor.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h"
+#include "phasar/DataFlow/IfdsIde/Solver/IDESolver.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/HelperAnalyses.h"
 #include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
+#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"
 
 #include "llvm/Support/raw_ostream.h"
diff --git a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEInstInteractionAnalysisTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysisTest.cpp
similarity index 98%
rename from unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEInstInteractionAnalysisTest.cpp
rename to unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysisTest.cpp
index 14760647d..87e5231bc 100644
--- a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEInstInteractionAnalysisTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysisTest.cpp
@@ -7,17 +7,16 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEInstInteractionAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysis.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/HelperAnalysisConfig.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/SimpleAnalysisConstructor.h"
+#include "phasar/DataFlow/IfdsIde/Solver/IDESolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/HelperAnalyses.h"
+#include "phasar/PhasarLLVM/HelperAnalysisConfig.h"
 #include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/BitVectorSet.h"
diff --git a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysisTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysisTest.cpp
similarity index 98%
rename from unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysisTest.cpp
rename to unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysisTest.cpp
index a67315055..b41244349 100644
--- a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysisTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysisTest.cpp
@@ -1,12 +1,12 @@
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysis.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/SimpleAnalysisConstructor.h"
+#include "phasar/DataFlow/IfdsIde/Solver/IDESolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/HelperAnalyses.h"
 #include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
diff --git a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysis_DotTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysis_DotTest.cpp
similarity index 98%
rename from unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysis_DotTest.cpp
rename to unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysis_DotTest.cpp
index 16bd6cff6..f5da988c7 100644
--- a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysis_DotTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysis_DotTest.cpp
@@ -1,11 +1,11 @@
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/SimpleAnalysisConstructor.h"
+#include "phasar/DataFlow/IfdsIde/Solver/IDESolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysis.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysis.h"
+#include "phasar/PhasarLLVM/HelperAnalyses.h"
 #include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 
 #include "TestConfig.h"
diff --git a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETSAnalysisFileIOTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisFileIOTest.cpp
similarity index 97%
rename from unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETSAnalysisFileIOTest.cpp
rename to unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisFileIOTest.cpp
index 7d636df10..bc2e2cc87 100644
--- a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETSAnalysisFileIOTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisFileIOTest.cpp
@@ -7,16 +7,17 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/SimpleAnalysisConstructor.h"
+#include "phasar/DataFlow/IfdsIde/Solver/IDESolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETypeStateAnalysis.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.h"
+#include "phasar/PhasarLLVM/HelperAnalyses.h"
 #include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
+#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
 #include "TestConfig.h"
 #include "gtest/gtest.h"
diff --git a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETSAnalysisOpenSSLEVPKDFTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisOpenSSLEVPKDFTest.cpp
similarity index 96%
rename from unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETSAnalysisOpenSSLEVPKDFTest.cpp
rename to unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisOpenSSLEVPKDFTest.cpp
index cb20c1a86..c02802f96 100644
--- a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETSAnalysisOpenSSLEVPKDFTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisOpenSSLEVPKDFTest.cpp
@@ -7,17 +7,18 @@
  *     Philipp Schubert, Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/SimpleAnalysisConstructor.h"
+#include "phasar/DataFlow/IfdsIde/Solver/IDESolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETypeStateAnalysis.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFCTXDescription.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFCTXDescription.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.h"
+#include "phasar/PhasarLLVM/HelperAnalyses.h"
 #include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
+#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
 #include "gtest/gtest.h"
 
diff --git a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETSAnalysisOpenSSLSecureHeapTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisOpenSSLSecureHeapTest.cpp
similarity index 90%
rename from unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETSAnalysisOpenSSLSecureHeapTest.cpp
rename to unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisOpenSSLSecureHeapTest.cpp
index 9c9e72951..4546dc44c 100644
--- a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETSAnalysisOpenSSLSecureHeapTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisOpenSSLSecureHeapTest.cpp
@@ -7,17 +7,18 @@
  *     Philipp Schubert, Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/SimpleAnalysisConstructor.h"
+#include "phasar/DataFlow/IfdsIde/Solver/IDESolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDESecureHeapPropagation.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETypeStateAnalysis.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureHeapDescription.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDESecureHeapPropagation.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureHeapDescription.h"
+#include "phasar/PhasarLLVM/HelperAnalyses.h"
 #include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
+#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
 #include "llvm/ADT/Twine.h"
 
diff --git a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETSAnalysisOpenSSLSecureMemoryTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisOpenSSLSecureMemoryTest.cpp
similarity index 93%
rename from unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETSAnalysisOpenSSLSecureMemoryTest.cpp
rename to unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisOpenSSLSecureMemoryTest.cpp
index 941faff7a..3006943b7 100644
--- a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETSAnalysisOpenSSLSecureMemoryTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisOpenSSLSecureMemoryTest.cpp
@@ -7,16 +7,17 @@
  *     Philipp Schubert, Fabian Schiebel and others
  *****************************************************************************/
 
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/SimpleAnalysisConstructor.h"
+#include "phasar/DataFlow/IfdsIde/Solver/IDESolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETypeStateAnalysis.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureMemoryDescription.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureMemoryDescription.h"
+#include "phasar/PhasarLLVM/HelperAnalyses.h"
 #include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
+#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
 #include "gtest/gtest.h"
 
diff --git a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSConstAnalysisTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSConstAnalysisTest.cpp
similarity index 98%
rename from unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSConstAnalysisTest.cpp
rename to unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSConstAnalysisTest.cpp
index 1d006dc29..1159b9def 100644
--- a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSConstAnalysisTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSConstAnalysisTest.cpp
@@ -1,13 +1,13 @@
 
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSConstAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSConstAnalysis.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/SimpleAnalysisConstructor.h"
+#include "phasar/DataFlow/IfdsIde/Solver/IFDSSolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IFDSSolver.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/HelperAnalyses.h"
 #include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
diff --git a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTaintAnalysisTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysisTest.cpp
similarity index 96%
rename from unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTaintAnalysisTest.cpp
rename to unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysisTest.cpp
index 3a9a3cc78..a3e5c2623 100644
--- a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTaintAnalysisTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysisTest.cpp
@@ -1,12 +1,12 @@
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTaintAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysis.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/SimpleAnalysisConstructor.h"
+#include "phasar/DataFlow/IfdsIde/Solver/IFDSSolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IFDSSolver.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/HelperAnalyses.h"
 #include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TaintConfig/TaintConfig.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 
diff --git a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSUninitializedVariablesTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariablesTest.cpp
similarity index 97%
rename from unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSUninitializedVariablesTest.cpp
rename to unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariablesTest.cpp
index 9aac540cd..acca3e8d2 100644
--- a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSUninitializedVariablesTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariablesTest.cpp
@@ -1,12 +1,13 @@
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSUninitializedVariables.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/SimpleAnalysisConstructor.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariables.h"
+
+#include "phasar/DataFlow/IfdsIde/Solver/IFDSSolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IFDSSolver.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/HelperAnalyses.h"
 #include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 
 #include "llvm/IR/Module.h"
diff --git a/unittests/PhasarLLVM/DataFlowSolver/Mono/CMakeLists.txt b/unittests/PhasarLLVM/DataFlow/Mono/CMakeLists.txt
similarity index 100%
rename from unittests/PhasarLLVM/DataFlowSolver/Mono/CMakeLists.txt
rename to unittests/PhasarLLVM/DataFlow/Mono/CMakeLists.txt
diff --git a/unittests/PhasarLLVM/DataFlowSolver/Mono/InterMonoFullConstantPropagationTest.cpp b/unittests/PhasarLLVM/DataFlow/Mono/InterMonoFullConstantPropagationTest.cpp
similarity index 93%
rename from unittests/PhasarLLVM/DataFlowSolver/Mono/InterMonoFullConstantPropagationTest.cpp
rename to unittests/PhasarLLVM/DataFlow/Mono/InterMonoFullConstantPropagationTest.cpp
index 42bde0fca..a09061b93 100644
--- a/unittests/PhasarLLVM/DataFlowSolver/Mono/InterMonoFullConstantPropagationTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/Mono/InterMonoFullConstantPropagationTest.cpp
@@ -7,17 +7,16 @@
  *     Philipp Schubert, Linus Jungemann, and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoFullConstantPropagation.h"
+#include "phasar/PhasarLLVM/DataFlow/Mono/Problems/InterMonoFullConstantPropagation.h"
 
 #include "phasar/Config/Configuration.h"
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/SimpleAnalysisConstructor.h"
+#include "phasar/DataFlow/Mono/Solver/InterMonoSolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/CallString.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Solver/InterMonoSolver.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/HelperAnalyses.h"
 #include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"
diff --git a/unittests/PhasarLLVM/DataFlowSolver/Mono/InterMonoTaintAnalysisTest.cpp b/unittests/PhasarLLVM/DataFlow/Mono/InterMonoTaintAnalysisTest.cpp
similarity index 97%
rename from unittests/PhasarLLVM/DataFlowSolver/Mono/InterMonoTaintAnalysisTest.cpp
rename to unittests/PhasarLLVM/DataFlow/Mono/InterMonoTaintAnalysisTest.cpp
index 5ee845698..33597bfa8 100644
--- a/unittests/PhasarLLVM/DataFlowSolver/Mono/InterMonoTaintAnalysisTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/Mono/InterMonoTaintAnalysisTest.cpp
@@ -1,13 +1,12 @@
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoTaintAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/Mono/Problems/InterMonoTaintAnalysis.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/SimpleAnalysisConstructor.h"
+#include "phasar/DataFlow/Mono/Solver/InterMonoSolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/CallString.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Solver/InterMonoSolver.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/HelperAnalyses.h"
 #include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"
diff --git a/unittests/PhasarLLVM/DataFlowSolver/Mono/IntraMonoFullConstantPropagationTest.cpp b/unittests/PhasarLLVM/DataFlow/Mono/IntraMonoFullConstantPropagationTest.cpp
similarity index 91%
rename from unittests/PhasarLLVM/DataFlowSolver/Mono/IntraMonoFullConstantPropagationTest.cpp
rename to unittests/PhasarLLVM/DataFlow/Mono/IntraMonoFullConstantPropagationTest.cpp
index 49438f7aa..884117566 100644
--- a/unittests/PhasarLLVM/DataFlowSolver/Mono/IntraMonoFullConstantPropagationTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/Mono/IntraMonoFullConstantPropagationTest.cpp
@@ -7,16 +7,15 @@
  *     Philipp Schubert, Linus Jungemann, and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoFullConstantPropagation.h"
+#include "phasar/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoFullConstantPropagation.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/SimpleAnalysisConstructor.h"
+#include "phasar/DataFlow/Mono/Solver/IntraMonoSolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/CallString.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Solver/IntraMonoSolver.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/HelperAnalyses.h"
 #include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"
diff --git a/unittests/PhasarLLVM/DataFlowSolver/Mono/IntraMonoUninitVariablesTest.cpp b/unittests/PhasarLLVM/DataFlow/Mono/IntraMonoUninitVariablesTest.cpp
similarity index 88%
rename from unittests/PhasarLLVM/DataFlowSolver/Mono/IntraMonoUninitVariablesTest.cpp
rename to unittests/PhasarLLVM/DataFlow/Mono/IntraMonoUninitVariablesTest.cpp
index 82c8535f7..0891f2769 100644
--- a/unittests/PhasarLLVM/DataFlowSolver/Mono/IntraMonoUninitVariablesTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/Mono/IntraMonoUninitVariablesTest.cpp
@@ -7,16 +7,16 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoUninitVariables.h"
+#include "phasar/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoUninitVariables.h"
 
 #include "phasar/Config/Configuration.h"
-#include "phasar/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/SimpleAnalysisConstructor.h"
+#include "phasar/DataFlow/Mono/Solver/IntraMonoSolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/Mono/Solver/IntraMonoSolver.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/HelperAnalyses.h"
 #include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"
diff --git a/unittests/PhasarLLVM/Pointer/LLVMAliasSetSerializationTest.cpp b/unittests/PhasarLLVM/Pointer/LLVMAliasSetSerializationTest.cpp
index c763cd0bb..1da745937 100644
--- a/unittests/PhasarLLVM/Pointer/LLVMAliasSetSerializationTest.cpp
+++ b/unittests/PhasarLLVM/Pointer/LLVMAliasSetSerializationTest.cpp
@@ -1,6 +1,6 @@
 #include "phasar/Config/Configuration.h"
-#include "phasar/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
diff --git a/unittests/PhasarLLVM/Pointer/LLVMAliasSetTest.cpp b/unittests/PhasarLLVM/Pointer/LLVMAliasSetTest.cpp
index 9c626a79e..3cac284a2 100644
--- a/unittests/PhasarLLVM/Pointer/LLVMAliasSetTest.cpp
+++ b/unittests/PhasarLLVM/Pointer/LLVMAliasSetTest.cpp
@@ -1,8 +1,8 @@
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 
 #include "phasar/Config/Configuration.h"
-#include "phasar/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMPointsToUtils.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
diff --git a/unittests/PhasarLLVM/TaintConfig/TaintConfigTest.cpp b/unittests/PhasarLLVM/TaintConfig/TaintConfigTest.cpp
index 2272f06e2..f47a42a03 100644
--- a/unittests/PhasarLLVM/TaintConfig/TaintConfigTest.cpp
+++ b/unittests/PhasarLLVM/TaintConfig/TaintConfigTest.cpp
@@ -1,7 +1,6 @@
-
 #include "phasar/PhasarLLVM/TaintConfig/TaintConfig.h"
 
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
diff --git a/unittests/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchyTest.cpp b/unittests/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchyTest.cpp
index 33ce5dc1a..3dd219fde 100644
--- a/unittests/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchyTest.cpp
+++ b/unittests/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchyTest.cpp
@@ -2,7 +2,7 @@
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 
 #include "phasar/Config/Configuration.h"
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Utilities.h"
 
diff --git a/unittests/PhasarLLVM/TypeHierarchy/TypeGraphTest.cpp b/unittests/PhasarLLVM/TypeHierarchy/TypeGraphTest.cpp
index 7bb8d796a..8f2f088e5 100644
--- a/unittests/PhasarLLVM/TypeHierarchy/TypeGraphTest.cpp
+++ b/unittests/PhasarLLVM/TypeHierarchy/TypeGraphTest.cpp
@@ -1,5 +1,5 @@
 #include "phasar/Config/Configuration.h"
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Pointer/TypeGraphs/CachedTypeGraph.h"
 #include "phasar/PhasarLLVM/Pointer/TypeGraphs/LazyTypeGraph.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
diff --git a/unittests/PhasarLLVM/Utils/LatticeDomainTest.cpp b/unittests/PhasarLLVM/Utils/LatticeDomainTest.cpp
index d439c2396..ec33ae023 100644
--- a/unittests/PhasarLLVM/Utils/LatticeDomainTest.cpp
+++ b/unittests/PhasarLLVM/Utils/LatticeDomainTest.cpp
@@ -1,4 +1,4 @@
-#include "phasar/PhasarLLVM/Utils/LatticeDomain.h"
+#include "phasar/Domain/LatticeDomain.h"
 
 #include "gtest/gtest.h"
 
diff --git a/unittests/Utils/LLVMIRToSrcTest.cpp b/unittests/Utils/LLVMIRToSrcTest.cpp
index 823863c13..543bc0903 100644
--- a/unittests/Utils/LLVMIRToSrcTest.cpp
+++ b/unittests/Utils/LLVMIRToSrcTest.cpp
@@ -1,8 +1,8 @@
 #include "phasar/PhasarLLVM/Utils/LLVMIRToSrc.h"
 
 #include "phasar/Config/Configuration.h"
-#include "phasar/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
diff --git a/unittests/Utils/LLVMShorthandsTest.cpp b/unittests/Utils/LLVMShorthandsTest.cpp
index 34d3a3566..d6104664c 100644
--- a/unittests/Utils/LLVMShorthandsTest.cpp
+++ b/unittests/Utils/LLVMShorthandsTest.cpp
@@ -1,7 +1,7 @@
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
 #include "phasar/Config/Configuration.h"
-#include "phasar/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/Utils/Utilities.h"
 
 #include "llvm/IR/Function.h"