Merge "Change "files" directory in etcd project"