Refactoring: new packages "activities" and "views"