Samples From Mars/Maschine+ Question

Well, I got that SFM pack for 39 bucks and the M+ (lots more than 39 bucks) for the holidays. So this is your average "how the heck do I get samples on to the M+" topic. I can get anything to show up as a one-shot via wavs user content but not as instruments or anything else. Instruments show up in the browser but there is nothing there. What am I missing? I'm a bit confused as to the whole "how many layers deep" controversy etc. I tried to keep folders as simple as possible. For instance, Folder 1 would be "Linndrum" for instance and then the next layer would be the Wavs.

So yeah they show up as one-shots but I only loaded a few packs and it's like 2,200 one-shots. I need some way to have them organized so they are useable. Everything is also organized alphabetically and not by pack. Do NKIs not work with M+? I've heard differing things about this. What is the best way to go about this? Any advice would be MUCH appreciated. Thanks!!