Updated package templates and phing script to include extra components and fix package uninstall issues