diff --git a/libpsk/include/codec/codec_types.hpp b/libpsk/include/libpsk/codec/codec_types.hpp
similarity index 100%
rename from libpsk/include/codec/codec_types.hpp
rename to libpsk/include/libpsk/codec/codec_types.hpp
diff --git a/libpsk/include/codec/modulation_config.hpp b/libpsk/include/libpsk/codec/modulation_config.hpp
similarity index 100%
rename from libpsk/include/codec/modulation_config.hpp
rename to libpsk/include/libpsk/codec/modulation_config.hpp
diff --git a/libpsk/include/codec/psk_config.hpp b/libpsk/include/libpsk/codec/psk_config.hpp
similarity index 100%
rename from libpsk/include/codec/psk_config.hpp
rename to libpsk/include/libpsk/codec/psk_config.hpp
diff --git a/libpsk/include/codec/trx_device_base.hpp b/libpsk/include/libpsk/codec/trx_device_base.hpp
similarity index 97%
rename from libpsk/include/codec/trx_device_base.hpp
rename to libpsk/include/libpsk/codec/trx_device_base.hpp
index 5812228..5b262c5 100644
--- a/libpsk/include/codec/trx_device_base.hpp
+++ b/libpsk/include/libpsk/codec/trx_device_base.hpp
@@ -12,10 +12,10 @@
 #include <functional>
 #include <array>
 #include <memory>
-#include "psk/spectrum_calculator.hpp"
-#include "codec_types.hpp"
-#include "codec/trx_device_base.hpp"
-#include "codec/modulation_config.hpp"
+#include "libpsk/psk/spectrum_calculator.hpp"
+#include "libpsk/codec/codec_types.hpp"
+#include "libpsk/codec/trx_device_base.hpp"
+#include "libpsk/codec/modulation_config.hpp"
 /* ------------------------------------------------------------------------- */
 namespace ham {
 namespace psk {
diff --git a/libpsk/include/dsp/array_sinus.hpp b/libpsk/include/libpsk/dsp/array_sinus.hpp
similarity index 100%
rename from libpsk/include/dsp/array_sinus.hpp
rename to libpsk/include/libpsk/dsp/array_sinus.hpp
diff --git a/libpsk/include/dsp/atan2_int.hpp b/libpsk/include/libpsk/dsp/atan2_int.hpp
similarity index 100%
rename from libpsk/include/dsp/atan2_int.hpp
rename to libpsk/include/libpsk/dsp/atan2_int.hpp
diff --git a/libpsk/include/dsp/dsp_basic_ops.hpp b/libpsk/include/libpsk/dsp/dsp_basic_ops.hpp
similarity index 100%
rename from libpsk/include/dsp/dsp_basic_ops.hpp
rename to libpsk/include/libpsk/dsp/dsp_basic_ops.hpp
diff --git a/libpsk/include/dsp/fft.h b/libpsk/include/libpsk/dsp/fft.h
similarity index 100%
rename from libpsk/include/dsp/fft.h
rename to libpsk/include/libpsk/dsp/fft.h
diff --git a/libpsk/include/dsp/fir_decimate.hpp b/libpsk/include/libpsk/dsp/fir_decimate.hpp
similarity index 100%
rename from libpsk/include/dsp/fir_decimate.hpp
rename to libpsk/include/libpsk/dsp/fir_decimate.hpp
diff --git a/libpsk/include/dsp/log2_int.hpp b/libpsk/include/libpsk/dsp/log2_int.hpp
similarity index 100%
rename from libpsk/include/dsp/log2_int.hpp
rename to libpsk/include/libpsk/dsp/log2_int.hpp
diff --git a/libpsk/include/dsp/nco_mixer.hpp b/libpsk/include/libpsk/dsp/nco_mixer.hpp
similarity index 100%
rename from libpsk/include/dsp/nco_mixer.hpp
rename to libpsk/include/libpsk/dsp/nco_mixer.hpp
diff --git a/libpsk/include/dsp/sqrt_int.hpp b/libpsk/include/libpsk/dsp/sqrt_int.hpp
similarity index 100%
rename from libpsk/include/dsp/sqrt_int.hpp
rename to libpsk/include/libpsk/dsp/sqrt_int.hpp
diff --git a/libpsk/include/ham/ham_digi.hpp b/libpsk/include/libpsk/ham/ham_digi.hpp
similarity index 98%
rename from libpsk/include/ham/ham_digi.hpp
rename to libpsk/include/libpsk/ham/ham_digi.hpp
index 3bc48c6..9b340cb 100644
--- a/libpsk/include/ham/ham_digi.hpp
+++ b/libpsk/include/libpsk/ham/ham_digi.hpp
@@ -8,7 +8,7 @@
 #ifndef HAM_DIGI_HPP_
 #define HAM_DIGI_HPP_
 /* ------------------------------------------------------------------------- */
-#include "codec/trx_device_base.hpp"
+#include "libpsk/codec/trx_device_base.hpp"
 #include <memory>
 /* ------------------------------------------------------------------------- */
 namespace ham {
diff --git a/libpsk/include/port/pulse/pulse_device.hpp b/libpsk/include/libpsk/port/pulse/pulse_device.hpp
similarity index 98%
rename from libpsk/include/port/pulse/pulse_device.hpp
rename to libpsk/include/libpsk/port/pulse/pulse_device.hpp
index 5055277..bb9422f 100644
--- a/libpsk/include/port/pulse/pulse_device.hpp
+++ b/libpsk/include/libpsk/port/pulse/pulse_device.hpp
@@ -9,7 +9,7 @@
 #define PORT_PULSE_DEVICE_HPP_
 /* ------------------------------------------------------------------------- */
 
-#include "codec/trx_device_base.hpp"
+#include "libpsk/codec/trx_device_base.hpp"
 #include <thread>
 #include <memory>
 #include <mutex>
diff --git a/libpsk/include/psk/afc.hpp b/libpsk/include/libpsk/psk/afc.hpp
similarity index 100%
rename from libpsk/include/psk/afc.hpp
rename to libpsk/include/libpsk/psk/afc.hpp
diff --git a/libpsk/include/psk/agc.hpp b/libpsk/include/libpsk/psk/agc.hpp
similarity index 97%
rename from libpsk/include/psk/agc.hpp
rename to libpsk/include/libpsk/psk/agc.hpp
index 12b81c0..7172e12 100644
--- a/libpsk/include/psk/agc.hpp
+++ b/libpsk/include/libpsk/psk/agc.hpp
@@ -10,7 +10,7 @@
 /* ------------------------------------------------------------------------- */
 #include <complex>
 #include <limits>
-#include "dsp/sqrt_int.hpp"
+#include "libpsk/dsp/sqrt_int.hpp"
 /* ------------------------------------------------------------------------- */
 namespace ham {
 namespace psk {
diff --git a/libpsk/include/psk/control_chars.hpp b/libpsk/include/libpsk/psk/control_chars.hpp
similarity index 100%
rename from libpsk/include/psk/control_chars.hpp
rename to libpsk/include/libpsk/psk/control_chars.hpp
diff --git a/libpsk/include/psk/decoder.hpp b/libpsk/include/libpsk/psk/decoder.hpp
similarity index 94%
rename from libpsk/include/psk/decoder.hpp
rename to libpsk/include/libpsk/psk/decoder.hpp
index fef55ae..1edb05b 100644
--- a/libpsk/include/psk/decoder.hpp
+++ b/libpsk/include/libpsk/psk/decoder.hpp
@@ -15,8 +15,8 @@
 #include <complex>
 #include <functional>
 #include "imd_calculator.hpp"
-#include "dsp/nco_mixer.hpp"
-#include "dsp/fir_decimate.hpp"
+#include "libpsk/dsp/nco_mixer.hpp"
+#include "libpsk/dsp/fir_decimate.hpp"
 #include "agc.hpp"
 #include "afc.hpp"
 #include "synchronizer.hpp"
@@ -24,10 +24,10 @@
 #include "viterbi_decoder.hpp"
 #include "squelch.hpp"
 #include "symbol_decoder.hpp"
-#include "codec/codec_types.hpp"
-#include "codec/trx_device_base.hpp"
-#include "psk/dyn_queue.hpp"
-#include "codec/psk_config.hpp"
+#include "libpsk/codec/codec_types.hpp"
+#include "libpsk/codec/trx_device_base.hpp"
+#include "libpsk/psk/dyn_queue.hpp"
+#include "libpsk/codec/psk_config.hpp"
 
 /* ------------------------------------------------------------------------- */
 namespace ham {
diff --git a/libpsk/include/psk/diff_angle_calc.hpp b/libpsk/include/libpsk/psk/diff_angle_calc.hpp
similarity index 96%
rename from libpsk/include/psk/diff_angle_calc.hpp
rename to libpsk/include/libpsk/psk/diff_angle_calc.hpp
index fcfbbcc..e372fb7 100644
--- a/libpsk/include/psk/diff_angle_calc.hpp
+++ b/libpsk/include/libpsk/psk/diff_angle_calc.hpp
@@ -9,9 +9,9 @@
 #define LIBPSK_DIFF_ANGLE_CALC_HPP_
 /* ------------------------------------------------------------------------- */
 #include <complex>
-#include "dsp/dsp_basic_ops.hpp"
-#include "dsp/sqrt_int.hpp"
-#include "dsp/atan2_int.hpp"
+#include "libpsk/dsp/dsp_basic_ops.hpp"
+#include "libpsk/dsp/sqrt_int.hpp"
+#include "libpsk/dsp/atan2_int.hpp"
 
 /* ------------------------------------------------------------------------- */
 namespace ham {
diff --git a/libpsk/include/psk/dyn_queue.hpp b/libpsk/include/libpsk/psk/dyn_queue.hpp
similarity index 100%
rename from libpsk/include/psk/dyn_queue.hpp
rename to libpsk/include/libpsk/psk/dyn_queue.hpp
diff --git a/libpsk/include/psk/imd_calculator.hpp b/libpsk/include/libpsk/psk/imd_calculator.hpp
similarity index 100%
rename from libpsk/include/psk/imd_calculator.hpp
rename to libpsk/include/libpsk/psk/imd_calculator.hpp
diff --git a/libpsk/include/psk/modulator.hpp b/libpsk/include/libpsk/psk/modulator.hpp
similarity index 93%
rename from libpsk/include/psk/modulator.hpp
rename to libpsk/include/libpsk/psk/modulator.hpp
index 05386ac..adadc4d 100644
--- a/libpsk/include/psk/modulator.hpp
+++ b/libpsk/include/libpsk/psk/modulator.hpp
@@ -12,12 +12,12 @@
 #include <cstddef>
 #include <cstdint>
 #include <array>
-#include "psk/dyn_queue.hpp"
-#include "psk/symbol_encoder.hpp"
-#include "dsp/nco_mixer.hpp"
-#include "codec/codec_types.hpp"
-#include "codec/trx_device_base.hpp"
-#include "codec/psk_config.hpp"
+#include "libpsk/psk/dyn_queue.hpp"
+#include "libpsk/psk/symbol_encoder.hpp"
+#include "libpsk/dsp/nco_mixer.hpp"
+#include "libpsk/codec/codec_types.hpp"
+#include "libpsk/codec/trx_device_base.hpp"
+#include "libpsk/codec/psk_config.hpp"
 /* ------------------------------------------------------------------------- */
 namespace ham {
 namespace psk {
diff --git a/libpsk/include/psk/spectrum_calculator.hpp b/libpsk/include/libpsk/psk/spectrum_calculator.hpp
similarity index 100%
rename from libpsk/include/psk/spectrum_calculator.hpp
rename to libpsk/include/libpsk/psk/spectrum_calculator.hpp
diff --git a/libpsk/include/psk/squelch.hpp b/libpsk/include/libpsk/psk/squelch.hpp
similarity index 99%
rename from libpsk/include/psk/squelch.hpp
rename to libpsk/include/libpsk/psk/squelch.hpp
index 1b49aa9..0414749 100644
--- a/libpsk/include/psk/squelch.hpp
+++ b/libpsk/include/libpsk/psk/squelch.hpp
@@ -9,7 +9,7 @@
 #define PSK_SQUELCH_HPP_
 /* ------------------------------------------------------------------------- */
 #include "diff_angle_calc.hpp"
-#include "codec/codec_types.hpp"
+#include "libpsk/codec/codec_types.hpp"
 
 /* ------------------------------------------------------------------------- */
 namespace ham {
diff --git a/libpsk/include/psk/symbol_decoder.hpp b/libpsk/include/libpsk/psk/symbol_decoder.hpp
similarity index 97%
rename from libpsk/include/psk/symbol_decoder.hpp
rename to libpsk/include/libpsk/psk/symbol_decoder.hpp
index 1e47e23..8c0a316 100644
--- a/libpsk/include/psk/symbol_decoder.hpp
+++ b/libpsk/include/libpsk/psk/symbol_decoder.hpp
@@ -10,7 +10,7 @@
 #define PSK_SYMBOL_DECODER_HPP_
 
 /* ------------------------------------------------------------------------- */
-#include "psk/varicode.hpp"
+#include "libpsk/psk/varicode.hpp"
 /* ------------------------------------------------------------------------- */
 namespace ham {
 namespace psk {
diff --git a/libpsk/include/psk/symbol_encoder.hpp b/libpsk/include/libpsk/psk/symbol_encoder.hpp
similarity index 97%
rename from libpsk/include/psk/symbol_encoder.hpp
rename to libpsk/include/libpsk/psk/symbol_encoder.hpp
index 2dac08e..3fcee9f 100644
--- a/libpsk/include/psk/symbol_encoder.hpp
+++ b/libpsk/include/libpsk/psk/symbol_encoder.hpp
@@ -9,9 +9,9 @@
 #define PSK_SYMBOL_ENCODER_HPP_
 
 /* ------------------------------------------------------------------------- */
-#include "psk/control_chars.hpp"
-#include "psk/varicode.hpp"
-#include "codec/psk_config.hpp"
+#include "libpsk/psk/control_chars.hpp"
+#include "libpsk/psk/varicode.hpp"
+#include "libpsk/codec/psk_config.hpp"
 /* ------------------------------------------------------------------------- */
 namespace ham {
 namespace psk {
diff --git a/libpsk/include/psk/synchronizer.hpp b/libpsk/include/libpsk/psk/synchronizer.hpp
similarity index 99%
rename from libpsk/include/psk/synchronizer.hpp
rename to libpsk/include/libpsk/psk/synchronizer.hpp
index 67ea428..814e4c3 100644
--- a/libpsk/include/psk/synchronizer.hpp
+++ b/libpsk/include/libpsk/psk/synchronizer.hpp
@@ -13,7 +13,7 @@
 #include <array>
 #include <functional>
 #include <limits>
-#include "dsp/dsp_basic_ops.hpp"
+#include "libpsk/dsp/dsp_basic_ops.hpp"
 
 
 /* ------------------------------------------------------------------------- */
diff --git a/libpsk/include/psk/varicode.hpp b/libpsk/include/libpsk/psk/varicode.hpp
similarity index 100%
rename from libpsk/include/psk/varicode.hpp
rename to libpsk/include/libpsk/psk/varicode.hpp
diff --git a/libpsk/include/psk/viterbi_decoder.hpp b/libpsk/include/libpsk/psk/viterbi_decoder.hpp
similarity index 100%
rename from libpsk/include/psk/viterbi_decoder.hpp
rename to libpsk/include/libpsk/psk/viterbi_decoder.hpp
diff --git a/libpsk/src/codec/spectrum_calculator.cpp b/libpsk/src/codec/spectrum_calculator.cpp
index 9b6664f..190ce90 100644
--- a/libpsk/src/codec/spectrum_calculator.cpp
+++ b/libpsk/src/codec/spectrum_calculator.cpp
@@ -6,10 +6,10 @@
  */
 
 /*----------------------------------------------------------*/
-#include "psk/spectrum_calculator.hpp"
-#include "dsp/fft.h"
-#include "dsp/sqrt_int.hpp"
-#include "dsp/log2_int.hpp"
+#include "libpsk/psk/spectrum_calculator.hpp"
+#include "libpsk/dsp/fft.h"
+#include "libpsk/dsp/sqrt_int.hpp"
+#include "libpsk/dsp/log2_int.hpp"
 #include <algorithm>
 #include <limits>
 /*----------------------------------------------------------*/
diff --git a/libpsk/src/codec/trx_device_base.cpp b/libpsk/src/codec/trx_device_base.cpp
index 9787f3f..371d2e3 100644
--- a/libpsk/src/codec/trx_device_base.cpp
+++ b/libpsk/src/codec/trx_device_base.cpp
@@ -6,7 +6,7 @@
  */
 
 /* ------------------------------------------------------------------------- */
-#include "codec/trx_device_base.hpp"
+#include "libpsk/codec/trx_device_base.hpp"
 
 /* ------------------------------------------------------------------------- */
 //Namespace def
diff --git a/libpsk/src/ham/ham_digi.cpp b/libpsk/src/ham/ham_digi.cpp
index 63533d6..ab725f2 100644
--- a/libpsk/src/ham/ham_digi.cpp
+++ b/libpsk/src/ham/ham_digi.cpp
@@ -5,22 +5,29 @@
  *      Author: lucck
  */
 /* ------------------------------------------------------------------------- */
-#include "ham/ham_digi.hpp"
+#include "libpsk/ham/ham_digi.hpp"
 #ifndef COMPILED_UNDER_ISIX
-#include "port/pulse/pulse_device.hpp"
+#include "libpsk/port/pulse/pulse_device.hpp"
 #else
 #warning not implemented yet
 #endif
-#include "psk/decoder.hpp"
-#include "psk/modulator.hpp"
+#include "libpsk/psk/decoder.hpp"
+#include "libpsk/psk/modulator.hpp"
 #include <functional>
+#include <new>
+#include <cstdlib>
 /* ------------------------------------------------------------------------- */
-
 namespace ham {
 namespace psk {
 /* ------------------------------------------------------------------------- */
-namespace
-{
+namespace {
+	inline void terminate() {
+#ifdef __EXCEPTIONS
+		throw std::bad_alloc();
+#else
+		std::abort();
+#endif
+	}
 #ifndef COMPILED_UNDER_ISIX
 	inline trx_device_base* create_default_device( ham_digi::handler_t h )
 	{
@@ -29,7 +36,7 @@ namespace
 	}
 #else
 	inline trx_device_base* create_default_device( ham_digi::handler_t h ) {
-		return nullptr;
+		terminate();
 		return nullptr;
 	}
 #endif
diff --git a/libpsk/src/port/pulse/pulse_device.cpp b/libpsk/src/port/pulse/pulse_device.cpp
index 231dfd1..af7f5c4 100644
--- a/libpsk/src/port/pulse/pulse_device.cpp
+++ b/libpsk/src/port/pulse/pulse_device.cpp
@@ -5,7 +5,7 @@
  *      Author: lucck
  */
 
-#include "port/pulse/pulse_device.hpp"
+#include "libpsk/port/pulse/pulse_device.hpp"
 #include <pulse/simple.h>
 #include <pulse/error.h>
 #include <iostream>
diff --git a/libpsk/src/psk/decoder.cpp b/libpsk/src/psk/decoder.cpp
index 1085332..cfbf604 100644
--- a/libpsk/src/psk/decoder.cpp
+++ b/libpsk/src/psk/decoder.cpp
@@ -6,7 +6,7 @@
  *      Author: lucck
  */
 /* ------------------------------------------------------------------------- */
-#include "psk/decoder.hpp"
+#include "libpsk/psk/decoder.hpp"
 #include <complex>
 #include <cmath>
 #include <cstdio>
diff --git a/libpsk/src/psk/imd_calculator.cpp b/libpsk/src/psk/imd_calculator.cpp
index 01e7022..718fa69 100644
--- a/libpsk/src/psk/imd_calculator.cpp
+++ b/libpsk/src/psk/imd_calculator.cpp
@@ -6,7 +6,7 @@
  */
 
 /* ------------------------------------------------------------------------- */
-#include "psk/imd_calculator.hpp"
+#include "libpsk/psk/imd_calculator.hpp"
 
 /* ------------------------------------------------------------------------- */
 namespace ham {
diff --git a/libpsk/src/psk/modulator.cpp b/libpsk/src/psk/modulator.cpp
index d2af881..00c1fc8 100644
--- a/libpsk/src/psk/modulator.cpp
+++ b/libpsk/src/psk/modulator.cpp
@@ -5,7 +5,7 @@
  *      Author: lucck
  */
 /* ------------------------------------------------------------------------- */
-#include "psk/modulator.hpp"
+#include "libpsk/psk/modulator.hpp"
 #include <cmath>
 
 /* ------------------------------------------------------------------------- */
diff --git a/libpsk/src/psk/symbol_encoder.cpp b/libpsk/src/psk/symbol_encoder.cpp
index 2f621f6..f75f731 100644
--- a/libpsk/src/psk/symbol_encoder.cpp
+++ b/libpsk/src/psk/symbol_encoder.cpp
@@ -5,7 +5,7 @@
  *      Author: lucck
  */
 
-#include "psk/symbol_encoder.hpp"
+#include "libpsk/psk/symbol_encoder.hpp"
 
 namespace ham {
 namespace psk {
diff --git a/libpsk/src/psk/synchronizer.cpp b/libpsk/src/psk/synchronizer.cpp
index 8b2badf..2a2f233 100644
--- a/libpsk/src/psk/synchronizer.cpp
+++ b/libpsk/src/psk/synchronizer.cpp
@@ -5,7 +5,7 @@
  *      Author: lucck
  */
 /* ------------------------------------------------------------------------- */
-#include "psk/synchronizer.hpp"
+#include "libpsk/psk/synchronizer.hpp"
 
 /* ------------------------------------------------------------------------- */
 namespace ham {
diff --git a/libpsk/src/psk/varicode.cpp b/libpsk/src/psk/varicode.cpp
index 42dd7e8..3f99ad4 100644
--- a/libpsk/src/psk/varicode.cpp
+++ b/libpsk/src/psk/varicode.cpp
@@ -5,7 +5,7 @@
  *      Author: lucck
  */
 
-#include "psk/varicode.hpp"
+#include "libpsk/psk/varicode.hpp"
 
 namespace ham {
 namespace psk {
diff --git a/libpsk/src/psk/viterbi_decoder.cpp b/libpsk/src/psk/viterbi_decoder.cpp
index 31b3b38..7b7736a 100644
--- a/libpsk/src/psk/viterbi_decoder.cpp
+++ b/libpsk/src/psk/viterbi_decoder.cpp
@@ -6,7 +6,7 @@
  */
 
 /* ------------------------------------------------------------------------- */
-#include "psk/viterbi_decoder.hpp"
+#include "libpsk/psk/viterbi_decoder.hpp"
 
 /* ------------------------------------------------------------------------- */
 namespace ham {
diff --git a/tests/alltest/psk31test.cpp b/tests/alltest/psk31test.cpp
index d34e39e..2926175 100644
--- a/tests/alltest/psk31test.cpp
+++ b/tests/alltest/psk31test.cpp
@@ -3,11 +3,11 @@
 //ffplay -f f64le -ar 8000 -channels 1 ~/worksrc/workspace/psk31/test.raw
 #include <limits>
 #include <cmath>
-#include <psk/decoder.hpp>
-#include <psk/modulator.hpp>
+#include <libpsk/psk/decoder.hpp>
+#include <libpsk/psk/modulator.hpp>
 #include <functional>
-#include <codec/trx_device_base.hpp>
-#include <port/pulse/pulse_device.hpp>
+#include <libpsk/codec/trx_device_base.hpp>
+#include <libpsk/port/pulse/pulse_device.hpp>
 
 #ifndef __arm__
 #include <functional>
@@ -24,7 +24,7 @@ extern "C" {
 }
 #include <pulse/error.h>
 #include <unistd.h>
-#include <ham/ham_digi.hpp>
+#include <libpsk/ham/ham_digi.hpp>
 
 namespace 
 {