diff --git a/retrieval/discovery/consul.go b/retrieval/discovery/consul.go
deleted file mode 100644
index 00f388d65..000000000
--- a/retrieval/discovery/consul.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2016 The Prometheus Authors
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package discovery
-
-import (
-	"github.com/prometheus/prometheus/config"
-	"github.com/prometheus/prometheus/retrieval/discovery/consul"
-)
-
-// NewConsul creates a new Consul based Discovery.
-func NewConsul(cfg *config.ConsulSDConfig) (*consul.Discovery, error) {
-	return consul.NewDiscovery(cfg)
-}
diff --git a/retrieval/discovery/kubernetes.go b/retrieval/discovery/discovery.go
similarity index 55%
rename from retrieval/discovery/kubernetes.go
rename to retrieval/discovery/discovery.go
index bc1f73cc8..795de8158 100644
--- a/retrieval/discovery/kubernetes.go
+++ b/retrieval/discovery/discovery.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The Prometheus Authors
+// Copyright 2016 The Prometheus Authors
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -14,10 +14,20 @@
 package discovery
 
 import (
+	"time"
+
 	"github.com/prometheus/prometheus/config"
+	"github.com/prometheus/prometheus/retrieval/discovery/consul"
+	"github.com/prometheus/prometheus/retrieval/discovery/dns"
 	"github.com/prometheus/prometheus/retrieval/discovery/kubernetes"
+	"github.com/prometheus/prometheus/retrieval/discovery/marathon"
 )
 
+// NewConsul creates a new Consul based Discovery.
+func NewConsul(cfg *config.ConsulSDConfig) (*consul.Discovery, error) {
+	return consul.NewDiscovery(cfg)
+}
+
 // NewKubernetesDiscovery creates a Kubernetes service discovery based on the passed-in configuration.
 func NewKubernetesDiscovery(conf *config.KubernetesSDConfig) (*kubernetes.Discovery, error) {
 	kd := &kubernetes.Discovery{
@@ -29,3 +39,17 @@ func NewKubernetesDiscovery(conf *config.KubernetesSDConfig) (*kubernetes.Discov
 	}
 	return kd, nil
 }
+
+// NewMarathon creates a new Marathon based discovery.
+func NewMarathon(conf *config.MarathonSDConfig) *marathon.Discovery {
+	return &marathon.Discovery{
+		Servers:         conf.Servers,
+		RefreshInterval: time.Duration(conf.RefreshInterval),
+		Client:          marathon.FetchApps,
+	}
+}
+
+// NewDNS creates a new DNS based discovery.
+func NewDNS(conf *config.DNSSDConfig) *dns.Discovery {
+	return dns.NewDiscovery(conf)
+}
diff --git a/retrieval/discovery/dns.go b/retrieval/discovery/dns.go
deleted file mode 100644
index c413efdfc..000000000
--- a/retrieval/discovery/dns.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2016 The Prometheus Authors
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package discovery
-
-import (
-	"github.com/prometheus/prometheus/retrieval/discovery/dns"
-
-	"github.com/prometheus/prometheus/config"
-)
-
-// NewDNS creates a new DNS based discovery.
-func NewDNS(conf *config.DNSSDConfig) *dns.Discovery {
-	return dns.NewDiscovery(conf)
-}
diff --git a/retrieval/discovery/marathon.go b/retrieval/discovery/marathon.go
deleted file mode 100644
index e22cf48f0..000000000
--- a/retrieval/discovery/marathon.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015 The Prometheus Authors
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package discovery
-
-import (
-	"time"
-
-	"github.com/prometheus/prometheus/config"
-	"github.com/prometheus/prometheus/retrieval/discovery/marathon"
-)
-
-// NewMarathon creates a new Marathon based discovery.
-func NewMarathon(conf *config.MarathonSDConfig) *marathon.Discovery {
-	return &marathon.Discovery{
-		Servers:         conf.Servers,
-		RefreshInterval: time.Duration(conf.RefreshInterval),
-		Client:          marathon.FetchApps,
-	}
-}