Updated .h with updated structures. New structures named with prefix 
"n_" temporarily until old structures are deprecated.

Change-Id: I1e45a0ebe34106be57da639ff154cfdfb336a397
Signed-off-by: panacotta <alejoar@gmail.com>