diff --git a/anda/authy/anda.hcl b/anda/apps/authy/anda.hcl
similarity index 100%
rename from anda/authy/anda.hcl
rename to anda/apps/authy/anda.hcl
diff --git a/anda/authy/authy.spec b/anda/apps/authy/authy.spec
similarity index 100%
rename from anda/authy/authy.spec
rename to anda/apps/authy/authy.spec
diff --git a/anda/authy/chkupdate.py b/anda/apps/authy/chkupdate.py
similarity index 100%
rename from anda/authy/chkupdate.py
rename to anda/apps/authy/chkupdate.py
diff --git a/anda/openasar-canary/anda.hcl b/anda/apps/openasar-canary/anda.hcl
similarity index 100%
rename from anda/openasar-canary/anda.hcl
rename to anda/apps/openasar-canary/anda.hcl
diff --git a/anda/openasar-canary/openasar-canary.spec b/anda/apps/openasar-canary/openasar-canary.spec
similarity index 100%
rename from anda/openasar-canary/openasar-canary.spec
rename to anda/apps/openasar-canary/openasar-canary.spec
diff --git a/anda/libbismuth/anda.hcl b/anda/lib/libbismuth/anda.hcl
similarity index 100%
rename from anda/libbismuth/anda.hcl
rename to anda/lib/libbismuth/anda.hcl
diff --git a/anda/libbismuth/libbismuth.spec b/anda/lib/libbismuth/libbismuth.spec
similarity index 100%
rename from anda/libbismuth/libbismuth.spec
rename to anda/lib/libbismuth/libbismuth.spec
diff --git a/anda/libhelium/anda.hcl b/anda/lib/libhelium/anda.hcl
similarity index 100%
rename from anda/libhelium/anda.hcl
rename to anda/lib/libhelium/anda.hcl
diff --git a/anda/libhelium/libhelium.spec b/anda/lib/libhelium/libhelium.spec
similarity index 100%
rename from anda/libhelium/libhelium.spec
rename to anda/lib/libhelium/libhelium.spec
diff --git a/anda/lorax/anda.hcl b/anda/tools/lorax/anda.hcl
similarity index 100%
rename from anda/lorax/anda.hcl
rename to anda/tools/lorax/anda.hcl
diff --git a/anda/lorax/lorax.spec b/anda/tools/lorax/lorax.spec
similarity index 100%
rename from anda/lorax/lorax.spec
rename to anda/tools/lorax/lorax.spec
diff --git a/anda/melody/anda.hcl b/anda/tools/melody/anda.hcl
similarity index 100%
rename from anda/melody/anda.hcl
rename to anda/tools/melody/anda.hcl
diff --git a/anda/melody/melody.spec b/anda/tools/melody/melody.spec
similarity index 100%
rename from anda/melody/melody.spec
rename to anda/tools/melody/melody.spec