upd struct & namespaces