diff --git a/Makefile b/Makefile
index b2eea47..79f75aa 100644
--- a/Makefile
+++ b/Makefile
@@ -37,24 +37,24 @@ openrc:
 aws:
 	install -Dm755 -t "$(PREFIX)"/lib/mdev \
 		lib/mdev/nvme-ebs-links
-	install -Dm644 -t "$(PREFIX)"/lib/tiny-cloud/aws \
-		lib/tiny-cloud/aws/*
+	install -Dm644 -t "$(PREFIX)"/lib/tiny-cloud/cloud/aws \
+		lib/tiny-cloud/cloud/aws/*
 
 azure:
-	install -Dm644 -t $(PREFIX)/lib/tiny-cloud/azure \
-		lib/tiny-cloud/azure/*
+	install -Dm644 -t $(PREFIX)/lib/tiny-cloud/cloud/azure \
+		lib/tiny-cloud/cloud/azure/*
 
 gcp:
-	install -Dm644 -t $(PREFIX)/lib/tiny-cloud/gcp \
-		lib/tiny-cloud/gcp/*
+	install -Dm644 -t $(PREFIX)/lib/tiny-cloud/cloud/gcp \
+		lib/tiny-cloud/cloud/gcp/*
 
 oci:
-	install -Dm644 -t $(PREFIX)/lib/tiny-cloud/oci \
-		lib/tiny-cloud/oci/*
+	install -Dm644 -t $(PREFIX)/lib/tiny-cloud/cloud/oci \
+		lib/tiny-cloud/cloud/oci/*
 
 nocloud:
-	install -Dm644 -t $(PREFIX)/lib/tiny-cloud/nocloud \
-		lib/tiny-cloud/nocloud/*
+	install -Dm644 -t $(PREFIX)/lib/tiny-cloud/cloud/nocloud \
+		lib/tiny-cloud/cloud/nocloud/*
 
 check: tests/Kyuafile Kyuafile
 	kyua test || (kyua report --verbose && exit 1)
diff --git a/TODO.md b/TODO.md
index c8b9ae3..182a01a 100644
--- a/TODO.md
+++ b/TODO.md
@@ -11,6 +11,8 @@
 
 ## FUTURE
 
+* cloud auto-detection
+
 * `imds-net-sync` improvements
   * Feature parity with current [amazon-ec2-net-utils](
     https://github.com/amazonlinux/amazon-ec2-net-utils)
diff --git a/bin/imds b/bin/imds
index 08cdcd1..709cf81 100755
--- a/bin/imds
+++ b/bin/imds
@@ -84,10 +84,10 @@ _imds_nic_index() { cat "/sys/class/net/$1/address"; }
 
 ### load cloud-specific variables and functions
 
-if [ ! -d "$LIBDIR"/tiny-cloud/"$CLOUD" ]; then
+if [ ! -d "$LIBDIR"/tiny-cloud/cloud/"$CLOUD" ]; then
     echo "ERROR: Unknown Cloud '$CLOUD'" >&2
 fi
-. "$LIBDIR"/tiny-cloud/"$CLOUD"/imds
+. "$LIBDIR"/tiny-cloud/cloud/"$CLOUD"/imds
 
 ### non-overrideable functions
 
diff --git a/lib/tiny-cloud/aws/imds b/lib/tiny-cloud/cloud/aws/imds
similarity index 100%
rename from lib/tiny-cloud/aws/imds
rename to lib/tiny-cloud/cloud/aws/imds
diff --git a/lib/tiny-cloud/aws/mdev b/lib/tiny-cloud/cloud/aws/mdev
similarity index 100%
rename from lib/tiny-cloud/aws/mdev
rename to lib/tiny-cloud/cloud/aws/mdev
diff --git a/lib/tiny-cloud/azure/imds b/lib/tiny-cloud/cloud/azure/imds
similarity index 100%
rename from lib/tiny-cloud/azure/imds
rename to lib/tiny-cloud/cloud/azure/imds
diff --git a/lib/tiny-cloud/gcp/imds b/lib/tiny-cloud/cloud/gcp/imds
similarity index 100%
rename from lib/tiny-cloud/gcp/imds
rename to lib/tiny-cloud/cloud/gcp/imds
diff --git a/lib/tiny-cloud/nocloud/imds b/lib/tiny-cloud/cloud/nocloud/imds
similarity index 100%
rename from lib/tiny-cloud/nocloud/imds
rename to lib/tiny-cloud/cloud/nocloud/imds
diff --git a/lib/tiny-cloud/oci/imds b/lib/tiny-cloud/cloud/oci/imds
similarity index 100%
rename from lib/tiny-cloud/oci/imds
rename to lib/tiny-cloud/cloud/oci/imds
diff --git a/lib/tiny-cloud/init b/lib/tiny-cloud/init
index 2af02e0..ce24789 100644
--- a/lib/tiny-cloud/init
+++ b/lib/tiny-cloud/init
@@ -155,8 +155,8 @@ run_userdata() {
 
 # load cloud-specific init functions / vars
 : "${LIBDIR:=$PREFIX/lib}"
-if [ -f "$LIBDIR"/tiny-cloud/"$CLOUD"/init ]; then
-	. "$LIBDIR"/tiny-cloud/"$CLOUD"/init
+if [ -f "$LIBDIR"/tiny-cloud/cloud/"$CLOUD"/init ]; then
+	. "$LIBDIR"/tiny-cloud/cloud/"$CLOUD"/init
 fi
 
 
diff --git a/lib/tiny-cloud/mdev b/lib/tiny-cloud/mdev
index 6242278..c11429c 100644
--- a/lib/tiny-cloud/mdev
+++ b/lib/tiny-cloud/mdev
@@ -34,6 +34,6 @@ mod__vnic_eth_hotplug() {
 
 # load cloud-specific functions
 : "${LIBDIR:=$PREFIX/lib}"
-if [ -f "$LIBDIR"/tiny-cloud/"$CLOUD"/mdev ]; then
-	. "$LIBDIR"/tiny-cloud/"$CLOUD"/mdev
+if [ -f "$LIBDIR"/tiny-cloud/cloud/"$CLOUD"/mdev ]; then
+	. "$LIBDIR"/tiny-cloud/cloud/"$CLOUD"/mdev
 fi