Merge discussion from Åsa
Refactor discussion files