Seperate out the device demos and project's configuration descriptor structure definitions to clearly indicate what descriptors belong to which interface.
