diff --git a/contrib/logging/fluentd-gcp-image/Dockerfile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile
similarity index 100%
rename from contrib/logging/fluentd-gcp-image/Dockerfile
rename to cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile
diff --git a/contrib/logging/fluentd-gcp-image/Makefile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
similarity index 100%
rename from contrib/logging/fluentd-gcp-image/Makefile
rename to cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
diff --git a/contrib/logging/fluentd-gcp-image/README.md b/cluster/addons/fluentd-gcp/fluentd-gcp-image/README.md
similarity index 100%
rename from contrib/logging/fluentd-gcp-image/README.md
rename to cluster/addons/fluentd-gcp/fluentd-gcp-image/README.md
diff --git a/contrib/logging/fluentd-gcp-image/google-fluentd.conf b/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
similarity index 100%
rename from contrib/logging/fluentd-gcp-image/google-fluentd.conf
rename to cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
diff --git a/contrib/logging/fluentd-gcp/Makefile b/contrib/logging/fluentd-gcp/Makefile
deleted file mode 100644
index 843817cacd..0000000000
--- a/contrib/logging/fluentd-gcp/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Makefile for a synthetic logger to be logged
-# by GCP. The cluster must have been created with
-# the variable LOGGING_DESTINATION=GCP.
-
-.PHONY: up down logger-up logger-down get
-
-KUBECTL=kubectl.sh
-
-up:	logger-up
-
-down:	logger-down
-
-
-logger-up:
-	-${KUBECTL} create -f synthetic_0_25lps.yml
-
-logger-down:
-	-${KUBECTL} delete pods synthetic-logger-0.25lps-pod
-
-get:	
-	${KUBECTL} get pods
-
diff --git a/contrib/logging/fluentd-gcp/synthetic_0_25lps.yml b/contrib/logging/fluentd-gcp/synthetic_0_25lps.yml
deleted file mode 100644
index bbd935141b..0000000000
--- a/contrib/logging/fluentd-gcp/synthetic_0_25lps.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-# This pod specification creates an instance of a synthetic logger. The logger
-# is simply a program that writes out the hostname of the pod, a count which increments
-# by one on each iteration (to help notice missing log enteries) and the date using
-# a long format (RFC-3339) to nano-second precision. This program logs at a frequency
-# of 0.25 lines per second. The shellscript program is given directly to bash as -c argument
-# and could have been written out as:
-#   i="0"
-#   while true
-#   do
-#     echo -n "`hostname`: $i: "
-#     date --rfc-3339 ns
-#     sleep 4
-#     i=$[$i+1]
-#   done
-
-apiVersion: v1beta1
-kind: Pod
-id: synthetic-logger-0.25lps-pod
-desiredState:
-  manifest:
-    version: v1beta1
-    id: synth-logger-0.25lps
-    containers:
-      - name: synth-lgr
-        image: ubuntu:14.04
-        command: ["bash", "-c", "i=\"0\"; while true; do echo -n \"`hostname`: $i: \"; date --rfc-3339 ns; sleep 4; i=$[$i+1]; done"]
-labels:
-  name: synth-logging-source
- 
\ No newline at end of file
diff --git a/cluster/addons/fluentd-elasticsearch/logging-demo/Makefile b/examples/logging-demo/Makefile
similarity index 100%
rename from cluster/addons/fluentd-elasticsearch/logging-demo/Makefile
rename to examples/logging-demo/Makefile
diff --git a/cluster/addons/fluentd-elasticsearch/logging-demo/README.md b/examples/logging-demo/README.md
similarity index 100%
rename from cluster/addons/fluentd-elasticsearch/logging-demo/README.md
rename to examples/logging-demo/README.md
diff --git a/cluster/addons/fluentd-elasticsearch/logging-demo/synth-logger.png b/examples/logging-demo/synth-logger.png
similarity index 100%
rename from cluster/addons/fluentd-elasticsearch/logging-demo/synth-logger.png
rename to examples/logging-demo/synth-logger.png
diff --git a/cluster/addons/fluentd-elasticsearch/logging-demo/synthetic_0_25lps.yaml b/examples/logging-demo/synthetic_0_25lps.yaml
similarity index 100%
rename from cluster/addons/fluentd-elasticsearch/logging-demo/synthetic_0_25lps.yaml
rename to examples/logging-demo/synthetic_0_25lps.yaml
diff --git a/cluster/addons/fluentd-elasticsearch/logging-demo/synthetic_10lps.yaml b/examples/logging-demo/synthetic_10lps.yaml
similarity index 100%
rename from cluster/addons/fluentd-elasticsearch/logging-demo/synthetic_10lps.yaml
rename to examples/logging-demo/synthetic_10lps.yaml