Rename some namespaces.  Code cleanup.  Add Normal class.