* Refactored namespaces (trait classes are postfixed with '_trait'; internal namespaces are prefixed with __)