diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb37fc6..db4c821 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,14 +3,14 @@
 cmake_minimum_required(VERSION 3.14.0)
 
 include(options.cmake)
-include(arch/${ARCH}/toolchain.cmake)
+include(arch/${ARCH}/config/toolchain.cmake)
 
 project(ardix VERSION 0.1.0 LANGUAGES C ASM)
 set(CMAKE_C_STANDARD 17)
 set(CMAKE_C_EXTENSIONS OFF)
 
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
-    set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+	set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 endif()
 
 find_package(Git QUIET)
diff --git a/arch/at91sam3x8e/CMakeLists.txt b/arch/at91sam3x8e/CMakeLists.txt
index 1461c15..d42afb5 100644
--- a/arch/at91sam3x8e/CMakeLists.txt
+++ b/arch/at91sam3x8e/CMakeLists.txt
@@ -13,7 +13,7 @@ target_include_directories(ardix_arch PRIVATE
 target_compile_definitions(ardix_arch PRIVATE ARDIX_ARCH)
 
 configure_file(
-	${CMAKE_CURRENT_SOURCE_DIR}/config.ld.in
+	${CMAKE_CURRENT_SOURCE_DIR}/config/config.ld.in
 	${CMAKE_BINARY_DIR}/config.ld # see toolchain.cmake
 )
 
diff --git a/arch/at91sam3x8e/SAM3X8E.svd b/arch/at91sam3x8e/config/SAM3X8E.svd
similarity index 100%
rename from arch/at91sam3x8e/SAM3X8E.svd
rename to arch/at91sam3x8e/config/SAM3X8E.svd
diff --git a/arch/at91sam3x8e/config.ld.in b/arch/at91sam3x8e/config/config.ld.in
similarity index 100%
rename from arch/at91sam3x8e/config.ld.in
rename to arch/at91sam3x8e/config/config.ld.in
diff --git a/arch/at91sam3x8e/flash.ld b/arch/at91sam3x8e/config/flash.ld
similarity index 100%
rename from arch/at91sam3x8e/flash.ld
rename to arch/at91sam3x8e/config/flash.ld
diff --git a/arch/at91sam3x8e/openocd.cfg b/arch/at91sam3x8e/config/openocd.cfg
similarity index 100%
rename from arch/at91sam3x8e/openocd.cfg
rename to arch/at91sam3x8e/config/openocd.cfg
diff --git a/arch/at91sam3x8e/toolchain.cmake b/arch/at91sam3x8e/config/toolchain.cmake
similarity index 100%
rename from arch/at91sam3x8e/toolchain.cmake
rename to arch/at91sam3x8e/config/toolchain.cmake