Restructure Context/Asst to replicate source structure.

Makes a number of existing test-cases round-trip. AST  suggested by @niklasbroberg in #17.