Mostly comments and restructuring

Mostly comments and restructuring
Merge branch 'master' of https://github.com/SeparationOfConcerns/Trapp