move short module in token directory
add re-exporting functions