Change package name and update struct name