added token, refactored directory names