Changed file names, reordered currency regexes