diff --git a/env/none.mk b/arch/none/config.mk
similarity index 100%
rename from env/none.mk
rename to arch/none/config.mk
diff --git a/env/x86.mk b/arch/x86/config.mk
similarity index 100%
rename from env/x86.mk
rename to arch/x86/config.mk
diff --git a/configure b/configure
index 222595b..b483db2 100755
--- a/configure
+++ b/configure
@@ -6,7 +6,7 @@ if [ -z "$ENV" ]; then
     ENV='none'
 fi
 
-CONFIG="env/$ENV.mk"
+CONFIG="arch/$ENV/config.mk"
 
 if [ ! -f "$CONFIG" ]; then
     echo >&2 "ERROR: file "$CONFIG" does not exist"