Relocate main.go to etcd/cmd/main.go

It sort of bothers me that we splatted the buildable files in the root directory. I'm proposing moving them into a cmd/etcd/ subdirectory not just to make me feel better, but in preparation for having other binaries in this repo. So with that preface, I have two questions:

1. I'm hoping that etcdctl moves into this repo, which would end up at cmd/etcdctl/. Does anyone else forsee this happening, or am I crazy?
2. Moving the main pkg into cmd/etcd/ means that one can no longer call `go get github.com/coreos/etcd`. Does this matter?