chose activity depending on intent

and renamed package