Add etcd module and do minor cleanup.