Move the Token class to a single module