Streamline folder/include structure in discretization

Merged Timo Koch requested to merge feature/reorganize-discretization into master

Merge request reports