Fix some missing replacements and remove Sections

Instead put interactions directly on the top level.
Each "section" would instead be put into its own file (= scenario).