diff --git a/Documentation/running-clair.md b/Documentation/running-clair.md
index c7bdf017..54baa031 100644
--- a/Documentation/running-clair.md
+++ b/Documentation/running-clair.md
@@ -59,7 +59,7 @@ kubectl create -f clair-kubernetes.yaml
 #### Docker Compose
 
 ```sh
-$ curl -L https://raw.githubusercontent.com/coreos/clair/master/docker-compose.yml -o $HOME/docker-compose.yml
+$ curl -L https://raw.githubusercontent.com/coreos/clair/master/contrib/compose/docker-compose.yml -o $HOME/docker-compose.yml
 $ mkdir $HOME/clair_config
 $ curl -L https://raw.githubusercontent.com/coreos/clair/master/config.yaml.sample -o $HOME/clair_config/config.yaml
 $ $EDITOR $HOME/clair_config/config.yaml # Edit database source to be postgresql://postgres:password@postgres:5432?sslmode=disable
diff --git a/docker-compose.yml b/contrib/compose/docker-compose.yml
similarity index 100%
rename from docker-compose.yml
rename to contrib/compose/docker-compose.yml
diff --git a/grafana.json b/contrib/grafana/grafana.json
similarity index 100%
rename from grafana.json
rename to contrib/grafana/grafana.json