Change structure of NDK files