Moved common code into parent package.
Moved test accordingly.
Added tokens for currency.