changing android package name and removing some comments.