Move some more files; Update Native API