Change package name to be more android friendly