A little more restructuring of code and docs.