Add new package template, make some changes to packages