diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72833c69..65513dd8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,13 +11,14 @@ find_package(LibMbe REQUIRED)
 find_package(ITPP REQUIRED)
 find_package(LibPortAudio)
 
-FILE(GLOB SRCS *.c *.cpp)
+FILE(GLOB SRCS src/*.c src/*.cpp)
+FILE(GLOB HEADERS include/*.h include/*.hpp)
 
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/git_ver.c.in" "${CMAKE_CURRENT_BINARY_DIR}/git_ver.c" @ONLY)
-list(APPEND SRCS "${CMAKE_CURRENT_BINARY_DIR}/git_ver.c" git_ver.h)
+configure_file("src/git_ver.c.in" "${CMAKE_CURRENT_BINARY_DIR}/git_ver.c" @ONLY)
+list(APPEND SRCS "${CMAKE_CURRENT_BINARY_DIR}/git_ver.c")
 
 INCLUDE_DIRECTORIES(
-    "${PROJECT_SOURCE_DIR}"
+    "${PROJECT_SOURCE_DIR}/include"
     "${LIBSNDFILE_INCLUDE_DIR}"
     "${LIBMBE_INCLUDE_DIR}"
     "${ITPP_INCLUDE_DIR}"
@@ -31,7 +32,7 @@ SET(LIBS ${LIBS} ${PORTAUDIO_LIBRARIES})
 add_definitions(-DUSE_PORTAUDIO)
 endif(PORTAUDIO_FOUND)
 
-ADD_EXECUTABLE(dsd ${SRCS})
+ADD_EXECUTABLE(dsd ${SRCS} ${HEADERS})
 TARGET_LINK_LIBRARIES(dsd ${LIBS})
 
 install(TARGETS dsd DESTINATION bin)
diff --git a/Golay24.hpp b/include/Golay24.hpp
similarity index 100%
rename from Golay24.hpp
rename to include/Golay24.hpp
diff --git a/Hamming.hpp b/include/Hamming.hpp
similarity index 100%
rename from Hamming.hpp
rename to include/Hamming.hpp
diff --git a/ReedSolomon.hpp b/include/ReedSolomon.hpp
similarity index 100%
rename from ReedSolomon.hpp
rename to include/ReedSolomon.hpp
diff --git a/config.h b/include/config.h
similarity index 100%
rename from config.h
rename to include/config.h
diff --git a/descramble.h b/include/descramble.h
similarity index 100%
rename from descramble.h
rename to include/descramble.h
diff --git a/dmr_const.h b/include/dmr_const.h
similarity index 100%
rename from dmr_const.h
rename to include/dmr_const.h
diff --git a/dsd.h b/include/dsd.h
similarity index 100%
rename from dsd.h
rename to include/dsd.h
diff --git a/dstar_const.h b/include/dstar_const.h
similarity index 100%
rename from dstar_const.h
rename to include/dstar_const.h
diff --git a/dstar_header.h b/include/dstar_header.h
similarity index 100%
rename from dstar_header.h
rename to include/dstar_header.h
diff --git a/fcs.h b/include/fcs.h
similarity index 100%
rename from fcs.h
rename to include/fcs.h
diff --git a/git_ver.h b/include/git_ver.h
similarity index 100%
rename from git_ver.h
rename to include/git_ver.h
diff --git a/nxdn96_const.h b/include/nxdn96_const.h
similarity index 100%
rename from nxdn96_const.h
rename to include/nxdn96_const.h
diff --git a/nxdn_const.h b/include/nxdn_const.h
similarity index 100%
rename from nxdn_const.h
rename to include/nxdn_const.h
diff --git a/p25p1_check_hdu.h b/include/p25p1_check_hdu.h
similarity index 100%
rename from p25p1_check_hdu.h
rename to include/p25p1_check_hdu.h
diff --git a/p25p1_check_ldu.h b/include/p25p1_check_ldu.h
similarity index 100%
rename from p25p1_check_ldu.h
rename to include/p25p1_check_ldu.h
diff --git a/p25p1_check_nid.h b/include/p25p1_check_nid.h
similarity index 100%
rename from p25p1_check_nid.h
rename to include/p25p1_check_nid.h
diff --git a/p25p1_const.h b/include/p25p1_const.h
similarity index 100%
rename from p25p1_const.h
rename to include/p25p1_const.h
diff --git a/p25p1_hdu.h b/include/p25p1_hdu.h
similarity index 100%
rename from p25p1_hdu.h
rename to include/p25p1_hdu.h
diff --git a/p25p1_heuristics.h b/include/p25p1_heuristics.h
similarity index 100%
rename from p25p1_heuristics.h
rename to include/p25p1_heuristics.h
diff --git a/p25p1_ldu.h b/include/p25p1_ldu.h
similarity index 100%
rename from p25p1_ldu.h
rename to include/p25p1_ldu.h
diff --git a/pa_devs.h b/include/pa_devs.h
similarity index 100%
rename from pa_devs.h
rename to include/pa_devs.h
diff --git a/provoice_const.h b/include/provoice_const.h
similarity index 100%
rename from provoice_const.h
rename to include/provoice_const.h
diff --git a/x2tdma_const.h b/include/x2tdma_const.h
similarity index 100%
rename from x2tdma_const.h
rename to include/x2tdma_const.h
diff --git a/Hamming.cpp b/src/Hamming.cpp
similarity index 100%
rename from Hamming.cpp
rename to src/Hamming.cpp
diff --git a/dmr_data.c b/src/dmr_data.c
similarity index 100%
rename from dmr_data.c
rename to src/dmr_data.c
diff --git a/dmr_voice.c b/src/dmr_voice.c
similarity index 100%
rename from dmr_voice.c
rename to src/dmr_voice.c
diff --git a/dsd_audio.c b/src/dsd_audio.c
similarity index 100%
rename from dsd_audio.c
rename to src/dsd_audio.c
diff --git a/dsd_dibit.c b/src/dsd_dibit.c
similarity index 100%
rename from dsd_dibit.c
rename to src/dsd_dibit.c
diff --git a/dsd_file.c b/src/dsd_file.c
similarity index 100%
rename from dsd_file.c
rename to src/dsd_file.c
diff --git a/dsd_filters.c b/src/dsd_filters.c
similarity index 100%
rename from dsd_filters.c
rename to src/dsd_filters.c
diff --git a/dsd_frame.c b/src/dsd_frame.c
similarity index 100%
rename from dsd_frame.c
rename to src/dsd_frame.c
diff --git a/dsd_frame_sync.c b/src/dsd_frame_sync.c
similarity index 100%
rename from dsd_frame_sync.c
rename to src/dsd_frame_sync.c
diff --git a/dsd_main.c b/src/dsd_main.c
similarity index 100%
rename from dsd_main.c
rename to src/dsd_main.c
diff --git a/dsd_mbe.c b/src/dsd_mbe.c
similarity index 100%
rename from dsd_mbe.c
rename to src/dsd_mbe.c
diff --git a/dsd_serial.c b/src/dsd_serial.c
similarity index 100%
rename from dsd_serial.c
rename to src/dsd_serial.c
diff --git a/dsd_symbol.c b/src/dsd_symbol.c
similarity index 100%
rename from dsd_symbol.c
rename to src/dsd_symbol.c
diff --git a/dsd_upsample.c b/src/dsd_upsample.c
similarity index 100%
rename from dsd_upsample.c
rename to src/dsd_upsample.c
diff --git a/dstar.c b/src/dstar.c
similarity index 100%
rename from dstar.c
rename to src/dstar.c
diff --git a/dstar_header.c b/src/dstar_header.c
similarity index 100%
rename from dstar_header.c
rename to src/dstar_header.c
diff --git a/git_ver.c.in b/src/git_ver.c.in
similarity index 100%
rename from git_ver.c.in
rename to src/git_ver.c.in
diff --git a/nxdn96.c b/src/nxdn96.c
similarity index 100%
rename from nxdn96.c
rename to src/nxdn96.c
diff --git a/nxdn_data.c b/src/nxdn_data.c
similarity index 100%
rename from nxdn_data.c
rename to src/nxdn_data.c
diff --git a/nxdn_voice.c b/src/nxdn_voice.c
similarity index 100%
rename from nxdn_voice.c
rename to src/nxdn_voice.c
diff --git a/p25_lcw.c b/src/p25_lcw.c
similarity index 100%
rename from p25_lcw.c
rename to src/p25_lcw.c
diff --git a/p25p1_check_hdu.cpp b/src/p25p1_check_hdu.cpp
similarity index 100%
rename from p25p1_check_hdu.cpp
rename to src/p25p1_check_hdu.cpp
diff --git a/p25p1_check_ldu.cpp b/src/p25p1_check_ldu.cpp
similarity index 100%
rename from p25p1_check_ldu.cpp
rename to src/p25p1_check_ldu.cpp
diff --git a/p25p1_check_nid.cpp b/src/p25p1_check_nid.cpp
similarity index 100%
rename from p25p1_check_nid.cpp
rename to src/p25p1_check_nid.cpp
diff --git a/p25p1_hdu.c b/src/p25p1_hdu.c
similarity index 100%
rename from p25p1_hdu.c
rename to src/p25p1_hdu.c
diff --git a/p25p1_heuristics.c b/src/p25p1_heuristics.c
similarity index 100%
rename from p25p1_heuristics.c
rename to src/p25p1_heuristics.c
diff --git a/p25p1_ldu.c b/src/p25p1_ldu.c
similarity index 100%
rename from p25p1_ldu.c
rename to src/p25p1_ldu.c
diff --git a/p25p1_ldu1.c b/src/p25p1_ldu1.c
similarity index 100%
rename from p25p1_ldu1.c
rename to src/p25p1_ldu1.c
diff --git a/p25p1_ldu2.c b/src/p25p1_ldu2.c
similarity index 100%
rename from p25p1_ldu2.c
rename to src/p25p1_ldu2.c
diff --git a/p25p1_tdu.c b/src/p25p1_tdu.c
similarity index 100%
rename from p25p1_tdu.c
rename to src/p25p1_tdu.c
diff --git a/p25p1_tdulc.c b/src/p25p1_tdulc.c
similarity index 100%
rename from p25p1_tdulc.c
rename to src/p25p1_tdulc.c
diff --git a/pa_devs.c b/src/pa_devs.c
similarity index 100%
rename from pa_devs.c
rename to src/pa_devs.c
diff --git a/provoice.c b/src/provoice.c
similarity index 100%
rename from provoice.c
rename to src/provoice.c
diff --git a/x2tdma_data.c b/src/x2tdma_data.c
similarity index 100%
rename from x2tdma_data.c
rename to src/x2tdma_data.c
diff --git a/x2tdma_voice.c b/src/x2tdma_voice.c
similarity index 100%
rename from x2tdma_voice.c
rename to src/x2tdma_voice.c
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 8889006b..03b0d220 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -3,7 +3,7 @@ project(dsdtest)
 add_subdirectory(gtest)
 add_subdirectory(gmock)
 
-FILE(GLOB SRCS *.cpp ${dsdtest_SOURCE_DIR}/../Hamming.cpp)
+FILE(GLOB SRCS *.cpp ${dsdtest_SOURCE_DIR}/../src/Hamming.cpp)
 
 include_directories(
     ${PROJECT_SOURCE_DIR}/gtest/include