Move descriptors implementation to sub-namespace