changed native code layout.
This is what I've determined just the preprocessor.

I still need to figure out two issues.
removed a native call.