Moved normalization to extra package.