Reorganization of the currency module