Code changes and reorganisation preliminary to redistributePar updates (#2436)

Merged Mark OLESEN requested to merge feature-reorganise into develop

Merge request reports