Updated packaging files in line with restructuring of Makefile.in