Doc changes; reorganization