Client, server: templates for Package and Setup modules added