Hotfix sec exp

Blank_Altrequested to merge
Blank_Alt/fc-pregmod:hotfix-SecExp into pregmod-master

Fixes #2708 (closed) and also re-organizes both files to make future reviews easier.

Merge request reports