Move traits under respective namespaces.
Merge pull request #3337 from ADmad/3.0-traits

Move traits under respective namespaces.