Remove cycle in common util
Extract TokenStore implementations into a sub-package (anti-cycle)