upgrade project
update the project to new structure in Android
arrange billing service dependencies