Changing package name. Still not happy with it :(