Cleanup and build improvements

@elingg PTAL
Let's add a constant for the "native" dir