Refactor guides

Bengfort requested to merge refactor-guides into master

This was originally part of !26 (merged) but we wanted to discuss these changes individually, so I split this into a series of commits.

Merge request reports