Refactor of Calculator, Calendar and Camera apps