Minor reorganization of Keyword and Userguide components