diff --git a/firmware/SOURCES b/firmware/SOURCES
index 1ede7e2d66..97a33ad7e7 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -255,16 +255,16 @@ drivers/tsc2100.c
 #if defined(CPU_SH)
 
 #ifndef SIMULATOR
-bitswap.S
-descramble.S
 drivers/i2c.c
 target/sh/adc-sh.c
+target/sh/bitswap.S
 target/sh/crt0.S
 target/sh/memcpy-sh.S
 target/sh/memmove-sh.S
 target/sh/memset-sh.S
 target/sh/strlen-sh.S
 target/sh/system-sh.c
+target/sh/archos/descramble.S
 #endif /* SIMULATOR */
 
 #elif defined(CPU_COLDFIRE)
diff --git a/firmware/descramble.S b/firmware/target/sh/archos/descramble.S
similarity index 100%
rename from firmware/descramble.S
rename to firmware/target/sh/archos/descramble.S
diff --git a/firmware/bitswap.S b/firmware/target/sh/bitswap.S
similarity index 100%
rename from firmware/bitswap.S
rename to firmware/target/sh/bitswap.S