diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 9421a45ac8ddc1739d26a0bd0bef01bff7c047ce..0000000000000000000000000000000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-builds/
-deps/
diff --git a/Makefile b/juju-charms/Makefile
similarity index 100%
rename from Makefile
rename to juju-charms/Makefile
diff --git a/README.md b/juju-charms/README.md
similarity index 100%
rename from README.md
rename to juju-charms/README.md
diff --git a/juju-env.sh b/juju-charms/juju-env.sh
similarity index 100%
rename from juju-env.sh
rename to juju-charms/juju-env.sh
diff --git a/layers/netutils/LICENSE b/juju-charms/layers/netutils/LICENSE
similarity index 100%
rename from layers/netutils/LICENSE
rename to juju-charms/layers/netutils/LICENSE
diff --git a/layers/netutils/README.md b/juju-charms/layers/netutils/README.md
similarity index 100%
rename from layers/netutils/README.md
rename to juju-charms/layers/netutils/README.md
diff --git a/layers/netutils/actions.yaml b/juju-charms/layers/netutils/actions.yaml
similarity index 100%
rename from layers/netutils/actions.yaml
rename to juju-charms/layers/netutils/actions.yaml
diff --git a/layers/netutils/actions/dig b/juju-charms/layers/netutils/actions/dig
similarity index 100%
rename from layers/netutils/actions/dig
rename to juju-charms/layers/netutils/actions/dig
diff --git a/layers/netutils/actions/iperf b/juju-charms/layers/netutils/actions/iperf
similarity index 100%
rename from layers/netutils/actions/iperf
rename to juju-charms/layers/netutils/actions/iperf
diff --git a/layers/netutils/actions/nmap b/juju-charms/layers/netutils/actions/nmap
similarity index 100%
rename from layers/netutils/actions/nmap
rename to juju-charms/layers/netutils/actions/nmap
diff --git a/layers/netutils/actions/ping b/juju-charms/layers/netutils/actions/ping
similarity index 100%
rename from layers/netutils/actions/ping
rename to juju-charms/layers/netutils/actions/ping
diff --git a/layers/netutils/actions/traceroute b/juju-charms/layers/netutils/actions/traceroute
similarity index 100%
rename from layers/netutils/actions/traceroute
rename to juju-charms/layers/netutils/actions/traceroute
diff --git a/layers/netutils/config.yaml b/juju-charms/layers/netutils/config.yaml
similarity index 100%
rename from layers/netutils/config.yaml
rename to juju-charms/layers/netutils/config.yaml
diff --git a/layers/netutils/icon.svg b/juju-charms/layers/netutils/icon.svg
similarity index 100%
rename from layers/netutils/icon.svg
rename to juju-charms/layers/netutils/icon.svg
diff --git a/layers/netutils/layer.yaml b/juju-charms/layers/netutils/layer.yaml
similarity index 100%
rename from layers/netutils/layer.yaml
rename to juju-charms/layers/netutils/layer.yaml
diff --git a/layers/netutils/metadata.yaml b/juju-charms/layers/netutils/metadata.yaml
similarity index 100%
rename from layers/netutils/metadata.yaml
rename to juju-charms/layers/netutils/metadata.yaml
diff --git a/layers/netutils/reactive/layer_netutils.py b/juju-charms/layers/netutils/reactive/layer_netutils.py
similarity index 100%
rename from layers/netutils/reactive/layer_netutils.py
rename to juju-charms/layers/netutils/reactive/layer_netutils.py
diff --git a/layers/netutils/tests/00-setup b/juju-charms/layers/netutils/tests/00-setup
similarity index 100%
rename from layers/netutils/tests/00-setup
rename to juju-charms/layers/netutils/tests/00-setup
diff --git a/layers/netutils/tests/10-deploy b/juju-charms/layers/netutils/tests/10-deploy
similarity index 100%
rename from layers/netutils/tests/10-deploy
rename to juju-charms/layers/netutils/tests/10-deploy
diff --git a/layers/pingpong/README.md b/juju-charms/layers/pingpong/README.md
similarity index 100%
rename from layers/pingpong/README.md
rename to juju-charms/layers/pingpong/README.md
diff --git a/layers/pingpong/actions.yaml b/juju-charms/layers/pingpong/actions.yaml
similarity index 100%
rename from layers/pingpong/actions.yaml
rename to juju-charms/layers/pingpong/actions.yaml
diff --git a/layers/pingpong/actions/get-rate b/juju-charms/layers/pingpong/actions/get-rate
similarity index 100%
rename from layers/pingpong/actions/get-rate
rename to juju-charms/layers/pingpong/actions/get-rate
diff --git a/layers/pingpong/actions/get-server b/juju-charms/layers/pingpong/actions/get-server
similarity index 100%
rename from layers/pingpong/actions/get-server
rename to juju-charms/layers/pingpong/actions/get-server
diff --git a/layers/pingpong/actions/get-state b/juju-charms/layers/pingpong/actions/get-state
similarity index 100%
rename from layers/pingpong/actions/get-state
rename to juju-charms/layers/pingpong/actions/get-state
diff --git a/layers/pingpong/actions/get-stats b/juju-charms/layers/pingpong/actions/get-stats
similarity index 100%
rename from layers/pingpong/actions/get-stats
rename to juju-charms/layers/pingpong/actions/get-stats
diff --git a/layers/pingpong/actions/set-rate b/juju-charms/layers/pingpong/actions/set-rate
similarity index 100%
rename from layers/pingpong/actions/set-rate
rename to juju-charms/layers/pingpong/actions/set-rate
diff --git a/layers/pingpong/actions/set-server b/juju-charms/layers/pingpong/actions/set-server
similarity index 100%
rename from layers/pingpong/actions/set-server
rename to juju-charms/layers/pingpong/actions/set-server
diff --git a/layers/pingpong/actions/start-traffic b/juju-charms/layers/pingpong/actions/start-traffic
similarity index 100%
rename from layers/pingpong/actions/start-traffic
rename to juju-charms/layers/pingpong/actions/start-traffic
diff --git a/layers/pingpong/actions/stop-traffic b/juju-charms/layers/pingpong/actions/stop-traffic
similarity index 100%
rename from layers/pingpong/actions/stop-traffic
rename to juju-charms/layers/pingpong/actions/stop-traffic
diff --git a/layers/pingpong/config.yaml b/juju-charms/layers/pingpong/config.yaml
similarity index 100%
rename from layers/pingpong/config.yaml
rename to juju-charms/layers/pingpong/config.yaml
diff --git a/layers/pingpong/icon.svg b/juju-charms/layers/pingpong/icon.svg
similarity index 100%
rename from layers/pingpong/icon.svg
rename to juju-charms/layers/pingpong/icon.svg
diff --git a/layers/pingpong/layer.yaml b/juju-charms/layers/pingpong/layer.yaml
similarity index 100%
rename from layers/pingpong/layer.yaml
rename to juju-charms/layers/pingpong/layer.yaml
diff --git a/layers/pingpong/metadata.yaml b/juju-charms/layers/pingpong/metadata.yaml
similarity index 100%
rename from layers/pingpong/metadata.yaml
rename to juju-charms/layers/pingpong/metadata.yaml
diff --git a/layers/pingpong/reactive/pingpong.py b/juju-charms/layers/pingpong/reactive/pingpong.py
similarity index 100%
rename from layers/pingpong/reactive/pingpong.py
rename to juju-charms/layers/pingpong/reactive/pingpong.py
diff --git a/layers/pingpong/tests/00-setup b/juju-charms/layers/pingpong/tests/00-setup
similarity index 100%
rename from layers/pingpong/tests/00-setup
rename to juju-charms/layers/pingpong/tests/00-setup
diff --git a/layers/pingpong/tests/10-deploy b/juju-charms/layers/pingpong/tests/10-deploy
similarity index 100%
rename from layers/pingpong/tests/10-deploy
rename to juju-charms/layers/pingpong/tests/10-deploy
diff --git a/layers/vyos-proxy/Makefile b/juju-charms/layers/vyos-proxy/Makefile
similarity index 100%
rename from layers/vyos-proxy/Makefile
rename to juju-charms/layers/vyos-proxy/Makefile
diff --git a/layers/vyos-proxy/README.md b/juju-charms/layers/vyos-proxy/README.md
similarity index 100%
rename from layers/vyos-proxy/README.md
rename to juju-charms/layers/vyos-proxy/README.md
diff --git a/layers/vyos-proxy/actions.yaml b/juju-charms/layers/vyos-proxy/actions.yaml
similarity index 100%
rename from layers/vyos-proxy/actions.yaml
rename to juju-charms/layers/vyos-proxy/actions.yaml
diff --git a/layers/vyos-proxy/actions/ping b/juju-charms/layers/vyos-proxy/actions/ping
similarity index 100%
rename from layers/vyos-proxy/actions/ping
rename to juju-charms/layers/vyos-proxy/actions/ping
diff --git a/layers/vyos-proxy/config.yaml b/juju-charms/layers/vyos-proxy/config.yaml
similarity index 100%
rename from layers/vyos-proxy/config.yaml
rename to juju-charms/layers/vyos-proxy/config.yaml
diff --git a/layers/vyos-proxy/copyright b/juju-charms/layers/vyos-proxy/copyright
similarity index 100%
rename from layers/vyos-proxy/copyright
rename to juju-charms/layers/vyos-proxy/copyright
diff --git a/layers/vyos-proxy/icon.svg b/juju-charms/layers/vyos-proxy/icon.svg
similarity index 100%
rename from layers/vyos-proxy/icon.svg
rename to juju-charms/layers/vyos-proxy/icon.svg
diff --git a/layers/vyos-proxy/layer.yaml b/juju-charms/layers/vyos-proxy/layer.yaml
similarity index 100%
rename from layers/vyos-proxy/layer.yaml
rename to juju-charms/layers/vyos-proxy/layer.yaml
diff --git a/layers/vyos-proxy/metadata.yaml b/juju-charms/layers/vyos-proxy/metadata.yaml
similarity index 100%
rename from layers/vyos-proxy/metadata.yaml
rename to juju-charms/layers/vyos-proxy/metadata.yaml
diff --git a/layers/vyos-proxy/reactive/__init__.py b/juju-charms/layers/vyos-proxy/reactive/__init__.py
similarity index 100%
rename from layers/vyos-proxy/reactive/__init__.py
rename to juju-charms/layers/vyos-proxy/reactive/__init__.py
diff --git a/layers/vyos-proxy/reactive/vyos_proxy.py b/juju-charms/layers/vyos-proxy/reactive/vyos_proxy.py
similarity index 100%
rename from layers/vyos-proxy/reactive/vyos_proxy.py
rename to juju-charms/layers/vyos-proxy/reactive/vyos_proxy.py
diff --git a/layers/vyos-proxy/requirements.txt b/juju-charms/layers/vyos-proxy/requirements.txt
similarity index 100%
rename from layers/vyos-proxy/requirements.txt
rename to juju-charms/layers/vyos-proxy/requirements.txt
diff --git a/layers/vyos-proxy/revision b/juju-charms/layers/vyos-proxy/revision
similarity index 100%
rename from layers/vyos-proxy/revision
rename to juju-charms/layers/vyos-proxy/revision
diff --git a/layers/vyos-proxy/tox.ini b/juju-charms/layers/vyos-proxy/tox.ini
similarity index 100%
rename from layers/vyos-proxy/tox.ini
rename to juju-charms/layers/vyos-proxy/tox.ini
diff --git a/layers/vyos-proxy/wheelhouse.txt b/juju-charms/layers/vyos-proxy/wheelhouse.txt
similarity index 100%
rename from layers/vyos-proxy/wheelhouse.txt
rename to juju-charms/layers/vyos-proxy/wheelhouse.txt