Added token-lib + arranged bundles + added function r()