Moved the Token code to its own package