Move Native module. Minor updates.