fixed sorting to account for new file types and renamed