Reorganised a few files. Commented out the calculation of the stochastic recovery for the moment (will add the fix later).
Merge branch 'develop' into ui/dev