diff --git a/LICENSE-dire-wolf.txt b/LICENSE
similarity index 100%
rename from LICENSE-dire-wolf.txt
rename to LICENSE
diff --git a/99-direwolf-cmedia.rules b/conf/99-direwolf-cmedia.rules
similarity index 100%
rename from 99-direwolf-cmedia.rules
rename to conf/99-direwolf-cmedia.rules
diff --git a/direwolf.txt b/conf/direwolf.txt
similarity index 100%
rename from direwolf.txt
rename to conf/direwolf.txt
diff --git a/generic.conf b/conf/generic.conf
similarity index 100%
rename from generic.conf
rename to conf/generic.conf
diff --git a/sdr.conf b/conf/sdr.conf
similarity index 100%
rename from sdr.conf
rename to conf/sdr.conf
diff --git a/symbols-new.txt b/data/symbols-new.txt
similarity index 100%
rename from symbols-new.txt
rename to data/symbols-new.txt
diff --git a/symbolsX.txt b/data/symbolsX.txt
similarity index 100%
rename from symbolsX.txt
rename to data/symbolsX.txt
diff --git a/tocalls.txt b/data/tocalls.txt
similarity index 100%
rename from tocalls.txt
rename to data/tocalls.txt
diff --git a/direwolf.spec b/direwolf.spec
deleted file mode 100644
index 4ac7d46..0000000
--- a/direwolf.spec
+++ /dev/null
@@ -1,103 +0,0 @@
-#%global git_commit b2548ec58f44f4b651626757a166b9f4f18d8000
-%global git_commit 37179479caf0bf36adf8c9bc0fde641884edaeac
-%global git_date 20171216
-
-%global git_short_commit %(echo %{git_commit} | cut -c -8)
-%global git_suffix %{git_date}git%{git_short_commit}
-
-Name:           direwolf
-Version:        1.5Beta
-Release:        1.%{git_suffix}%{?dist}
-Summary:        Soundcard based AX.25 TNC
-
-Group:          Applications/Communications
-License:        GPLv2
-URL:            https://github.com/wb2osz/direwolf
-#Source0:        https://github.com/wb2osz/direwolf/archive/%{name}-%{version}.tar.gz
-Source:         %{name}-%{version}-%{git_suffix}.tgz
-Packager:       David Ranch (KI6ZHD) <dranch@trinnet.net>
-Distribution:   RedHat Linux
-
-Patch0:         direwolf-1.5-makefile.patch
-
-BuildRequires:  automake
-BuildRequires:  alsa-lib-devel
-
-#If the gpsd and gpsd-devel packages are installed, Direwolf will add gps support
-
-
-
-%description
-Dire Wolf is a software "soundcard" modem/TNC and APRS encoder/decoder.   It can 
-be used stand-alone to receive APRS messages, as a digipeater, APRStt gateway, 
-or Internet Gateway (IGate).    It can also be used as a virtual TNC for other 
-applications such as APRSIS32, UI-View32, Xastir, APRS-TW, YAAC, UISS, 
-Linux AX25, SARTrack, RMS Express, and many others.
-
-%prep
-
-%setup -q -n %{name}-%{version}
-%patch0 -p0
-
-%build 
-
-make -f Makefile.linux
-#make -f Makefile.linux tocalls-symbols
-make %{?_smp_mflags}
-
-
-%install
-make install INSTALLDIR=$RPM_BUILD_ROOT/usr
-make install-conf INSTALLDIR=$RPM_BUILD_ROOT/usr
-
-# Install icon
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/direwolf/
-cp dw-icon.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/direwolf/
-mv symbols-new.txt ${RPM_BUILD_ROOT}%{_docdir}/%{name}/
-mv symbolsX.txt ${RPM_BUILD_ROOT}%{_docdir}/%{name}/
-mv tocalls.txt ${RPM_BUILD_ROOT}%{_docdir}/%{name}/
-desktop-file-install \
-        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications direwolf.desktop
-#temp bug
-#non echo "fixing $RPM_BUILD_ROOT/%{_bindir}/bin"
-#non rm -f $RPM_BUILD_ROOT/usr/bin
-
-
-%files
-%{_sysconfdir}/ax25/direwolf.conf
-%{_sysconfdir}/ax25/sdr.conf
-%{_sysconfdir}/ax25/telemetry-toolkit/telem-balloon.conf
-%{_sysconfdir}/ax25/telemetry-toolkit/telem-m0xer-3.txt
-%{_sysconfdir}/ax25/telemetry-toolkit/telem-volts.conf
-%{_sysconfdir}/udev/rules.d/99-direwolf-cmedia.rules
-%{_bindir}/* 
-%{_datadir}/pixmaps/direwolf/dw-icon.png
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/direwolf/*
-%{_docdir}/*
-%{_mandir}/man1/*
-
-
-
-%changelog
-* Sat Dec 16 2017 David Ranch <dranch@trinnet.net> - 1.5-1
-- New 1.5-Beta version from Git 
-* Sun Apr 2 2017 David Ranch <dranch@trinnet.net> - 1.4-1
-- New 1.4-Beta1 version from Git 
-* Sun Mar 5 2017 David Ranch <dranch@trinnet.net> - 1.4-1
-- New 1.4-H Alpha version from Git version
-* Fri Aug 26 2016 David Ranch <dranch@trinnet.net> - 1.4-1
-- New version
-* Fri May 06 2016 David Ranch <dranch@trinnet.net> - 1.3-1
-- New version
-* Sat Sep 12 2015 David Ranch <dranch@trinnet.net> - 1.3F-1
-- New version with new features
-* Sun May 10 2015 David Ranch <dranch@trinnet.net> - 1.2E-1
-- New version that supports a PASSALL function
-- Updated the Makefile.linux patch
-* Sat Mar 21 2015 David Ranch <dranch@trinnet.net> - 1.2C-1
-- changed to support different make installation variable
-* Sat Feb 14 2015 David Ranch <dranch@trinnet.net> - 1.2b-1
-- new spec file
-* Sat Dec 20 2014 David Ranch <dranch@trinnet.net> - 1.1b1-1
-- new spec file
diff --git a/LICENSE-other.txt b/external/LICENSE
similarity index 100%
rename from LICENSE-other.txt
rename to external/LICENSE
diff --git a/geotranz/README-FIRST.txt b/external/geotranz/README-FIRST.txt
similarity index 100%
rename from geotranz/README-FIRST.txt
rename to external/geotranz/README-FIRST.txt
diff --git a/geotranz/error_string.c b/external/geotranz/error_string.c
similarity index 100%
rename from geotranz/error_string.c
rename to external/geotranz/error_string.c
diff --git a/geotranz/error_string.h b/external/geotranz/error_string.h
similarity index 100%
rename from geotranz/error_string.h
rename to external/geotranz/error_string.h
diff --git a/geotranz/mgrs.c b/external/geotranz/mgrs.c
similarity index 100%
rename from geotranz/mgrs.c
rename to external/geotranz/mgrs.c
diff --git a/geotranz/mgrs.h b/external/geotranz/mgrs.h
similarity index 100%
rename from geotranz/mgrs.h
rename to external/geotranz/mgrs.h
diff --git a/geotranz/polarst.c b/external/geotranz/polarst.c
similarity index 100%
rename from geotranz/polarst.c
rename to external/geotranz/polarst.c
diff --git a/geotranz/polarst.h b/external/geotranz/polarst.h
similarity index 100%
rename from geotranz/polarst.h
rename to external/geotranz/polarst.h
diff --git a/geotranz/readme.txt b/external/geotranz/readme.txt
similarity index 100%
rename from geotranz/readme.txt
rename to external/geotranz/readme.txt
diff --git a/geotranz/releasenotes.txt b/external/geotranz/releasenotes.txt
similarity index 100%
rename from geotranz/releasenotes.txt
rename to external/geotranz/releasenotes.txt
diff --git a/geotranz/tranmerc.c b/external/geotranz/tranmerc.c
similarity index 100%
rename from geotranz/tranmerc.c
rename to external/geotranz/tranmerc.c
diff --git a/geotranz/tranmerc.h b/external/geotranz/tranmerc.h
similarity index 100%
rename from geotranz/tranmerc.h
rename to external/geotranz/tranmerc.h
diff --git a/geotranz/ups.c b/external/geotranz/ups.c
similarity index 100%
rename from geotranz/ups.c
rename to external/geotranz/ups.c
diff --git a/geotranz/ups.h b/external/geotranz/ups.h
similarity index 100%
rename from geotranz/ups.h
rename to external/geotranz/ups.h
diff --git a/geotranz/usng.c b/external/geotranz/usng.c
similarity index 100%
rename from geotranz/usng.c
rename to external/geotranz/usng.c
diff --git a/geotranz/usng.h b/external/geotranz/usng.h
similarity index 100%
rename from geotranz/usng.h
rename to external/geotranz/usng.h
diff --git a/geotranz/utm.c b/external/geotranz/utm.c
similarity index 100%
rename from geotranz/utm.c
rename to external/geotranz/utm.c
diff --git a/geotranz/utm.h b/external/geotranz/utm.h
similarity index 100%
rename from geotranz/utm.h
rename to external/geotranz/utm.h
diff --git a/regex/COPYING b/external/regex/COPYING
similarity index 100%
rename from regex/COPYING
rename to external/regex/COPYING
diff --git a/regex/INSTALL b/external/regex/INSTALL
similarity index 100%
rename from regex/INSTALL
rename to external/regex/INSTALL
diff --git a/regex/LICENSES b/external/regex/LICENSES
similarity index 100%
rename from regex/LICENSES
rename to external/regex/LICENSES
diff --git a/regex/NEWS b/external/regex/NEWS
similarity index 100%
rename from regex/NEWS
rename to external/regex/NEWS
diff --git a/regex/README b/external/regex/README
similarity index 100%
rename from regex/README
rename to external/regex/README
diff --git a/regex/README-dire-wolf.txt b/external/regex/README-dire-wolf.txt
similarity index 100%
rename from regex/README-dire-wolf.txt
rename to external/regex/README-dire-wolf.txt
diff --git a/regex/re_comp.h b/external/regex/re_comp.h
similarity index 100%
rename from regex/re_comp.h
rename to external/regex/re_comp.h
diff --git a/regex/regcomp.c b/external/regex/regcomp.c
similarity index 100%
rename from regex/regcomp.c
rename to external/regex/regcomp.c
diff --git a/regex/regex.c b/external/regex/regex.c
similarity index 100%
rename from regex/regex.c
rename to external/regex/regex.c
diff --git a/regex/regex.h b/external/regex/regex.h
similarity index 100%
rename from regex/regex.h
rename to external/regex/regex.h
diff --git a/regex/regex_internal.c b/external/regex/regex_internal.c
similarity index 100%
rename from regex/regex_internal.c
rename to external/regex/regex_internal.c
diff --git a/regex/regex_internal.h b/external/regex/regex_internal.h
similarity index 100%
rename from regex/regex_internal.h
rename to external/regex/regex_internal.h
diff --git a/regex/regexec.c b/external/regex/regexec.c
similarity index 100%
rename from regex/regexec.c
rename to external/regex/regexec.c
diff --git a/man1/aclients.1 b/man/aclients.1
similarity index 100%
rename from man1/aclients.1
rename to man/aclients.1
diff --git a/man1/atest.1 b/man/atest.1
similarity index 100%
rename from man1/atest.1
rename to man/atest.1
diff --git a/man1/decode_aprs.1 b/man/decode_aprs.1
similarity index 100%
rename from man1/decode_aprs.1
rename to man/decode_aprs.1
diff --git a/man1/direwolf.1 b/man/direwolf.1
similarity index 100%
rename from man1/direwolf.1
rename to man/direwolf.1
diff --git a/man1/gen_packets.1 b/man/gen_packets.1
similarity index 100%
rename from man1/gen_packets.1
rename to man/gen_packets.1
diff --git a/man1/kissutil.1 b/man/kissutil.1
similarity index 100%
rename from man1/kissutil.1
rename to man/kissutil.1
diff --git a/man1/ll2utm.1 b/man/ll2utm.1
similarity index 100%
rename from man1/ll2utm.1
rename to man/ll2utm.1
diff --git a/man1/log2gpx.1 b/man/log2gpx.1
similarity index 100%
rename from man1/log2gpx.1
rename to man/log2gpx.1
diff --git a/man1/text2tt.1 b/man/text2tt.1
similarity index 100%
rename from man1/text2tt.1
rename to man/text2tt.1
diff --git a/man1/tt2text.1 b/man/tt2text.1
similarity index 100%
rename from man1/tt2text.1
rename to man/tt2text.1
diff --git a/man1/utm2ll.1 b/man/utm2ll.1
similarity index 100%
rename from man1/utm2ll.1
rename to man/utm2ll.1
diff --git a/dw-start.sh b/scripts/dw-start.sh
similarity index 100%
rename from dw-start.sh
rename to scripts/dw-start.sh
diff --git a/dwespeak.bat b/scripts/dwespeak.bat
similarity index 100%
rename from dwespeak.bat
rename to scripts/dwespeak.bat
diff --git a/dwespeak.sh b/scripts/dwespeak.sh
similarity index 100%
rename from dwespeak.sh
rename to scripts/dwespeak.sh
diff --git a/telemetry-toolkit/telem-balloon.conf b/scripts/telemetry-toolkit/telem-balloon.conf
similarity index 100%
rename from telemetry-toolkit/telem-balloon.conf
rename to scripts/telemetry-toolkit/telem-balloon.conf
diff --git a/telemetry-toolkit/telem-balloon.pl b/scripts/telemetry-toolkit/telem-balloon.pl
similarity index 100%
rename from telemetry-toolkit/telem-balloon.pl
rename to scripts/telemetry-toolkit/telem-balloon.pl
diff --git a/telemetry-toolkit/telem-bits.pl b/scripts/telemetry-toolkit/telem-bits.pl
similarity index 100%
rename from telemetry-toolkit/telem-bits.pl
rename to scripts/telemetry-toolkit/telem-bits.pl
diff --git a/telemetry-toolkit/telem-data.pl b/scripts/telemetry-toolkit/telem-data.pl
similarity index 100%
rename from telemetry-toolkit/telem-data.pl
rename to scripts/telemetry-toolkit/telem-data.pl
diff --git a/telemetry-toolkit/telem-data91.pl b/scripts/telemetry-toolkit/telem-data91.pl
similarity index 100%
rename from telemetry-toolkit/telem-data91.pl
rename to scripts/telemetry-toolkit/telem-data91.pl
diff --git a/telemetry-toolkit/telem-eqns.pl b/scripts/telemetry-toolkit/telem-eqns.pl
similarity index 100%
rename from telemetry-toolkit/telem-eqns.pl
rename to scripts/telemetry-toolkit/telem-eqns.pl
diff --git a/telemetry-toolkit/telem-m0xer-3.txt b/scripts/telemetry-toolkit/telem-m0xer-3.txt
similarity index 100%
rename from telemetry-toolkit/telem-m0xer-3.txt
rename to scripts/telemetry-toolkit/telem-m0xer-3.txt
diff --git a/telemetry-toolkit/telem-parm.pl b/scripts/telemetry-toolkit/telem-parm.pl
similarity index 100%
rename from telemetry-toolkit/telem-parm.pl
rename to scripts/telemetry-toolkit/telem-parm.pl
diff --git a/telemetry-toolkit/telem-seq.sh b/scripts/telemetry-toolkit/telem-seq.sh
similarity index 100%
rename from telemetry-toolkit/telem-seq.sh
rename to scripts/telemetry-toolkit/telem-seq.sh
diff --git a/telemetry-toolkit/telem-unit.pl b/scripts/telemetry-toolkit/telem-unit.pl
similarity index 100%
rename from telemetry-toolkit/telem-unit.pl
rename to scripts/telemetry-toolkit/telem-unit.pl
diff --git a/telemetry-toolkit/telem-volts.conf b/scripts/telemetry-toolkit/telem-volts.conf
similarity index 100%
rename from telemetry-toolkit/telem-volts.conf
rename to scripts/telemetry-toolkit/telem-volts.conf
diff --git a/telemetry-toolkit/telem-volts.py b/scripts/telemetry-toolkit/telem-volts.py
similarity index 100%
rename from telemetry-toolkit/telem-volts.py
rename to scripts/telemetry-toolkit/telem-volts.py
diff --git a/aclients.c b/src/aclients.c
similarity index 100%
rename from aclients.c
rename to src/aclients.c
diff --git a/aprs_tt.c b/src/aprs_tt.c
similarity index 100%
rename from aprs_tt.c
rename to src/aprs_tt.c
diff --git a/aprs_tt.h b/src/aprs_tt.h
similarity index 100%
rename from aprs_tt.h
rename to src/aprs_tt.h
diff --git a/atest.c b/src/atest.c
similarity index 100%
rename from atest.c
rename to src/atest.c
diff --git a/audio.c b/src/audio.c
similarity index 100%
rename from audio.c
rename to src/audio.c
diff --git a/audio.h b/src/audio.h
similarity index 100%
rename from audio.h
rename to src/audio.h
diff --git a/audio_portaudio.c b/src/audio_portaudio.c
similarity index 100%
rename from audio_portaudio.c
rename to src/audio_portaudio.c
diff --git a/audio_stats.c b/src/audio_stats.c
similarity index 100%
rename from audio_stats.c
rename to src/audio_stats.c
diff --git a/audio_stats.h b/src/audio_stats.h
similarity index 100%
rename from audio_stats.h
rename to src/audio_stats.h
diff --git a/audio_win.c b/src/audio_win.c
similarity index 100%
rename from audio_win.c
rename to src/audio_win.c
diff --git a/ax25_link.c b/src/ax25_link.c
similarity index 100%
rename from ax25_link.c
rename to src/ax25_link.c
diff --git a/ax25_link.h b/src/ax25_link.h
similarity index 100%
rename from ax25_link.h
rename to src/ax25_link.h
diff --git a/ax25_pad.c b/src/ax25_pad.c
similarity index 100%
rename from ax25_pad.c
rename to src/ax25_pad.c
diff --git a/ax25_pad.h b/src/ax25_pad.h
similarity index 100%
rename from ax25_pad.h
rename to src/ax25_pad.h
diff --git a/ax25_pad2.c b/src/ax25_pad2.c
similarity index 100%
rename from ax25_pad2.c
rename to src/ax25_pad2.c
diff --git a/ax25_pad2.h b/src/ax25_pad2.h
similarity index 100%
rename from ax25_pad2.h
rename to src/ax25_pad2.h
diff --git a/beacon.c b/src/beacon.c
similarity index 100%
rename from beacon.c
rename to src/beacon.c
diff --git a/beacon.h b/src/beacon.h
similarity index 100%
rename from beacon.h
rename to src/beacon.h
diff --git a/cdigipeater.c b/src/cdigipeater.c
similarity index 100%
rename from cdigipeater.c
rename to src/cdigipeater.c
diff --git a/cdigipeater.h b/src/cdigipeater.h
similarity index 100%
rename from cdigipeater.h
rename to src/cdigipeater.h
diff --git a/cm108.c b/src/cm108.c
similarity index 100%
rename from cm108.c
rename to src/cm108.c
diff --git a/cm108.h b/src/cm108.h
similarity index 100%
rename from cm108.h
rename to src/cm108.h
diff --git a/config.c b/src/config.c
similarity index 100%
rename from config.c
rename to src/config.c
diff --git a/config.h b/src/config.h
similarity index 100%
rename from config.h
rename to src/config.h
diff --git a/decode_aprs.c b/src/decode_aprs.c
similarity index 100%
rename from decode_aprs.c
rename to src/decode_aprs.c
diff --git a/decode_aprs.h b/src/decode_aprs.h
similarity index 100%
rename from decode_aprs.h
rename to src/decode_aprs.h
diff --git a/dedupe.c b/src/dedupe.c
similarity index 100%
rename from dedupe.c
rename to src/dedupe.c
diff --git a/dedupe.h b/src/dedupe.h
similarity index 100%
rename from dedupe.h
rename to src/dedupe.h
diff --git a/demod.c b/src/demod.c
similarity index 100%
rename from demod.c
rename to src/demod.c
diff --git a/demod.h b/src/demod.h
similarity index 100%
rename from demod.h
rename to src/demod.h
diff --git a/demod_9600.c b/src/demod_9600.c
similarity index 100%
rename from demod_9600.c
rename to src/demod_9600.c
diff --git a/demod_9600.h b/src/demod_9600.h
similarity index 100%
rename from demod_9600.h
rename to src/demod_9600.h
diff --git a/demod_afsk.c b/src/demod_afsk.c
similarity index 100%
rename from demod_afsk.c
rename to src/demod_afsk.c
diff --git a/demod_afsk.h b/src/demod_afsk.h
similarity index 100%
rename from demod_afsk.h
rename to src/demod_afsk.h
diff --git a/demod_psk.c b/src/demod_psk.c
similarity index 100%
rename from demod_psk.c
rename to src/demod_psk.c
diff --git a/demod_psk.h b/src/demod_psk.h
similarity index 100%
rename from demod_psk.h
rename to src/demod_psk.h
diff --git a/digipeater.c b/src/digipeater.c
similarity index 100%
rename from digipeater.c
rename to src/digipeater.c
diff --git a/digipeater.h b/src/digipeater.h
similarity index 100%
rename from digipeater.h
rename to src/digipeater.h
diff --git a/direwolf.c b/src/direwolf.c
similarity index 100%
rename from direwolf.c
rename to src/direwolf.c
diff --git a/direwolf.h b/src/direwolf.h
similarity index 100%
rename from direwolf.h
rename to src/direwolf.h
diff --git a/dlq.c b/src/dlq.c
similarity index 100%
rename from dlq.c
rename to src/dlq.c
diff --git a/dlq.h b/src/dlq.h
similarity index 100%
rename from dlq.h
rename to src/dlq.h
diff --git a/dsp.c b/src/dsp.c
similarity index 100%
rename from dsp.c
rename to src/dsp.c
diff --git a/dsp.h b/src/dsp.h
similarity index 100%
rename from dsp.h
rename to src/dsp.h
diff --git a/dtime_now.c b/src/dtime_now.c
similarity index 100%
rename from dtime_now.c
rename to src/dtime_now.c
diff --git a/dtime_now.h b/src/dtime_now.h
similarity index 100%
rename from dtime_now.h
rename to src/dtime_now.h
diff --git a/dtmf.c b/src/dtmf.c
similarity index 100%
rename from dtmf.c
rename to src/dtmf.c
diff --git a/dtmf.h b/src/dtmf.h
similarity index 100%
rename from dtmf.h
rename to src/dtmf.h
diff --git a/dwgps.c b/src/dwgps.c
similarity index 100%
rename from dwgps.c
rename to src/dwgps.c
diff --git a/dwgps.h b/src/dwgps.h
similarity index 100%
rename from dwgps.h
rename to src/dwgps.h
diff --git a/dwgpsd.c b/src/dwgpsd.c
similarity index 100%
rename from dwgpsd.c
rename to src/dwgpsd.c
diff --git a/dwgpsd.h b/src/dwgpsd.h
similarity index 100%
rename from dwgpsd.h
rename to src/dwgpsd.h
diff --git a/dwgpsnmea.c b/src/dwgpsnmea.c
similarity index 100%
rename from dwgpsnmea.c
rename to src/dwgpsnmea.c
diff --git a/dwgpsnmea.h b/src/dwgpsnmea.h
similarity index 100%
rename from dwgpsnmea.h
rename to src/dwgpsnmea.h
diff --git a/dwsock.c b/src/dwsock.c
similarity index 100%
rename from dwsock.c
rename to src/dwsock.c
diff --git a/dwsock.h b/src/dwsock.h
similarity index 100%
rename from dwsock.h
rename to src/dwsock.h
diff --git a/encode_aprs.c b/src/encode_aprs.c
similarity index 100%
rename from encode_aprs.c
rename to src/encode_aprs.c
diff --git a/encode_aprs.h b/src/encode_aprs.h
similarity index 100%
rename from encode_aprs.h
rename to src/encode_aprs.h
diff --git a/fcs_calc.c b/src/fcs_calc.c
similarity index 100%
rename from fcs_calc.c
rename to src/fcs_calc.c
diff --git a/fcs_calc.h b/src/fcs_calc.h
similarity index 100%
rename from fcs_calc.h
rename to src/fcs_calc.h
diff --git a/fsk_demod_agc.h b/src/fsk_demod_agc.h
similarity index 100%
rename from fsk_demod_agc.h
rename to src/fsk_demod_agc.h
diff --git a/fsk_demod_state.h b/src/fsk_demod_state.h
similarity index 100%
rename from fsk_demod_state.h
rename to src/fsk_demod_state.h
diff --git a/fsk_filters.h b/src/fsk_filters.h
similarity index 100%
rename from fsk_filters.h
rename to src/fsk_filters.h
diff --git a/fsk_gen_filter.h b/src/fsk_gen_filter.h
similarity index 100%
rename from fsk_gen_filter.h
rename to src/fsk_gen_filter.h
diff --git a/gen_packets.c b/src/gen_packets.c
similarity index 100%
rename from gen_packets.c
rename to src/gen_packets.c
diff --git a/gen_tone.c b/src/gen_tone.c
similarity index 100%
rename from gen_tone.c
rename to src/gen_tone.c
diff --git a/gen_tone.h b/src/gen_tone.h
similarity index 100%
rename from gen_tone.h
rename to src/gen_tone.h
diff --git a/grm_sym.h b/src/grm_sym.h
similarity index 100%
rename from grm_sym.h
rename to src/grm_sym.h
diff --git a/hdlc_rec.c b/src/hdlc_rec.c
similarity index 100%
rename from hdlc_rec.c
rename to src/hdlc_rec.c
diff --git a/hdlc_rec.h b/src/hdlc_rec.h
similarity index 100%
rename from hdlc_rec.h
rename to src/hdlc_rec.h
diff --git a/hdlc_rec2.c b/src/hdlc_rec2.c
similarity index 100%
rename from hdlc_rec2.c
rename to src/hdlc_rec2.c
diff --git a/hdlc_rec2.h b/src/hdlc_rec2.h
similarity index 100%
rename from hdlc_rec2.h
rename to src/hdlc_rec2.h
diff --git a/hdlc_send.c b/src/hdlc_send.c
similarity index 100%
rename from hdlc_send.c
rename to src/hdlc_send.c
diff --git a/hdlc_send.h b/src/hdlc_send.h
similarity index 100%
rename from hdlc_send.h
rename to src/hdlc_send.h
diff --git a/igate.c b/src/igate.c
similarity index 100%
rename from igate.c
rename to src/igate.c
diff --git a/igate.h b/src/igate.h
similarity index 100%
rename from igate.h
rename to src/igate.h
diff --git a/kiss.c b/src/kiss.c
similarity index 100%
rename from kiss.c
rename to src/kiss.c
diff --git a/kiss.h b/src/kiss.h
similarity index 100%
rename from kiss.h
rename to src/kiss.h
diff --git a/kiss_frame.c b/src/kiss_frame.c
similarity index 100%
rename from kiss_frame.c
rename to src/kiss_frame.c
diff --git a/kiss_frame.h b/src/kiss_frame.h
similarity index 100%
rename from kiss_frame.h
rename to src/kiss_frame.h
diff --git a/kissnet.c b/src/kissnet.c
similarity index 100%
rename from kissnet.c
rename to src/kissnet.c
diff --git a/kissnet.h b/src/kissnet.h
similarity index 100%
rename from kissnet.h
rename to src/kissnet.h
diff --git a/kissserial.c b/src/kissserial.c
similarity index 100%
rename from kissserial.c
rename to src/kissserial.c
diff --git a/kissserial.h b/src/kissserial.h
similarity index 100%
rename from kissserial.h
rename to src/kissserial.h
diff --git a/kissutil.c b/src/kissutil.c
similarity index 100%
rename from kissutil.c
rename to src/kissutil.c
diff --git a/latlong.c b/src/latlong.c
similarity index 100%
rename from latlong.c
rename to src/latlong.c
diff --git a/latlong.h b/src/latlong.h
similarity index 100%
rename from latlong.h
rename to src/latlong.h
diff --git a/ll2utm.c b/src/ll2utm.c
similarity index 100%
rename from ll2utm.c
rename to src/ll2utm.c
diff --git a/log.c b/src/log.c
similarity index 100%
rename from log.c
rename to src/log.c
diff --git a/log.h b/src/log.h
similarity index 100%
rename from log.h
rename to src/log.h
diff --git a/log2gpx.c b/src/log2gpx.c
similarity index 100%
rename from log2gpx.c
rename to src/log2gpx.c
diff --git a/mgn_icon.h b/src/mgn_icon.h
similarity index 100%
rename from mgn_icon.h
rename to src/mgn_icon.h
diff --git a/mheard.c b/src/mheard.c
similarity index 100%
rename from mheard.c
rename to src/mheard.c
diff --git a/mheard.h b/src/mheard.h
similarity index 100%
rename from mheard.h
rename to src/mheard.h
diff --git a/misc/README-dire-wolf.txt b/src/misc/README-dire-wolf.txt
similarity index 100%
rename from misc/README-dire-wolf.txt
rename to src/misc/README-dire-wolf.txt
diff --git a/misc/strcasestr.c b/src/misc/strcasestr.c
similarity index 100%
rename from misc/strcasestr.c
rename to src/misc/strcasestr.c
diff --git a/misc/strlcat.c b/src/misc/strlcat.c
similarity index 100%
rename from misc/strlcat.c
rename to src/misc/strlcat.c
diff --git a/misc/strlcpy.c b/src/misc/strlcpy.c
similarity index 100%
rename from misc/strlcpy.c
rename to src/misc/strlcpy.c
diff --git a/misc/strsep.c b/src/misc/strsep.c
similarity index 100%
rename from misc/strsep.c
rename to src/misc/strsep.c
diff --git a/misc/strtok_r.c b/src/misc/strtok_r.c
similarity index 100%
rename from misc/strtok_r.c
rename to src/misc/strtok_r.c
diff --git a/morse.c b/src/morse.c
similarity index 100%
rename from morse.c
rename to src/morse.c
diff --git a/morse.h b/src/morse.h
similarity index 100%
rename from morse.h
rename to src/morse.h
diff --git a/multi_modem.c b/src/multi_modem.c
similarity index 100%
rename from multi_modem.c
rename to src/multi_modem.c
diff --git a/multi_modem.h b/src/multi_modem.h
similarity index 100%
rename from multi_modem.h
rename to src/multi_modem.h
diff --git a/pfilter.c b/src/pfilter.c
similarity index 100%
rename from pfilter.c
rename to src/pfilter.c
diff --git a/pfilter.h b/src/pfilter.h
similarity index 100%
rename from pfilter.h
rename to src/pfilter.h
diff --git a/ptt.c b/src/ptt.c
similarity index 100%
rename from ptt.c
rename to src/ptt.c
diff --git a/ptt.h b/src/ptt.h
similarity index 100%
rename from ptt.h
rename to src/ptt.h
diff --git a/rdq.c b/src/rdq.c
similarity index 100%
rename from rdq.c
rename to src/rdq.c
diff --git a/rdq.h b/src/rdq.h
similarity index 100%
rename from rdq.h
rename to src/rdq.h
diff --git a/recv.c b/src/recv.c
similarity index 100%
rename from recv.c
rename to src/recv.c
diff --git a/recv.h b/src/recv.h
similarity index 100%
rename from recv.h
rename to src/recv.h
diff --git a/redecode.h b/src/redecode.h
similarity index 100%
rename from redecode.h
rename to src/redecode.h
diff --git a/rpack.h b/src/rpack.h
similarity index 100%
rename from rpack.h
rename to src/rpack.h
diff --git a/rrbb.c b/src/rrbb.c
similarity index 100%
rename from rrbb.c
rename to src/rrbb.c
diff --git a/rrbb.h b/src/rrbb.h
similarity index 100%
rename from rrbb.h
rename to src/rrbb.h
diff --git a/serial_port.c b/src/serial_port.c
similarity index 100%
rename from serial_port.c
rename to src/serial_port.c
diff --git a/serial_port.h b/src/serial_port.h
similarity index 100%
rename from serial_port.h
rename to src/serial_port.h
diff --git a/server.c b/src/server.c
similarity index 100%
rename from server.c
rename to src/server.c
diff --git a/server.h b/src/server.h
similarity index 100%
rename from server.h
rename to src/server.h
diff --git a/symbols.c b/src/symbols.c
similarity index 100%
rename from symbols.c
rename to src/symbols.c
diff --git a/symbols.h b/src/symbols.h
similarity index 100%
rename from symbols.h
rename to src/symbols.h
diff --git a/telemetry.c b/src/telemetry.c
similarity index 100%
rename from telemetry.c
rename to src/telemetry.c
diff --git a/telemetry.h b/src/telemetry.h
similarity index 100%
rename from telemetry.h
rename to src/telemetry.h
diff --git a/textcolor.c b/src/textcolor.c
similarity index 100%
rename from textcolor.c
rename to src/textcolor.c
diff --git a/textcolor.h b/src/textcolor.h
similarity index 100%
rename from textcolor.h
rename to src/textcolor.h
diff --git a/tq.c b/src/tq.c
similarity index 100%
rename from tq.c
rename to src/tq.c
diff --git a/tq.h b/src/tq.h
similarity index 100%
rename from tq.h
rename to src/tq.h
diff --git a/tt_text.c b/src/tt_text.c
similarity index 100%
rename from tt_text.c
rename to src/tt_text.c
diff --git a/tt_text.h b/src/tt_text.h
similarity index 100%
rename from tt_text.h
rename to src/tt_text.h
diff --git a/tt_user.c b/src/tt_user.c
similarity index 100%
rename from tt_user.c
rename to src/tt_user.c
diff --git a/tt_user.h b/src/tt_user.h
similarity index 100%
rename from tt_user.h
rename to src/tt_user.h
diff --git a/ttcalc.c b/src/ttcalc.c
similarity index 100%
rename from ttcalc.c
rename to src/ttcalc.c
diff --git a/tune.h b/src/tune.h
similarity index 100%
rename from tune.h
rename to src/tune.h
diff --git a/utm2ll.c b/src/utm2ll.c
similarity index 100%
rename from utm2ll.c
rename to src/utm2ll.c
diff --git a/version.h b/src/version.h
similarity index 100%
rename from version.h
rename to src/version.h
diff --git a/walk96.c b/src/walk96.c
similarity index 100%
rename from walk96.c
rename to src/walk96.c
diff --git a/waypoint.c b/src/waypoint.c
similarity index 100%
rename from waypoint.c
rename to src/waypoint.c
diff --git a/waypoint.h b/src/waypoint.h
similarity index 100%
rename from waypoint.h
rename to src/waypoint.h
diff --git a/xid.c b/src/xid.c
similarity index 100%
rename from xid.c
rename to src/xid.c
diff --git a/xid.h b/src/xid.h
similarity index 100%
rename from xid.h
rename to src/xid.h
diff --git a/xmit.c b/src/xmit.c
similarity index 100%
rename from xmit.c
rename to src/xmit.c
diff --git a/xmit.h b/src/xmit.h
similarity index 100%
rename from xmit.h
rename to src/xmit.h