Refactoring
Removed CurrencyEntry class
More refactoring