Change package structure to ensure it both works with Google Play and does not conflict with generated package names