Use ARCH_SOURCES_DIR consistently