Merge branch Mario/cleanup (XXL merge request)
General reorganization with a few minor changes (requesting merge now before it gets too massive, will continue in smaller chunks later).
General reorganization with a few minor changes (requesting merge now before it gets too massive, will continue in smaller chunks later).