Fix the file names with number, avoid double periods.
Move Unnormalize back to Normalize
Merge branch 'master' into ospalh-special