Reorganized things a bit for OpenNI2 wrapper.