diff --git a/Crc/Makefile b/Crc/Makefile
deleted file mode 100644
index 7cf48b4..0000000
--- a/Crc/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-include ./config.mk
-
-NAME := Crc
-
-GCC_SRCS := $(LIBSRC_PATH)/crc/crc.c
-
-INCLUDES += -I $(LIBSRC_PATH)
-
-include $(MAKE_HOME)/compile.mk
diff --git a/Crc/config.mk b/Crc/config.mk
deleted file mode 100644
index 6ee737d..0000000
--- a/Crc/config.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-MAKE_HOME ?= /home/jens/work/software/make
-CONFIG ?= debug
-BUILD_DIR ?= ./build/${CONFIG}
-MAKEFLAGS += --no-print-directory
-
-LIBSRC_PATH ?= $(realpath ../../../libsrc)
diff --git a/Fir/Makefile b/Fir/Makefile
deleted file mode 100644
index 7628acd..0000000
--- a/Fir/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-include ./config.mk
-
-NAME := Fir
-
-GCC_SRCS := $(LIBSRC_PATH)/fir/fir2.c
-
-INCLUDES += -I $(LIBSRC_PATH)
-DEFINES += -Dradio_float_t=float -Dfir_float_t=float
-
-include $(MAKE_HOME)/compile.mk
diff --git a/Fir/config.mk b/Fir/config.mk
deleted file mode 100644
index 5736f44..0000000
--- a/Fir/config.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-MAKE_HOME ?= /home/jens/work/software/make
-CONFIG ?= debug
-BUILD_DIR ?= ./build/${CONFIG}
-
-LIBSRC_PATH ?= $(realpath ../../../libsrc)
diff --git a/Makefile b/Makefile
index 0670b6e..f701f0a 100644
--- a/Makefile
+++ b/Makefile
@@ -19,20 +19,18 @@ app: objects link
 
 objects: JuceLibraryCode Radio Source Crc Fir
 	
+Source:
+	@$(MAKE) -C $@
+
 JuceLibraryCode:
 	@$(MAKE) -C $@
 
 Radio:
-	@$(MAKE) -C $@
-
-Source:
-	@$(MAKE) -C $@
-
-Crc:
-	@$(MAKE) -C $@
-
+	@$(MAKE) -C $(LIBSRC_PATH)/cpp/radio
 Fir:
-	@$(MAKE) -C $@
+	@$(MAKE) -C $(LIBSRC_PATH)/fir
+Crc:
+	@$(MAKE) -C $(LIBSRC_PATH)/crc
 
 
 include $(MAKE_HOME)/link.mk
diff --git a/Radio/Makefile b/Radio/Makefile
deleted file mode 100644
index 7f0df77..0000000
--- a/Radio/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-include ./config.mk
-
-NAME := Radio
-
-CXX_SRCS := $(LIBSRC_PATH)/cpp/radio/Formatter.cpp
-CXX_SRCS += $(LIBSRC_PATH)/cpp/radio/Symbolizer.cpp
-CXX_SRCS += $(LIBSRC_PATH)/cpp/radio/Scrambler.cpp
-CXX_SRCS += $(LIBSRC_PATH)/cpp/radio/Frame.cpp
-CXX_SRCS += $(LIBSRC_PATH)/cpp/radio/interpolation/Interpolator.cpp
-CXX_SRCS += $(LIBSRC_PATH)/cpp/radio/interpolation/Farrow.cpp
-CXX_SRCS += $(LIBSRC_PATH)/cpp/radio/interpolation/PolyPhase.cpp
-CXX_SRCS += $(LIBSRC_PATH)/cpp/radio/interpolation/UpSampler.cpp
-CXX_SRCS += $(LIBSRC_PATH)/cpp/radio/interpolation/DownSampler.cpp
-
-GCC_SRCS := $(LIBSRC_PATH)/radio/real.c
-GCC_SRCS += $(LIBSRC_PATH)/radio/cpx.c
-GCC_SRCS += $(LIBSRC_PATH)/radio/ringbuf.c
-GCC_SRCS += $(LIBSRC_PATH)/radio/equalizer.c
-GCC_SRCS += $(LIBSRC_PATH)/radio/interpolation.c
-GCC_SRCS += $(LIBSRC_PATH)/radio/agc.c
-GCC_SRCS += $(LIBSRC_PATH)/radio/nco.c
-GCC_SRCS += $(LIBSRC_PATH)/radio/statistics.c
-GCC_SRCS += $(LIBSRC_PATH)/radio/symbol.c
-GCC_SRCS += $(LIBSRC_PATH)/radio/synchronization.c
-
-INCLUDES += -I $(LIBSRC_PATH) -I $(EIGEN_PATH) -I $(BLAZE_PATH)
-DEFINES += -Dradio_float_t=float -Dfir_float_t=float
-
-include $(MAKE_HOME)/compile.mk
diff --git a/Radio/config.mk b/Radio/config.mk
deleted file mode 100644
index 3dc397f..0000000
--- a/Radio/config.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-MAKE_HOME ?= /home/jens/work/software/make
-CONFIG ?= debug
-BUILD_DIR ?= ./build/${CONFIG}
-
-LIBSRC_PATH ?= $(realpath ../../../libsrc)
-EIGEN_PATH ?= $(realpath ../../../extlib/eigen)
-BLAZE_PATH ?= $(realpath ../../../extlib/blaze)