Go requires package name exactly match directory name
Updated wrappers