Migrated Internal Wrapper
Added missing files and fixed build error.