Move normalize to base folder.
Update comments.