Move token-related items into subpackage token

Plus numerous javadoc wrapping edits and additions to CommandContext