Moved heavy weapons package into gun package.