Removing non needed apps, and re-arranging templates.