diff --git a/arch/alpha/config.in b/config/arch/alpha/config.in
similarity index 100%
rename from arch/alpha/config.in
rename to config/arch/alpha/config.in
diff --git a/arch/alpha/functions b/config/arch/alpha/functions
similarity index 100%
rename from arch/alpha/functions
rename to config/arch/alpha/functions
diff --git a/arch/arm/config.in b/config/arch/arm/config.in
similarity index 100%
rename from arch/arm/config.in
rename to config/arch/arm/config.in
diff --git a/arch/arm/functions b/config/arch/arm/functions
similarity index 100%
rename from arch/arm/functions
rename to config/arch/arm/functions
diff --git a/arch/ia64/config.in b/config/arch/ia64/config.in
similarity index 100%
rename from arch/ia64/config.in
rename to config/arch/ia64/config.in
diff --git a/arch/ia64/functions b/config/arch/ia64/functions
similarity index 100%
rename from arch/ia64/functions
rename to config/arch/ia64/functions
diff --git a/arch/mips/config.in b/config/arch/mips/config.in
similarity index 100%
rename from arch/mips/config.in
rename to config/arch/mips/config.in
diff --git a/arch/mips/functions b/config/arch/mips/functions
similarity index 100%
rename from arch/mips/functions
rename to config/arch/mips/functions
diff --git a/arch/powerpc/config.in b/config/arch/powerpc/config.in
similarity index 100%
rename from arch/powerpc/config.in
rename to config/arch/powerpc/config.in
diff --git a/arch/powerpc/functions b/config/arch/powerpc/functions
similarity index 100%
rename from arch/powerpc/functions
rename to config/arch/powerpc/functions
diff --git a/arch/sh/config.in b/config/arch/sh/config.in
similarity index 100%
rename from arch/sh/config.in
rename to config/arch/sh/config.in
diff --git a/arch/sh/functions b/config/arch/sh/functions
similarity index 100%
rename from arch/sh/functions
rename to config/arch/sh/functions
diff --git a/arch/x86/config.in b/config/arch/x86/config.in
similarity index 100%
rename from arch/x86/config.in
rename to config/arch/x86/config.in
diff --git a/arch/x86/functions b/config/arch/x86/functions
similarity index 100%
rename from arch/x86/functions
rename to config/arch/x86/functions
diff --git a/arch/x86_64/config.in b/config/arch/x86_64/config.in
similarity index 100%
rename from arch/x86_64/config.in
rename to config/arch/x86_64/config.in
diff --git a/arch/x86_64/functions b/config/arch/x86_64/functions
similarity index 100%
rename from arch/x86_64/functions
rename to config/arch/x86_64/functions