Namespace classes with ya
Merge branch 'namespace_classes'