Added Norm Extractor and changed demo app to use it.