Moved token into separated module
fixes