Small updates, moved Tokens and Token into their own package in prep for Processors.