- Move some functions from stubs.c to new file eng/mapping.c