diff --git a/Makefile.common b/Makefile.common
index e9820a47..7bda7f6e 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -33,9 +33,9 @@ COMMON_LA = $(top_builddir)/CommonLibs/libcommon.la
 GSM_LA = $(top_builddir)/GSM/libGSM.la
 
 if ARCH_ARM
-ARCH_LA = $(top_builddir)/Transceiver52M/arm/libarch.la
+ARCH_LA = $(top_builddir)/Transceiver52M/arch/arm/libarch.la
 else
-ARCH_LA = $(top_builddir)/Transceiver52M/x86/libarch.la
+ARCH_LA = $(top_builddir)/Transceiver52M/arch/x86/libarch.la
 endif
 
 MOSTLYCLEANFILES = *~
diff --git a/Transceiver52M/Channelizer.cpp b/Transceiver52M/Channelizer.cpp
index 80eab3ee..2d817b0a 100644
--- a/Transceiver52M/Channelizer.cpp
+++ b/Transceiver52M/Channelizer.cpp
@@ -28,8 +28,8 @@
 #include "Channelizer.h"
 
 extern "C" {
-#include "common/fft.h"
-#include "common/convolve.h"
+#include "fft.h"
+#include "convolve.h"
 }
 
 static void deinterleave(const float *in, size_t ilen,
diff --git a/Transceiver52M/ChannelizerBase.cpp b/Transceiver52M/ChannelizerBase.cpp
index 9989940e..8223dba7 100644
--- a/Transceiver52M/ChannelizerBase.cpp
+++ b/Transceiver52M/ChannelizerBase.cpp
@@ -29,7 +29,7 @@
 #include "ChannelizerBase.h"
 
 extern "C" {
-#include "common/fft.h"
+#include "fft.h"
 }
 
 static float sinc(float x)
diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am
index 9424b8ee..06b2f268 100644
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -21,15 +21,10 @@
 
 include $(top_srcdir)/Makefile.common
 
-AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/common
-AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
+SUBDIRS = arch
 
-SUBDIRS = common
-if ARCH_ARM
-SUBDIRS += arm
-else
-SUBDIRS += x86
-endif
+AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/arch/common
+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
 
 if USRP1
 AM_CPPFLAGS += $(USRP_CFLAGS)
diff --git a/Transceiver52M/Synthesis.cpp b/Transceiver52M/Synthesis.cpp
index 22481d53..262c638d 100644
--- a/Transceiver52M/Synthesis.cpp
+++ b/Transceiver52M/Synthesis.cpp
@@ -29,8 +29,8 @@
 #include "Synthesis.h"
 
 extern "C" {
-#include "common/fft.h"
-#include "common/convolve.h"
+#include "fft.h"
+#include "convolve.h"
 }
 
 static void interleave(float **in, size_t ilen,
diff --git a/Transceiver52M/arch/Makefile.am b/Transceiver52M/arch/Makefile.am
new file mode 100644
index 00000000..14e6c824
--- /dev/null
+++ b/Transceiver52M/arch/Makefile.am
@@ -0,0 +1,8 @@
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS = common
+if ARCH_ARM
+SUBDIRS += arm
+else
+SUBDIRS += x86
+endif
diff --git a/Transceiver52M/arm/Makefile.am b/Transceiver52M/arch/arm/Makefile.am
similarity index 80%
rename from Transceiver52M/arm/Makefile.am
rename to Transceiver52M/arch/arm/Makefile.am
index 5e423d03..89ffb329 100644
--- a/Transceiver52M/arm/Makefile.am
+++ b/Transceiver52M/arch/arm/Makefile.am
@@ -9,7 +9,7 @@ AM_CCASFLAGS = $(ARCH_FLAGS)
 
 noinst_LTLIBRARIES = libarch.la
 
-libarch_la_LIBADD = $(top_builddir)/Transceiver52M/common/libarch_common.la
+libarch_la_LIBADD = $(top_builddir)/Transceiver52M/arch/common/libarch_common.la
 
 libarch_la_SOURCES = \
 	convert.c \
diff --git a/Transceiver52M/arm/convert.c b/Transceiver52M/arch/arm/convert.c
similarity index 100%
rename from Transceiver52M/arm/convert.c
rename to Transceiver52M/arch/arm/convert.c
diff --git a/Transceiver52M/arm/convert_neon.S b/Transceiver52M/arch/arm/convert_neon.S
similarity index 100%
rename from Transceiver52M/arm/convert_neon.S
rename to Transceiver52M/arch/arm/convert_neon.S
diff --git a/Transceiver52M/arm/convolve.c b/Transceiver52M/arch/arm/convolve.c
similarity index 100%
rename from Transceiver52M/arm/convolve.c
rename to Transceiver52M/arch/arm/convolve.c
diff --git a/Transceiver52M/arm/convolve_neon.S b/Transceiver52M/arch/arm/convolve_neon.S
similarity index 100%
rename from Transceiver52M/arm/convolve_neon.S
rename to Transceiver52M/arch/arm/convolve_neon.S
diff --git a/Transceiver52M/arm/mult.c b/Transceiver52M/arch/arm/mult.c
similarity index 100%
rename from Transceiver52M/arm/mult.c
rename to Transceiver52M/arch/arm/mult.c
diff --git a/Transceiver52M/arm/mult_neon.S b/Transceiver52M/arch/arm/mult_neon.S
similarity index 100%
rename from Transceiver52M/arm/mult_neon.S
rename to Transceiver52M/arch/arm/mult_neon.S
diff --git a/Transceiver52M/arm/scale.c b/Transceiver52M/arch/arm/scale.c
similarity index 100%
rename from Transceiver52M/arm/scale.c
rename to Transceiver52M/arch/arm/scale.c
diff --git a/Transceiver52M/arm/scale_neon.S b/Transceiver52M/arch/arm/scale_neon.S
similarity index 100%
rename from Transceiver52M/arm/scale_neon.S
rename to Transceiver52M/arch/arm/scale_neon.S
diff --git a/Transceiver52M/common/Makefile.am b/Transceiver52M/arch/common/Makefile.am
similarity index 100%
rename from Transceiver52M/common/Makefile.am
rename to Transceiver52M/arch/common/Makefile.am
diff --git a/Transceiver52M/common/convert.h b/Transceiver52M/arch/common/convert.h
similarity index 100%
rename from Transceiver52M/common/convert.h
rename to Transceiver52M/arch/common/convert.h
diff --git a/Transceiver52M/common/convert_base.c b/Transceiver52M/arch/common/convert_base.c
similarity index 100%
rename from Transceiver52M/common/convert_base.c
rename to Transceiver52M/arch/common/convert_base.c
diff --git a/Transceiver52M/common/convolve.h b/Transceiver52M/arch/common/convolve.h
similarity index 100%
rename from Transceiver52M/common/convolve.h
rename to Transceiver52M/arch/common/convolve.h
diff --git a/Transceiver52M/common/convolve_base.c b/Transceiver52M/arch/common/convolve_base.c
similarity index 100%
rename from Transceiver52M/common/convolve_base.c
rename to Transceiver52M/arch/common/convolve_base.c
diff --git a/Transceiver52M/common/fft.c b/Transceiver52M/arch/common/fft.c
similarity index 100%
rename from Transceiver52M/common/fft.c
rename to Transceiver52M/arch/common/fft.c
diff --git a/Transceiver52M/common/fft.h b/Transceiver52M/arch/common/fft.h
similarity index 100%
rename from Transceiver52M/common/fft.h
rename to Transceiver52M/arch/common/fft.h
diff --git a/Transceiver52M/common/mult.h b/Transceiver52M/arch/common/mult.h
similarity index 100%
rename from Transceiver52M/common/mult.h
rename to Transceiver52M/arch/common/mult.h
diff --git a/Transceiver52M/common/scale.h b/Transceiver52M/arch/common/scale.h
similarity index 100%
rename from Transceiver52M/common/scale.h
rename to Transceiver52M/arch/common/scale.h
diff --git a/Transceiver52M/x86/Makefile.am b/Transceiver52M/arch/x86/Makefile.am
similarity index 87%
rename from Transceiver52M/x86/Makefile.am
rename to Transceiver52M/arch/x86/Makefile.am
index 76c0bd2b..f39dde51 100644
--- a/Transceiver52M/x86/Makefile.am
+++ b/Transceiver52M/arch/x86/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libarch.la
 noinst_LTLIBRARIES += libarch_sse_3.la
 noinst_LTLIBRARIES += libarch_sse_4_1.la
 
-libarch_la_LIBADD = $(top_builddir)/Transceiver52M/common/libarch_common.la
+libarch_la_LIBADD = $(top_builddir)/Transceiver52M/arch/common/libarch_common.la
 
 # SSE 3 specific code
 if HAVE_SSE3
diff --git a/Transceiver52M/x86/convert.c b/Transceiver52M/arch/x86/convert.c
similarity index 100%
rename from Transceiver52M/x86/convert.c
rename to Transceiver52M/arch/x86/convert.c
diff --git a/Transceiver52M/x86/convert_sse_3.c b/Transceiver52M/arch/x86/convert_sse_3.c
similarity index 100%
rename from Transceiver52M/x86/convert_sse_3.c
rename to Transceiver52M/arch/x86/convert_sse_3.c
diff --git a/Transceiver52M/x86/convert_sse_3.h b/Transceiver52M/arch/x86/convert_sse_3.h
similarity index 100%
rename from Transceiver52M/x86/convert_sse_3.h
rename to Transceiver52M/arch/x86/convert_sse_3.h
diff --git a/Transceiver52M/x86/convert_sse_4_1.c b/Transceiver52M/arch/x86/convert_sse_4_1.c
similarity index 100%
rename from Transceiver52M/x86/convert_sse_4_1.c
rename to Transceiver52M/arch/x86/convert_sse_4_1.c
diff --git a/Transceiver52M/x86/convert_sse_4_1.h b/Transceiver52M/arch/x86/convert_sse_4_1.h
similarity index 100%
rename from Transceiver52M/x86/convert_sse_4_1.h
rename to Transceiver52M/arch/x86/convert_sse_4_1.h
diff --git a/Transceiver52M/x86/convolve.c b/Transceiver52M/arch/x86/convolve.c
similarity index 100%
rename from Transceiver52M/x86/convolve.c
rename to Transceiver52M/arch/x86/convolve.c
diff --git a/Transceiver52M/x86/convolve_sse_3.c b/Transceiver52M/arch/x86/convolve_sse_3.c
similarity index 100%
rename from Transceiver52M/x86/convolve_sse_3.c
rename to Transceiver52M/arch/x86/convolve_sse_3.c
diff --git a/Transceiver52M/x86/convolve_sse_3.h b/Transceiver52M/arch/x86/convolve_sse_3.h
similarity index 100%
rename from Transceiver52M/x86/convolve_sse_3.h
rename to Transceiver52M/arch/x86/convolve_sse_3.h
diff --git a/configure.ac b/configure.ac
index 8271dbf4..125f41ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -199,9 +199,10 @@ AC_CONFIG_FILES([\
     CommonLibs/Makefile \
     GSM/Makefile \
     Transceiver52M/Makefile \
-    Transceiver52M/common/Makefile \
-    Transceiver52M/arm/Makefile \
-    Transceiver52M/x86/Makefile \
+    Transceiver52M/arch/Makefile \
+    Transceiver52M/arch/common/Makefile \
+    Transceiver52M/arch/arm/Makefile \
+    Transceiver52M/arch/x86/Makefile \
     tests/Makefile \
     tests/CommonLibs/Makefile \
     tests/Transceiver52M/Makefile \
diff --git a/tests/Transceiver52M/Makefile.am b/tests/Transceiver52M/Makefile.am
index 8a05bd85..778d64d2 100644
--- a/tests/Transceiver52M/Makefile.am
+++ b/tests/Transceiver52M/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.common
 
-AM_CFLAGS = -Wall -I$(top_srcdir)/Transceiver52M $(STD_DEFINES_AND_INCLUDES) -g
+AM_CFLAGS = -Wall -I$(top_srcdir)/Transceiver52M -I$(top_srcdir)/Transceiver52M/arch/common $(STD_DEFINES_AND_INCLUDES) -g
 
 EXTRA_DIST = convolve_test.ok
 
diff --git a/tests/Transceiver52M/convolve_test.c b/tests/Transceiver52M/convolve_test.c
index f4a76c31..88624af4 100644
--- a/tests/Transceiver52M/convolve_test.c
+++ b/tests/Transceiver52M/convolve_test.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "../../Transceiver52M/common/convolve.h"
+#include "convolve.h"
 
 #define TESTVEC_LEN 1000
 #define DO_INIT 1