Refactor and moved the currency file