diff --git a/init.sls b/init.sls
deleted file mode 100644
index 465c8b033..000000000
--- a/init.sls
+++ /dev/null
@@ -1,241 +0,0 @@
-addon-dir-delete:
-  file.absent:
-    - name: /etc/kubernetes/addons
-
-addon-dir-create:
-  file.directory:
-    - name: /etc/kubernetes/addons
-    - user: root
-    - group: root
-    - mode: 0755
-    - require:
-        - file: addon-dir-delete
-
-/etc/kubernetes/addons/namespace.yaml:
-  file.managed:
-    - source: salt://kube-addons/namespace.yaml
-    - user: root
-    - group: root
-    - file_mode: 644
-
-{% if pillar.get('enable_cluster_monitoring', '').lower() == 'influxdb' %}
-/etc/kubernetes/addons/cluster-monitoring/influxdb:
-  file.recurse:
-    - source: salt://kube-addons/cluster-monitoring/influxdb
-    - include_pat: E@(^.+\.yaml$|^.+\.json$)
-    - template: jinja
-    - user: root
-    - group: root
-    - dir_mode: 755
-    - file_mode: 644
-{% endif %}
-
-{% if pillar.get('enable_l7_loadbalancing', '').lower() == 'glbc' %}
-/etc/kubernetes/addons/cluster-loadbalancing/glbc:
-  file.recurse:
-    - source: salt://kube-addons/cluster-loadbalancing/glbc
-    - include_pat: E@(^.+\.yaml$|^.+\.json$)
-    - user: root
-    - group: root
-    - dir_mode: 755
-    - file_mode: 644
-{% endif %}
-
-{% if pillar.get('enable_cluster_monitoring', '').lower() == 'google' %}
-/etc/kubernetes/addons/cluster-monitoring/google:
-  file.recurse:
-    - source: salt://kube-addons/cluster-monitoring/google
-    - include_pat: E@(^.+\.yaml$|^.+\.json$)
-    - template: jinja
-    - user: root
-    - group: root
-    - dir_mode: 755
-    - file_mode: 644
-{% endif %}
-
-{% if pillar.get('enable_cluster_monitoring', '').lower() == 'standalone' %}
-/etc/kubernetes/addons/cluster-monitoring/standalone:
-  file.recurse:
-    - source: salt://kube-addons/cluster-monitoring/standalone
-    - include_pat: E@(^.+\.yaml$|^.+\.json$)
-    - template: jinja
-    - user: root
-    - group: root
-    - dir_mode: 755
-    - file_mode: 644
-{% endif %}
-
-{% if pillar.get('enable_cluster_monitoring', '').lower() == 'standalone' %}
-/etc/kubernetes/addons/cluster-monitoring/standalone:
-  file.recurse:
-    - source: salt://kube-addons/cluster-monitoring/standalone
-    - include_pat: E@(^.+\.yaml$|^.+\.json$)
-    - user: root
-    - group: root
-    - dir_mode: 755
-    - file_mode: 644
-{% endif %}
-
-{% if pillar.get('enable_cluster_monitoring', '').lower() == 'googleinfluxdb' %}
-/etc/kubernetes/addons/cluster-monitoring/googleinfluxdb:
-  file.recurse:
-    - source: salt://kube-addons/cluster-monitoring
-    - include_pat: E@(^.+\.yaml$|^.+\.json$)
-    - exclude_pat: E@(^.+heapster-controller\.yaml$|^.+heapster-controller\.json$)
-    - template: jinja
-    - user: root
-    - group: root
-    - dir_mode: 755
-    - file_mode: 644
-{% endif %}
-
-{% if pillar.get('enable_cluster_monitoring', '').lower() == 'googleinfluxdb' %}
-/etc/kubernetes/addons/cluster-monitoring/googleinfluxdb:
-  file.recurse:
-    - source: salt://kube-addons/cluster-monitoring
-    - include_pat: E@(^.+\.yaml$|^.+\.json$)
-    - exclude_pat: E@(^.+heapster-controller\.yaml$|^.+heapster-controller\.json$)
-    - user: root
-    - group: root
-    - dir_mode: 755
-    - file_mode: 644
-{% endif %}
-
-{% if pillar.get('enable_cluster_dns', '').lower() == 'true' %}
-/etc/kubernetes/addons/dns/skydns-svc.yaml:
-  file.managed:
-    - source: salt://kube-addons/dns/skydns-svc.yaml.in
-    - template: jinja
-    - group: root
-    - dir_mode: 755
-    - makedirs: True
-
-/etc/kubernetes/addons/dns/skydns-rc.yaml:
-  file.managed:
-    - source: salt://kube-addons/dns/skydns-rc.yaml.in
-    - template: jinja
-    - group: root
-    - dir_mode: 755
-    - makedirs: True
-{% endif %}
-
-{% if pillar.get('enable_cluster_registry', '').lower() == 'true' %}
-/etc/kubernetes/addons/registry/registry-svc.yaml:
-  file.managed:
-    - source: salt://kube-addons/registry/registry-svc.yaml
-    - user: root
-    - group: root
-    - file_mode: 644
-    - makedirs: True
-
-/etc/kubernetes/addons/registry/registry-rc.yaml:
-  file.managed:
-    - source: salt://kube-addons/registry/registry-rc.yaml
-    - user: root
-    - group: root
-    - file_mode: 644
-    - makedirs: True
-
-/etc/kubernetes/addons/registry/registry-pv.yaml:
-  file.managed:
-    - source: salt://kube-addons/registry/registry-pv.yaml.in
-    - template: jinja
-    - user: root
-    - group: root
-    - file_mode: 644
-    - makedirs: True
-
-/etc/kubernetes/addons/registry/registry-pvc.yaml:
-  file.managed:
-    - source: salt://kube-addons/registry/registry-pvc.yaml.in
-    - template: jinja
-    - user: root
-    - group: root
-    - file_mode: 644
-    - makedirs: True
-{% endif %}
-
-{% if pillar.get('enable_node_logging', '').lower() == 'true'
-   and pillar.get('logging_destination', '').lower() == 'elasticsearch'
-   and pillar.get('enable_cluster_logging', '').lower() == 'true' %}
-/etc/kubernetes/addons/fluentd-elasticsearch:
-  file.recurse:
-    - source: salt://kube-addons/fluentd-elasticsearch
-    - include_pat: E@^.+\.yaml$
-    - user: root
-    - group: root
-    - dir_mode: 755
-    - file_mode: 644
-{% endif %}
-
-{% if pillar.get('enable_cluster_ui', '').lower() == 'true' %}
-/etc/kubernetes/addons/dashboard:
-  file.recurse:
-    - source: salt://kube-addons/dashboard
-    - include_pat: E@^.+\.yaml$
-    - user: root
-    - group: root
-    - dir_mode: 755
-    - file_mode: 644
-{% endif %}
-
-/etc/kubernetes/kube-addons.sh:
-  file.managed:
-    - source: salt://kube-addons/kube-addons.sh
-    - user: root
-    - group: root
-    - mode: 755
-
-/etc/kubernetes/kube-addon-update.sh:
-  file.managed:
-    - source: salt://kube-addons/kube-addon-update.sh
-    - user: root
-    - group: root
-    - mode: 755
-
-{% if pillar.get('is_systemd') %}
-
-{{ pillar.get('systemd_system_path') }}/kube-addons.service:
-  file.managed:
-    - source: salt://kube-addons/kube-addons.service
-    - user: root
-    - group: root
-  cmd.wait:
-    - name: /opt/kubernetes/helpers/services bounce kube-addons
-    - watch:
-      - file: {{ pillar.get('systemd_system_path') }}/kube-addons.service
-
-{% else %}
-
-/etc/init.d/kube-addons:
-  file.managed:
-    - source: salt://kube-addons/initd
-    - user: root
-    - group: root
-    - mode: 755
-
-{% endif %}
-
-# Stop kube-addons service each time salt is executed, just in case
-# there was a modification of addons.
-# Actually, this should be handled by watching file changes, but
-# somehow it doesn't work.
-service-kube-addon-stop:
-  service.dead:
-    - name: kube-addons
-
-kube-addons:
-  service.running:
-    - enable: True
-    - require:
-        - service: service-kube-addon-stop
-    - watch:
-{% if pillar.get('is_systemd') %}
-      - file: {{ pillar.get('systemd_system_path') }}/kube-addons.service
-{% else %}
-      - file: /etc/init.d/kube-addons
-{% endif %}
-{% if pillar.get('is_systemd') %}
-    - provider:
-      - service: systemd
-{%- endif %}
diff --git a/initd b/initd
deleted file mode 100644
index c9abf854b..000000000
--- a/initd
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/bash
-#
-### BEGIN INIT INFO
-# Provides:   kube-addons
-# Required-Start:    $local_fs $network $syslog kube-apiserver
-# Required-Stop:
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Kubernetes Addon Object Manager
-# Description:
-#   Enforces installation of Kubernetes Addon Objects
-### END INIT INFO
-
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Kubernetes Addon Object Manager"
-NAME=kube-addons
-DAEMON_LOG_FILE=/var/log/${NAME}.log
-PIDFILE=/var/run/${NAME}.pid
-SCRIPTNAME=/etc/init.d/${NAME}
-KUBE_ADDONS_SH=/etc/kubernetes/kube-addons.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-
-
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-    # use setsid to make sure the new daemon has its own group (I suppose
-    # start-stop-daemon does create a process group, but let's stay on the
-    # safe side).
-    setsid start-stop-daemon --start --verbose --background --no-close --make-pidfile --pidfile "${PIDFILE}" --startas "${KUBE_ADDONS_SH}" </dev/null >> ${DAEMON_LOG_FILE} 2>&1
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-    # start-stop-daemon is not used because we have to stop all children
-    # limitations:
-    #  - stop does not work if the pid file is missing
-    #  - stop does not work if the daemon process is missing (children will not
-    #    be killed)
-    # This is sufficient - remaining processes will end after a while.
-
-    local pid
-    pid=$(cat "${PIDFILE}" 2> /dev/null)
-    if [[ $? != 0 ]]; then
-        return 1
-    fi
-    local pgrp
-    # find the process group for the service and kill entire group
-    #  o - output format: pgpg - process group
-    pgrp=$(ps --no-headers --pid "${pid}" -o pgrp 2>/dev/null)
-    if [[ $? != 0 ]] || [[ "${pgrp}" == "" ]]; then
-        return 1
-    fi
-    pgrp=$(echo -e ${pgrp})   # strip whitespaces (that's why there are no quotes around pgrp)
-    # negative pid is for killing entire group
-    kill -- -${pgrp} 2> /dev/null
-    if [[ $? != 0 ]]; then
-        return 2
-    fi
-    rm -f "${PIDFILE}"
-    return
-}
-
-case "$1" in
-  start)
-        log_daemon_msg "Starting ${DESC}" "${NAME}"
-        do_start
-        case "$?" in
-                0|1) log_end_msg 0 || exit 0 ;;
-                2) log_end_msg 1 || exit 1 ;;
-        esac
-        ;;
-  stop)
-        log_daemon_msg "Stopping ${DESC}" "${NAME}"
-        do_stop
-        case "$?" in
-                0|1) log_end_msg 0 || exit 0 ;;
-                2) log_end_msg 1 || exit 1 ;;
-        esac
-        ;;
-  status)
-        status_of_proc -p "${PIDFILE}" "${KUBE_ADDONS_SH}" "${NAME}"
-        ;;
-
-  restart|force-reload)
-        log_daemon_msg "Restarting ${DESC}" "${NAME}"
-        do_stop
-        case "$?" in
-          0|1)
-                do_start
-                case "$?" in
-                        0) log_end_msg 0 ;;
-                        1) log_end_msg 1 ;; # Old process is still running
-                        *) log_end_msg 1 ;; # Failed to start
-                esac
-                ;;
-          *)
-                # Failed to stop
-                log_end_msg 1
-                ;;
-        esac
-        ;;
-  *)
-        echo "Usage: ${SCRIPTNAME} {start|stop|status|restart|force-reload}" >&2
-        exit 3
-        ;;
-esac
diff --git a/kube-addons.service b/kube-addons.service
deleted file mode 100644
index 293ca10ba..000000000
--- a/kube-addons.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Kubernetes Addon Object Manager
-Documentation=https://github.com/kubernetes/kubernetes
-
-[Service]
-ExecStart=/etc/kubernetes/kube-addons.sh
-
-[Install]
-WantedBy=multi-user.target
diff --git a/kube-addon-update.sh b/kube_addon_manager/kube-addon-update.sh
similarity index 100%
rename from kube-addon-update.sh
rename to kube_addon_manager/kube-addon-update.sh
diff --git a/kube-addons.sh b/kube_addon_manager/kube-addons.sh
similarity index 100%
rename from kube-addons.sh
rename to kube_addon_manager/kube-addons.sh
diff --git a/namespace.yaml b/kube_addon_manager/namespace.yaml
similarity index 100%
rename from namespace.yaml
rename to kube_addon_manager/namespace.yaml