Refactoring : Moving Activity class to correct package