Renaming some files, fix ess buy/sell