Refractoring package name and activity name