diff --git a/retrieval/discovery/azure.go b/retrieval/discovery/azure/azure.go
similarity index 100%
rename from retrieval/discovery/azure.go
rename to retrieval/discovery/azure/azure.go
diff --git a/retrieval/discovery/ec2.go b/retrieval/discovery/ec2/ec2.go
similarity index 100%
rename from retrieval/discovery/ec2.go
rename to retrieval/discovery/ec2/ec2.go
diff --git a/retrieval/discovery/file.go b/retrieval/discovery/file/file.go
similarity index 100%
rename from retrieval/discovery/file.go
rename to retrieval/discovery/file/file.go
diff --git a/retrieval/discovery/file_test.go b/retrieval/discovery/file/file_test.go
similarity index 100%
rename from retrieval/discovery/file_test.go
rename to retrieval/discovery/file/file_test.go
diff --git a/retrieval/discovery/gce.go b/retrieval/discovery/gce/gce.go
similarity index 100%
rename from retrieval/discovery/gce.go
rename to retrieval/discovery/gce/gce.go
diff --git a/retrieval/discovery/zookeeper.go b/retrieval/discovery/zookeeper/zookeeper.go
similarity index 100%
rename from retrieval/discovery/zookeeper.go
rename to retrieval/discovery/zookeeper/zookeeper.go