Move etcdclient and template_resource to their own packages