Split etcd.go in smaller files