Revert "Moved D.4..3 to new folder in report (second try)"

This reverts commit 760e8630070e833600e8da5c4202d2b1bf6f9bd3.