Changing package name
Android fixes