Change package name, make global