[#825] Update list; renamed some files