diff --git a/library.properties b/library.properties
new file mode 100644
index 000000000..80146fb3c
--- /dev/null
+++ b/library.properties
@@ -0,0 +1,9 @@
+name=Embedded Template Library
+version=8.0.0
+author= John Wellbelove <john.wellbelove@etlcpp.com>
+maintainer=John Wellbelove <john.wellbelove@etlcpp.com>
+sentence=A C++ template library tailored for embedded systems.
+paragraph=Requires some support from STL. See http://andybrown.me.uk/2011/01/15/the-standard-template-library-stl-for-avr-with-c-streams/
+category=Other
+url=http://www.etlcpp.com/
+architectures=* 
diff --git a/algorithm.h b/src/algorithm.h
similarity index 100%
rename from algorithm.h
rename to src/algorithm.h
diff --git a/alignment.h b/src/alignment.h
similarity index 100%
rename from alignment.h
rename to src/alignment.h
diff --git a/array.h b/src/array.h
similarity index 100%
rename from array.h
rename to src/array.h
diff --git a/basic_string.h b/src/basic_string.h
similarity index 100%
rename from basic_string.h
rename to src/basic_string.h
diff --git a/binary.h b/src/binary.h
similarity index 100%
rename from binary.h
rename to src/binary.h
diff --git a/bitset.h b/src/bitset.h
similarity index 100%
rename from bitset.h
rename to src/bitset.h
diff --git a/bloom_filter.h b/src/bloom_filter.h
similarity index 100%
rename from bloom_filter.h
rename to src/bloom_filter.h
diff --git a/char_traits.h b/src/char_traits.h
similarity index 100%
rename from char_traits.h
rename to src/char_traits.h
diff --git a/checksum.h b/src/checksum.h
similarity index 100%
rename from checksum.h
rename to src/checksum.h
diff --git a/container.h b/src/container.h
similarity index 100%
rename from container.h
rename to src/container.h
diff --git a/crc16.cpp b/src/crc16.cpp
similarity index 100%
rename from crc16.cpp
rename to src/crc16.cpp
diff --git a/crc16.h b/src/crc16.h
similarity index 100%
rename from crc16.h
rename to src/crc16.h
diff --git a/crc16_ccitt.cpp b/src/crc16_ccitt.cpp
similarity index 100%
rename from crc16_ccitt.cpp
rename to src/crc16_ccitt.cpp
diff --git a/crc16_ccitt.h b/src/crc16_ccitt.h
similarity index 100%
rename from crc16_ccitt.h
rename to src/crc16_ccitt.h
diff --git a/crc16_kermit.cpp b/src/crc16_kermit.cpp
similarity index 100%
rename from crc16_kermit.cpp
rename to src/crc16_kermit.cpp
diff --git a/crc16_kermit.h b/src/crc16_kermit.h
similarity index 100%
rename from crc16_kermit.h
rename to src/crc16_kermit.h
diff --git a/crc32.cpp b/src/crc32.cpp
similarity index 100%
rename from crc32.cpp
rename to src/crc32.cpp
diff --git a/crc32.h b/src/crc32.h
similarity index 100%
rename from crc32.h
rename to src/crc32.h
diff --git a/crc64_ecma.cpp b/src/crc64_ecma.cpp
similarity index 100%
rename from crc64_ecma.cpp
rename to src/crc64_ecma.cpp
diff --git a/crc64_ecma.h b/src/crc64_ecma.h
similarity index 100%
rename from crc64_ecma.h
rename to src/crc64_ecma.h
diff --git a/crc8_ccitt.cpp b/src/crc8_ccitt.cpp
similarity index 100%
rename from crc8_ccitt.cpp
rename to src/crc8_ccitt.cpp
diff --git a/crc8_ccitt.h b/src/crc8_ccitt.h
similarity index 100%
rename from crc8_ccitt.h
rename to src/crc8_ccitt.h
diff --git a/cyclic_hash.h b/src/cyclic_hash.h
similarity index 100%
rename from cyclic_hash.h
rename to src/cyclic_hash.h
diff --git a/cyclic_value.h b/src/cyclic_value.h
similarity index 100%
rename from cyclic_value.h
rename to src/cyclic_value.h
diff --git a/deque.h b/src/deque.h
similarity index 100%
rename from deque.h
rename to src/deque.h
diff --git a/doxygen.h b/src/doxygen.h
similarity index 100%
rename from doxygen.h
rename to src/doxygen.h
diff --git a/endian.h b/src/endian.h
similarity index 100%
rename from endian.h
rename to src/endian.h
diff --git a/enum_type.h b/src/enum_type.h
similarity index 100%
rename from enum_type.h
rename to src/enum_type.h
diff --git a/error_handler.cpp b/src/error_handler.cpp
similarity index 100%
rename from error_handler.cpp
rename to src/error_handler.cpp
diff --git a/error_handler.h b/src/error_handler.h
similarity index 100%
rename from error_handler.h
rename to src/error_handler.h
diff --git a/etl_arduino.h b/src/etl_arduino.h
similarity index 100%
rename from etl_arduino.h
rename to src/etl_arduino.h
diff --git a/exception.h b/src/exception.h
similarity index 100%
rename from exception.h
rename to src/exception.h
diff --git a/factorial.h b/src/factorial.h
similarity index 100%
rename from factorial.h
rename to src/factorial.h
diff --git a/fibonacci.h b/src/fibonacci.h
similarity index 100%
rename from fibonacci.h
rename to src/fibonacci.h
diff --git a/fixed_iterator.h b/src/fixed_iterator.h
similarity index 100%
rename from fixed_iterator.h
rename to src/fixed_iterator.h
diff --git a/flat_map.h b/src/flat_map.h
similarity index 100%
rename from flat_map.h
rename to src/flat_map.h
diff --git a/flat_multimap.h b/src/flat_multimap.h
similarity index 100%
rename from flat_multimap.h
rename to src/flat_multimap.h
diff --git a/flat_multiset.h b/src/flat_multiset.h
similarity index 100%
rename from flat_multiset.h
rename to src/flat_multiset.h
diff --git a/flat_set.h b/src/flat_set.h
similarity index 100%
rename from flat_set.h
rename to src/flat_set.h
diff --git a/fnv_1.h b/src/fnv_1.h
similarity index 100%
rename from fnv_1.h
rename to src/fnv_1.h
diff --git a/forward_list.h b/src/forward_list.h
similarity index 100%
rename from forward_list.h
rename to src/forward_list.h
diff --git a/frame_check_sequence.h b/src/frame_check_sequence.h
similarity index 100%
rename from frame_check_sequence.h
rename to src/frame_check_sequence.h
diff --git a/function.h b/src/function.h
similarity index 100%
rename from function.h
rename to src/function.h
diff --git a/functional.h b/src/functional.h
similarity index 100%
rename from functional.h
rename to src/functional.h
diff --git a/hash.h b/src/hash.h
similarity index 100%
rename from hash.h
rename to src/hash.h
diff --git a/ibitset.h b/src/ibitset.h
similarity index 100%
rename from ibitset.h
rename to src/ibitset.h
diff --git a/ideque.h b/src/ideque.h
similarity index 100%
rename from ideque.h
rename to src/ideque.h
diff --git a/iflat_map.h b/src/iflat_map.h
similarity index 100%
rename from iflat_map.h
rename to src/iflat_map.h
diff --git a/iflat_multimap.h b/src/iflat_multimap.h
similarity index 100%
rename from iflat_multimap.h
rename to src/iflat_multimap.h
diff --git a/iflat_multiset.h b/src/iflat_multiset.h
similarity index 100%
rename from iflat_multiset.h
rename to src/iflat_multiset.h
diff --git a/iflat_set.h b/src/iflat_set.h
similarity index 100%
rename from iflat_set.h
rename to src/iflat_set.h
diff --git a/iforward_list.h b/src/iforward_list.h
similarity index 100%
rename from iforward_list.h
rename to src/iforward_list.h
diff --git a/ihash.h b/src/ihash.h
similarity index 100%
rename from ihash.h
rename to src/ihash.h
diff --git a/ilist.h b/src/ilist.h
similarity index 100%
rename from ilist.h
rename to src/ilist.h
diff --git a/imap.h b/src/imap.h
similarity index 100%
rename from imap.h
rename to src/imap.h
diff --git a/imultimap.h b/src/imultimap.h
similarity index 100%
rename from imultimap.h
rename to src/imultimap.h
diff --git a/imultiset.h b/src/imultiset.h
similarity index 100%
rename from imultiset.h
rename to src/imultiset.h
diff --git a/instance_count.h b/src/instance_count.h
similarity index 100%
rename from instance_count.h
rename to src/instance_count.h
diff --git a/integral_limits.h b/src/integral_limits.h
similarity index 100%
rename from integral_limits.h
rename to src/integral_limits.h
diff --git a/intrusive_forward_list.h b/src/intrusive_forward_list.h
similarity index 100%
rename from intrusive_forward_list.h
rename to src/intrusive_forward_list.h
diff --git a/intrusive_forward_list_link.h b/src/intrusive_forward_list_link.h
similarity index 100%
rename from intrusive_forward_list_link.h
rename to src/intrusive_forward_list_link.h
diff --git a/intrusive_links.h b/src/intrusive_links.h
similarity index 100%
rename from intrusive_links.h
rename to src/intrusive_links.h
diff --git a/intrusive_list.h b/src/intrusive_list.h
similarity index 100%
rename from intrusive_list.h
rename to src/intrusive_list.h
diff --git a/io_port.h b/src/io_port.h
similarity index 100%
rename from io_port.h
rename to src/io_port.h
diff --git a/ipool.h b/src/ipool.h
similarity index 100%
rename from ipool.h
rename to src/ipool.h
diff --git a/ipriority_queue.h b/src/ipriority_queue.h
similarity index 99%
rename from ipriority_queue.h
rename to src/ipriority_queue.h
index 0cd405785..fd3cb8324 100644
--- a/ipriority_queue.h
+++ b/src/ipriority_queue.h
@@ -37,15 +37,13 @@ SOFTWARE.
 #include "type_traits.h"
 #include "parameter_type.h"
 #include "error_handler.h"
-
-namespace etl
-{
-#include "../exception.h"
-#include "../error_handler.h"
+#include "exception.h"
 
 #undef ETL_FILE
 #define ETL_FILE "12"
 
+namespace etl
+{
   //***************************************************************************
   /// The base class for priority_queue exceptions.
   ///\ingroup queue
diff --git a/iqueue.h b/src/iqueue.h
similarity index 100%
rename from iqueue.h
rename to src/iqueue.h
diff --git a/iset.h b/src/iset.h
similarity index 100%
rename from iset.h
rename to src/iset.h
diff --git a/istack.h b/src/istack.h
similarity index 100%
rename from istack.h
rename to src/istack.h
diff --git a/iunordered_map.h b/src/iunordered_map.h
similarity index 100%
rename from iunordered_map.h
rename to src/iunordered_map.h
diff --git a/iunordered_multimap.h b/src/iunordered_multimap.h
similarity index 100%
rename from iunordered_multimap.h
rename to src/iunordered_multimap.h
diff --git a/iunordered_multiset.h b/src/iunordered_multiset.h
similarity index 100%
rename from iunordered_multiset.h
rename to src/iunordered_multiset.h
diff --git a/iunordered_set.h b/src/iunordered_set.h
similarity index 100%
rename from iunordered_set.h
rename to src/iunordered_set.h
diff --git a/ivector.h b/src/ivector.h
similarity index 100%
rename from ivector.h
rename to src/ivector.h
diff --git a/jenkins.h b/src/jenkins.h
similarity index 100%
rename from jenkins.h
rename to src/jenkins.h
diff --git a/largest.h b/src/largest.h
similarity index 100%
rename from largest.h
rename to src/largest.h
diff --git a/list.h b/src/list.h
similarity index 100%
rename from list.h
rename to src/list.h
diff --git a/log.h b/src/log.h
similarity index 100%
rename from log.h
rename to src/log.h
diff --git a/map.h b/src/map.h
similarity index 100%
rename from map.h
rename to src/map.h
diff --git a/multimap.h b/src/multimap.h
similarity index 100%
rename from multimap.h
rename to src/multimap.h
diff --git a/multiset.h b/src/multiset.h
similarity index 100%
rename from multiset.h
rename to src/multiset.h
diff --git a/murmur3.h b/src/murmur3.h
similarity index 100%
rename from murmur3.h
rename to src/murmur3.h
diff --git a/nullptr.h b/src/nullptr.h
similarity index 100%
rename from nullptr.h
rename to src/nullptr.h
diff --git a/numeric.h b/src/numeric.h
similarity index 100%
rename from numeric.h
rename to src/numeric.h
diff --git a/observer.h b/src/observer.h
similarity index 100%
rename from observer.h
rename to src/observer.h
diff --git a/optional.h b/src/optional.h
similarity index 100%
rename from optional.h
rename to src/optional.h
diff --git a/parameter_type.h b/src/parameter_type.h
similarity index 100%
rename from parameter_type.h
rename to src/parameter_type.h
diff --git a/pearson.cpp b/src/pearson.cpp
similarity index 100%
rename from pearson.cpp
rename to src/pearson.cpp
diff --git a/pearson.h b/src/pearson.h
similarity index 100%
rename from pearson.h
rename to src/pearson.h
diff --git a/pool.h b/src/pool.h
similarity index 100%
rename from pool.h
rename to src/pool.h
diff --git a/power.h b/src/power.h
similarity index 100%
rename from power.h
rename to src/power.h
diff --git a/priority_queue.h b/src/priority_queue.h
similarity index 100%
rename from priority_queue.h
rename to src/priority_queue.h
diff --git a/private/deque_base.h b/src/private/deque_base.h
similarity index 100%
rename from private/deque_base.h
rename to src/private/deque_base.h
diff --git a/private/flat_map_base.h b/src/private/flat_map_base.h
similarity index 100%
rename from private/flat_map_base.h
rename to src/private/flat_map_base.h
diff --git a/private/flat_multimap_base.h b/src/private/flat_multimap_base.h
similarity index 100%
rename from private/flat_multimap_base.h
rename to src/private/flat_multimap_base.h
diff --git a/private/flat_multiset_base.h b/src/private/flat_multiset_base.h
similarity index 100%
rename from private/flat_multiset_base.h
rename to src/private/flat_multiset_base.h
diff --git a/private/flat_set_base.h b/src/private/flat_set_base.h
similarity index 100%
rename from private/flat_set_base.h
rename to src/private/flat_set_base.h
diff --git a/private/forward_list_base.h b/src/private/forward_list_base.h
similarity index 100%
rename from private/forward_list_base.h
rename to src/private/forward_list_base.h
diff --git a/private/list_base.h b/src/private/list_base.h
similarity index 100%
rename from private/list_base.h
rename to src/private/list_base.h
diff --git a/private/map_base.h b/src/private/map_base.h
similarity index 100%
rename from private/map_base.h
rename to src/private/map_base.h
diff --git a/private/multimap_base.h b/src/private/multimap_base.h
similarity index 100%
rename from private/multimap_base.h
rename to src/private/multimap_base.h
diff --git a/private/multiset_base.h b/src/private/multiset_base.h
similarity index 100%
rename from private/multiset_base.h
rename to src/private/multiset_base.h
diff --git a/private/pool_base.h b/src/private/pool_base.h
similarity index 100%
rename from private/pool_base.h
rename to src/private/pool_base.h
diff --git a/private/queue_base.h b/src/private/queue_base.h
similarity index 100%
rename from private/queue_base.h
rename to src/private/queue_base.h
diff --git a/private/set_base.h b/src/private/set_base.h
similarity index 100%
rename from private/set_base.h
rename to src/private/set_base.h
diff --git a/private/stack_base.h b/src/private/stack_base.h
similarity index 100%
rename from private/stack_base.h
rename to src/private/stack_base.h
diff --git a/private/vector_base.h b/src/private/vector_base.h
similarity index 100%
rename from private/vector_base.h
rename to src/private/vector_base.h
diff --git a/queue.h b/src/queue.h
similarity index 100%
rename from queue.h
rename to src/queue.h
diff --git a/radix.h b/src/radix.h
similarity index 100%
rename from radix.h
rename to src/radix.h
diff --git a/set.h b/src/set.h
similarity index 100%
rename from set.h
rename to src/set.h
diff --git a/smallest.h b/src/smallest.h
similarity index 100%
rename from smallest.h
rename to src/smallest.h
diff --git a/stack.h b/src/stack.h
similarity index 100%
rename from stack.h
rename to src/stack.h
diff --git a/static_assert.h b/src/static_assert.h
similarity index 100%
rename from static_assert.h
rename to src/static_assert.h
diff --git a/type_traits.h b/src/type_traits.h
similarity index 100%
rename from type_traits.h
rename to src/type_traits.h
diff --git a/unordered_map.h b/src/unordered_map.h
similarity index 100%
rename from unordered_map.h
rename to src/unordered_map.h
diff --git a/unordered_multimap.h b/src/unordered_multimap.h
similarity index 100%
rename from unordered_multimap.h
rename to src/unordered_multimap.h
diff --git a/unordered_multiset.h b/src/unordered_multiset.h
similarity index 100%
rename from unordered_multiset.h
rename to src/unordered_multiset.h
diff --git a/unordered_set.h b/src/unordered_set.h
similarity index 100%
rename from unordered_set.h
rename to src/unordered_set.h
diff --git a/variant.h b/src/variant.h
similarity index 100%
rename from variant.h
rename to src/variant.h
diff --git a/vector.h b/src/vector.h
similarity index 100%
rename from vector.h
rename to src/vector.h
diff --git a/visitor.h b/src/visitor.h
similarity index 100%
rename from visitor.h
rename to src/visitor.h
diff --git a/test/test_algorithm.cpp b/test/test_algorithm.cpp
index 149bb3491..2fa70b68e 100644
--- a/test/test_algorithm.cpp
+++ b/test/test_algorithm.cpp
@@ -28,8 +28,8 @@ SOFTWARE.
 
 #include <UnitTest++/UnitTest++.h>
 
-#include "../algorithm.h"
-#include "../container.h"
+#include "../src/algorithm.h"
+#include "../src/container.h"
 
 #include <vector>
 #include <algorithm>
diff --git a/test/test_alignment.cpp b/test/test_alignment.cpp
index 45d0e8dcd..ed90a9528 100644
--- a/test/test_alignment.cpp
+++ b/test/test_alignment.cpp
@@ -28,8 +28,8 @@ SOFTWARE.
 
 #include <UnitTest++/UnitTest++.h>
 
-#include "../alignment.h"
-#include "../type_traits.h"
+#include "../src/alignment.h"
+#include "../src/type_traits.h"
 
 #include <type_traits>
 #include <utility>
diff --git a/test/test_array.cpp b/test/test_array.cpp
index c521518cd..527e83438 100644
--- a/test/test_array.cpp
+++ b/test/test_array.cpp
@@ -28,13 +28,13 @@ SOFTWARE.
 
 #include <UnitTest++/UnitTest++.h>
 
-#include "../array.h"
+#include "../src/array.h"
 
 #include <array>
 #include <algorithm>
 #include <iterator>
 
-#include "../integral_limits.h"
+#include "../src/integral_limits.h"
 
 namespace
 {
diff --git a/test/test_binary.cpp b/test/test_binary.cpp
index 238f7b9b1..e2f2549f1 100644
--- a/test/test_binary.cpp
+++ b/test/test_binary.cpp
@@ -31,10 +31,10 @@ SOFTWARE.
 #include <cstdint>
 #include <type_traits>
 
-#include "../binary.h"
-#include "../bitset.h"
-#include "../fnv_1.h"
-#include "../integral_limits.h"
+#include "../src/binary.h"
+#include "../src/bitset.h"
+#include "../src/fnv_1.h"
+#include "../src/integral_limits.h"
 
 #undef max
 
diff --git a/test/test_bitset.cpp b/test/test_bitset.cpp
index b21cd6fd6..a0ce46a4d 100644
--- a/test/test_bitset.cpp
+++ b/test/test_bitset.cpp
@@ -34,7 +34,7 @@ SOFTWARE.
 
 #define ETL_IN_UNIT_TEST
 
-#include "../bitset.h"
+#include "../src/bitset.h"
 
 #undef min
 #undef max
diff --git a/test/test_bloom_filter.cpp b/test/test_bloom_filter.cpp
index c5831bdd4..46341f123 100644
--- a/test/test_bloom_filter.cpp
+++ b/test/test_bloom_filter.cpp
@@ -31,12 +31,12 @@ SOFTWARE.
 #include <stdlib.h>
 #include <vector>
 
-#include "../bloom_filter.h"
+#include "../src/bloom_filter.h"
 
-#include "../fnv_1.h"
-#include "../crc16.h"
-#include "../crc16_ccitt.h"
-#include "../crc32.h"
+#include "../src/fnv_1.h"
+#include "../src/crc16.h"
+#include "../src/crc16_ccitt.h"
+#include "../src/crc32.h"
 
 struct hash1_t
 {
diff --git a/test/test_bsd_checksum.cpp b/test/test_bsd_checksum.cpp
index 9c209da19..6f17c0aec 100644
--- a/test/test_bsd_checksum.cpp
+++ b/test/test_bsd_checksum.cpp
@@ -33,7 +33,7 @@ SOFTWARE.
 #include <vector>
 #include <stdint.h>
 
-#include "../checksum.h"
+#include "../src/checksum.h"
 
 namespace
 {
diff --git a/test/test_checksum.cpp b/test/test_checksum.cpp
index 03ec5b5ec..5e42acfdc 100644
--- a/test/test_checksum.cpp
+++ b/test/test_checksum.cpp
@@ -33,8 +33,8 @@ SOFTWARE.
 #include <vector>
 #include <stdint.h>
 
-#include "../checksum.h"
-#include "../endian.h"
+#include "../src/checksum.h"
+#include "../src/endian.h"
 
 namespace
 {		
diff --git a/test/test_container.cpp b/test/test_container.cpp
index 6d86e82ae..7aebb06e8 100644
--- a/test/test_container.cpp
+++ b/test/test_container.cpp
@@ -28,7 +28,7 @@ SOFTWARE.
 
 #include <UnitTest++/UnitTest++.h>
 
-#include "../container.h"
+#include "../src/container.h"
 
 #include <list>
 
diff --git a/test/test_crc.cpp b/test/test_crc.cpp
index dec4924b2..3cc888b9a 100644
--- a/test/test_crc.cpp
+++ b/test/test_crc.cpp
@@ -33,12 +33,12 @@ SOFTWARE.
 #include <vector>
 #include <stdint.h>
 
-#include "../crc8_ccitt.h"
-#include "../crc16.h"
-#include "../crc16_ccitt.h"
-#include "../crc16_kermit.h"
-#include "../crc32.h"
-#include "../crc64_ecma.h"
+#include "../src/crc8_ccitt.h"
+#include "../src/crc16.h"
+#include "../src/crc16_ccitt.h"
+#include "../src/crc16_kermit.h"
+#include "../src/crc32.h"
+#include "../src/crc64_ecma.h"
 
 namespace
 {
diff --git a/test/test_cyclic_value.cpp b/test/test_cyclic_value.cpp
index a81df3040..d36791ff5 100644
--- a/test/test_cyclic_value.cpp
+++ b/test/test_cyclic_value.cpp
@@ -30,7 +30,7 @@ SOFTWARE.
 
 #include <UnitTest++/UnitTest++.h>
 
-#include "../cyclic_value.h"
+#include "../src/cyclic_value.h"
 
 namespace
 {		
diff --git a/test/test_deque.cpp b/test/test_deque.cpp
index f577a5cfd..5d1400407 100644
--- a/test/test_deque.cpp
+++ b/test/test_deque.cpp
@@ -29,7 +29,7 @@ SOFTWARE.
 #include <UnitTest++/UnitTest++.h>
 #include "ExtraCheckMacros.h"
 
-#include "../deque.h"
+#include "../src/deque.h"
 
 #include "data.h"
 
diff --git a/test/test_endian.cpp b/test/test_endian.cpp
index a08f78edf..aec8740c2 100644
--- a/test/test_endian.cpp
+++ b/test/test_endian.cpp
@@ -29,7 +29,7 @@ SOFTWARE.
 #include <UnitTest++/UnitTest++.h>
 #include <string>
 
-#include "../endian.h"
+#include "../src/endian.h"
 
 namespace 
 {		
diff --git a/test/test_enum_type.cpp b/test/test_enum_type.cpp
index 0e7ed36fd..c8b84c778 100644
--- a/test/test_enum_type.cpp
+++ b/test/test_enum_type.cpp
@@ -29,7 +29,7 @@ SOFTWARE.
 #include <UnitTest++/UnitTest++.h>
 #include <string>
 
-#include "../enum_type.h"
+#include "../src/enum_type.h"
 
 struct enum_test
 {
diff --git a/test/test_error_handler.cpp b/test/test_error_handler.cpp
index de3521a64..5da95e134 100644
--- a/test/test_error_handler.cpp
+++ b/test/test_error_handler.cpp
@@ -33,8 +33,8 @@ SOFTWARE.
 #include <sstream>
 #include <string>
 
-#include "../error_handler.h"
-#include "../exception.h"
+#include "../src/error_handler.h"
+#include "../src/exception.h"
 
 bool error_received;
 
diff --git a/test/test_exception.cpp b/test/test_exception.cpp
index 1301c07f9..9d1854cc0 100644
--- a/test/test_exception.cpp
+++ b/test/test_exception.cpp
@@ -29,7 +29,7 @@ SOFTWARE.
 #include <UnitTest++/UnitTest++.h>
 #include <string>
 
-#include "../exception.h"
+#include "../src/exception.h"
 
 namespace 
 {		
diff --git a/test/test_fixed_iterator.cpp b/test/test_fixed_iterator.cpp
index 635475fc9..3afc5583c 100644
--- a/test/test_fixed_iterator.cpp
+++ b/test/test_fixed_iterator.cpp
@@ -30,7 +30,7 @@ SOFTWARE.
 #include <vector>
 #include <ostream>
 
-#include "../fixed_iterator.h"
+#include "../src/fixed_iterator.h"
 
 template <typename TIterator>
 std::ostream& operator << (std::ostream& os, const etl::fixed_iterator<TIterator>& fi)
diff --git a/test/test_flat_map.cpp b/test/test_flat_map.cpp
index bfb0d9c31..3f36618aa 100644
--- a/test/test_flat_map.cpp
+++ b/test/test_flat_map.cpp
@@ -38,7 +38,7 @@ SOFTWARE.
 
 #include "data.h"
 
-#include "../flat_map.h"
+#include "../src/flat_map.h"
 
 namespace
 {
diff --git a/test/test_flat_multimap.cpp b/test/test_flat_multimap.cpp
index 058014378..9416de9fc 100644
--- a/test/test_flat_multimap.cpp
+++ b/test/test_flat_multimap.cpp
@@ -38,7 +38,7 @@ SOFTWARE.
 
 #include "data.h"
 
-#include "../flat_multimap.h"
+#include "../src/flat_multimap.h"
 
 namespace
 {
diff --git a/test/test_flat_multiset.cpp b/test/test_flat_multiset.cpp
index 4966e4627..7d54bc6c4 100644
--- a/test/test_flat_multiset.cpp
+++ b/test/test_flat_multiset.cpp
@@ -38,7 +38,7 @@ SOFTWARE.
 
 #include "data.h"
 
-#include "../flat_multiset.h"
+#include "../src/flat_multiset.h"
 
 namespace
 {
diff --git a/test/test_flat_set.cpp b/test/test_flat_set.cpp
index 86429f60d..cab386c8e 100644
--- a/test/test_flat_set.cpp
+++ b/test/test_flat_set.cpp
@@ -38,7 +38,7 @@ SOFTWARE.
 
 #include "data.h"
 
-#include "../flat_set.h"
+#include "../src/flat_set.h"
 
 namespace
 {
diff --git a/test/test_fnv_1.cpp b/test/test_fnv_1.cpp
index 20830beb3..33b6ed67b 100644
--- a/test/test_fnv_1.cpp
+++ b/test/test_fnv_1.cpp
@@ -33,7 +33,7 @@ SOFTWARE.
 #include <vector>
 #include <stdint.h>
 
-#include "../fnv_1.h"
+#include "../src/fnv_1.h"
 
 namespace
 {		
diff --git a/test/test_forward_list.cpp b/test/test_forward_list.cpp
index 12d319746..86a4c8665 100644
--- a/test/test_forward_list.cpp
+++ b/test/test_forward_list.cpp
@@ -31,7 +31,7 @@ SOFTWARE.
 
 #include "data.h"
 
-#include "../forward_list.h"
+#include "../src/forward_list.h"
 
 #include <algorithm>
 #include <array>
diff --git a/test/test_function.cpp b/test/test_function.cpp
index 7b1477344..b0900ecc3 100644
--- a/test/test_function.cpp
+++ b/test/test_function.cpp
@@ -28,7 +28,7 @@ SOFTWARE.
 
 #include <UnitTest++/UnitTest++.h>
 
-#include "../function.h"
+#include "../src/function.h"
 
 //*****************************************************************************
 const int VALUE = 1;
diff --git a/test/test_functional.cpp b/test/test_functional.cpp
index 01c7fcb37..ea725be73 100644
--- a/test/test_functional.cpp
+++ b/test/test_functional.cpp
@@ -28,7 +28,7 @@ SOFTWARE.
 
 #include <UnitTest++/UnitTest++.h>
 
-#include "../functional.h"
+#include "../src/functional.h"
 
 #include <list>
 #include <vector>
diff --git a/test/test_hash.cpp b/test/test_hash.cpp
index d7fdb1ac9..1487c8067 100644
--- a/test/test_hash.cpp
+++ b/test/test_hash.cpp
@@ -33,7 +33,7 @@ SOFTWARE.
 #include <vector>
 #include <stdint.h>
 
-#include "../hash.h"
+#include "../src/hash.h"
 
 namespace
 {
diff --git a/test/test_instance_count.cpp b/test/test_instance_count.cpp
index 3295fa680..885963bce 100644
--- a/test/test_instance_count.cpp
+++ b/test/test_instance_count.cpp
@@ -28,7 +28,7 @@ SOFTWARE.
 
 #include <UnitTest++/UnitTest++.h>
 
-#include "../instance_count.h"
+#include "../src/instance_count.h"
 
 #include <list>
 #include <vector>
diff --git a/test/test_integral_limits.cpp b/test/test_integral_limits.cpp
index 7dcdf8412..591ef215a 100644
--- a/test/test_integral_limits.cpp
+++ b/test/test_integral_limits.cpp
@@ -32,7 +32,7 @@ SOFTWARE.
 #include <type_traits>
 #include <bitset>
 
-#include "../integral_limits.h"
+#include "../src/integral_limits.h"
 
 #undef min
 #undef max
diff --git a/test/test_intrusive_forward_list.cpp b/test/test_intrusive_forward_list.cpp
index b3f7054eb..796d41c6f 100644
--- a/test/test_intrusive_forward_list.cpp
+++ b/test/test_intrusive_forward_list.cpp
@@ -31,7 +31,7 @@ SOFTWARE.
 
 #include "data.h"
 
-#include "../intrusive_forward_list.h"
+#include "../src/intrusive_forward_list.h"
 
 #include <algorithm>
 #include <array>
diff --git a/test/test_intrusive_links.cpp b/test/test_intrusive_links.cpp
index 06ba88688..e8bf66e38 100644
--- a/test/test_intrusive_links.cpp
+++ b/test/test_intrusive_links.cpp
@@ -31,7 +31,7 @@ SOFTWARE.
 
 #include "data.h"
 
-#include "../intrusive_links.h"
+#include "../src/intrusive_links.h"
 
 namespace
 {
diff --git a/test/test_intrusive_list.cpp b/test/test_intrusive_list.cpp
index a7000dc7f..d7c16ff83 100644
--- a/test/test_intrusive_list.cpp
+++ b/test/test_intrusive_list.cpp
@@ -31,7 +31,7 @@ SOFTWARE.
 
 #include "data.h"
 
-#include "../intrusive_list.h"
+#include "../src/intrusive_list.h"
 
 #include <algorithm>
 #include <array>
diff --git a/test/test_io_port.cpp b/test/test_io_port.cpp
index 7f8bdaafa..624876834 100644
--- a/test/test_io_port.cpp
+++ b/test/test_io_port.cpp
@@ -28,7 +28,7 @@ SOFTWARE.
 
 #include <UnitTest++/UnitTest++.h>
 
-#include "../io_port.h"
+#include "../src/io_port.h"
 
 #include <stdint.h>
 
diff --git a/test/test_jenkins.cpp b/test/test_jenkins.cpp
index 7bc96f1ec..ac9b104d3 100644
--- a/test/test_jenkins.cpp
+++ b/test/test_jenkins.cpp
@@ -35,8 +35,8 @@ SOFTWARE.
 #include <vector>
 #include <stdint.h>
 
-#include "../jenkins.h"
-#include "../endian.h"
+#include "../src/jenkins.h"
+#include "../src/endian.h"
 
 template <typename TIterator>
 uint32_t jenkins32(TIterator begin, TIterator end)
diff --git a/test/test_largest.cpp b/test/test_largest.cpp
index 9120d242d..80db3965f 100644
--- a/test/test_largest.cpp
+++ b/test/test_largest.cpp
@@ -28,7 +28,7 @@ SOFTWARE.
 
 #include <UnitTest++/UnitTest++.h>
 
-#include "../largest.h"
+#include "../src/largest.h"
 
 #include <type_traits>
 
diff --git a/test/test_list.cpp b/test/test_list.cpp
index 4a92c29d6..05d186acf 100644
--- a/test/test_list.cpp
+++ b/test/test_list.cpp
@@ -29,7 +29,7 @@ SOFTWARE.
 #include <UnitTest++/UnitTest++.h>
 #include "ExtraCheckMacros.h"
 
-#include "../list.h"
+#include "../src/list.h"
 
 #include "data.h"
 
diff --git a/test/test_map.cpp b/test/test_map.cpp
index 51abfaa48..6efb52725 100644
--- a/test/test_map.cpp
+++ b/test/test_map.cpp
@@ -36,7 +36,7 @@ SOFTWARE.
 #include <string>
 #include <vector>
 
-#include "../map.h"
+#include "../src/map.h"
 
 static const size_t SIZE = 10;
 
diff --git a/test/test_maths.cpp b/test/test_maths.cpp
index 9e883e89f..2a4ac5236 100644
--- a/test/test_maths.cpp
+++ b/test/test_maths.cpp
@@ -28,10 +28,10 @@ SOFTWARE.
 
 #include <UnitTest++/UnitTest++.h>
 
-#include "../log.h"
-#include "../power.h"
-#include "../fibonacci.h"
-#include "../factorial.h"
+#include "../src/log.h"
+#include "../src/power.h"
+#include "../src/fibonacci.h"
+#include "../src/factorial.h"
 
 namespace
 {
diff --git a/test/test_multimap.cpp b/test/test_multimap.cpp
index efc26d4f9..a23afc4bc 100644
--- a/test/test_multimap.cpp
+++ b/test/test_multimap.cpp
@@ -35,7 +35,7 @@ SOFTWARE.
 #include <iterator>
 #include <string>
 
-#include "../multimap.h"
+#include "../src/multimap.h"
 
 static const size_t SIZE = 10;
 
diff --git a/test/test_multiset.cpp b/test/test_multiset.cpp
index 644838791..aaa19bc35 100644
--- a/test/test_multiset.cpp
+++ b/test/test_multiset.cpp
@@ -35,7 +35,7 @@ SOFTWARE.
 #include <iterator>
 #include <string>
 
-#include "../multiset.h"
+#include "../src/multiset.h"
 
 static const size_t SIZE = 10;
 
diff --git a/test/test_murmur3.cpp b/test/test_murmur3.cpp
index 87d283372..36dbca0fb 100644
--- a/test/test_murmur3.cpp
+++ b/test/test_murmur3.cpp
@@ -35,8 +35,8 @@ SOFTWARE.
 #include <vector>
 #include <stdint.h>
 
-#include "../murmur3.h"
-#include "../endian.h"
+#include "../src/murmur3.h"
+#include "../src/endian.h"
 
 namespace
 {		
diff --git a/test/test_numeric.cpp b/test/test_numeric.cpp
index 58f50f32b..dc305db2d 100644
--- a/test/test_numeric.cpp
+++ b/test/test_numeric.cpp
@@ -28,7 +28,7 @@ SOFTWARE.
 
 #include <UnitTest++/UnitTest++.h>
 
-#include "../numeric.h"
+#include "../src/numeric.h"
 
 #include <algorithm>
 #include <numeric>
diff --git a/test/test_observer.cpp b/test/test_observer.cpp
index b53f5d158..a59e2a564 100644
--- a/test/test_observer.cpp
+++ b/test/test_observer.cpp
@@ -28,7 +28,7 @@ SOFTWARE.
 
 #include <UnitTest++/UnitTest++.h>
 
-#include "../observer.h"
+#include "../src/observer.h"
 
 //*****************************************************************************
 // Notification1
diff --git a/test/test_optional.cpp b/test/test_optional.cpp
index 17399bc75..8b8944535 100644
--- a/test/test_optional.cpp
+++ b/test/test_optional.cpp
@@ -31,8 +31,8 @@ SOFTWARE.
 #include <string>
 #include <ostream>
 
-#include "../optional.h"
-#include "../vector.h"
+#include "../src/optional.h"
+#include "../src/vector.h"
 #include "data.h"
 
 typedef TestDataNDC<std::string> Data;
diff --git a/test/test_pearson.cpp b/test/test_pearson.cpp
index 638ab3e5c..dce6a0fd3 100644
--- a/test/test_pearson.cpp
+++ b/test/test_pearson.cpp
@@ -34,8 +34,8 @@ SOFTWARE.
 #include <iomanip>
 #include <stdint.h>
 
-#include "../pearson.h"
-#include "../endian.h"
+#include "../src/pearson.h"
+#include "../src/endian.h"
 
 const size_t HASH_SIZE = 8;
 typedef etl::pearson<HASH_SIZE>::value_type hash_t;
diff --git a/test/test_pool.cpp b/test/test_pool.cpp
index f2ae63d6b..e1b90d5d1 100644
--- a/test/test_pool.cpp
+++ b/test/test_pool.cpp
@@ -34,7 +34,7 @@ SOFTWARE.
 #include <set>
 #include <vector>
 
-#include "../pool.h"
+#include "../src/pool.h"
 
 typedef TestDataDC<std::string>  Test_Data;
 typedef TestDataNDC<std::string> Test_Data2;
diff --git a/test/test_priority_queue.cpp b/test/test_priority_queue.cpp
index 216663f18..f38dffa0c 100644
--- a/test/test_priority_queue.cpp
+++ b/test/test_priority_queue.cpp
@@ -30,7 +30,7 @@ SOFTWARE.
 
 #include <queue>
 
-#include "../priority_queue.h"
+#include "../src/priority_queue.h"
 
 namespace
 {		
diff --git a/test/test_queue.cpp b/test/test_queue.cpp
index 896668dbc..60637cdff 100644
--- a/test/test_queue.cpp
+++ b/test/test_queue.cpp
@@ -30,7 +30,7 @@ SOFTWARE.
 
 #include <queue>
 
-#include "../queue.h"
+#include "../src/queue.h"
 
 namespace
 {
diff --git a/test/test_set.cpp b/test/test_set.cpp
index 6dd2765de..69e2f3c41 100644
--- a/test/test_set.cpp
+++ b/test/test_set.cpp
@@ -36,7 +36,7 @@ SOFTWARE.
 #include <string>
 #include <vector>
 
-#include "../set.h"
+#include "../src/set.h"
 
 static const size_t SIZE = 10;
 
diff --git a/test/test_smallest.cpp b/test/test_smallest.cpp
index 9c5f4758b..26beb42cb 100644
--- a/test/test_smallest.cpp
+++ b/test/test_smallest.cpp
@@ -28,7 +28,7 @@ SOFTWARE.
 
 #include <UnitTest++/UnitTest++.h>
 
-#include "../smallest.h"
+#include "../src/smallest.h"
 
 #include <type_traits>
 
diff --git a/test/test_stack.cpp b/test/test_stack.cpp
index 337a18690..a0fe32e4a 100644
--- a/test/test_stack.cpp
+++ b/test/test_stack.cpp
@@ -32,7 +32,7 @@ SOFTWARE.
 
 #include "data.h"
 
-#include "../stack.h"
+#include "../src/stack.h"
 
 namespace
 {
diff --git a/test/test_type_traits.cpp b/test/test_type_traits.cpp
index 5fc02df09..a7be3bad7 100644
--- a/test/test_type_traits.cpp
+++ b/test/test_type_traits.cpp
@@ -38,7 +38,7 @@ namespace std
 }
 #endif
 
-#include "../type_traits.h"
+#include "../src/type_traits.h"
 #include <type_traits>
 
 // A class to test non-fundamental types.
diff --git a/test/test_unordered_map.cpp b/test/test_unordered_map.cpp
index f39d67701..3d19f4f5e 100644
--- a/test/test_unordered_map.cpp
+++ b/test/test_unordered_map.cpp
@@ -39,7 +39,7 @@ SOFTWARE.
 
 #include "data.h"
 
-#include "../unordered_map.h"
+#include "../src/unordered_map.h"
 
 namespace
 {
diff --git a/test/test_unordered_multimap.cpp b/test/test_unordered_multimap.cpp
index 8f7baddcd..d5ca8aa69 100644
--- a/test/test_unordered_multimap.cpp
+++ b/test/test_unordered_multimap.cpp
@@ -39,7 +39,7 @@ SOFTWARE.
 
 #include "data.h"
 
-#include "../unordered_multimap.h"
+#include "../src/unordered_multimap.h"
 
 namespace
 {
diff --git a/test/test_unordered_multiset.cpp b/test/test_unordered_multiset.cpp
index e4b95fc68..0edf7a868 100644
--- a/test/test_unordered_multiset.cpp
+++ b/test/test_unordered_multiset.cpp
@@ -39,8 +39,8 @@ SOFTWARE.
 
 #include "data.h"
 
-#include "../unordered_multiset.h"
-#include "../checksum.h"
+#include "../src/unordered_multiset.h"
+#include "../src/checksum.h"
 
 namespace
 {
diff --git a/test/test_unordered_set.cpp b/test/test_unordered_set.cpp
index 9721f89a2..854200d09 100644
--- a/test/test_unordered_set.cpp
+++ b/test/test_unordered_set.cpp
@@ -39,8 +39,8 @@ SOFTWARE.
 
 #include "data.h"
 
-#include "../unordered_set.h"
-#include "../checksum.h"
+#include "../src/unordered_set.h"
+#include "../src/checksum.h"
 
 namespace
 {
diff --git a/test/test_variant.cpp b/test/test_variant.cpp
index 463a47d7c..e2d64686b 100644
--- a/test/test_variant.cpp
+++ b/test/test_variant.cpp
@@ -29,7 +29,7 @@ SOFTWARE.
 #include <UnitTest++/UnitTest++.h>
 #include "ExtraCheckMacros.h"
 
-#include "../variant.h"
+#include "../src/variant.h"
 
 #include <array>
 #include <vector>
diff --git a/test/test_vector.cpp b/test/test_vector.cpp
index 392679fd0..d05f07b56 100644
--- a/test/test_vector.cpp
+++ b/test/test_vector.cpp
@@ -32,7 +32,7 @@ SOFTWARE.
 #include <array>
 #include <algorithm>
 
-#include "../vector.h"
+#include "../src/vector.h"
 
 namespace
 {		
diff --git a/test/test_visitor.cpp b/test/test_visitor.cpp
index 22826a320..ae48878b0 100644
--- a/test/test_visitor.cpp
+++ b/test/test_visitor.cpp
@@ -28,7 +28,7 @@ SOFTWARE.
 
 #include <UnitTest++/UnitTest++.h>
 
-#include "../visitor.h"
+#include "../src/visitor.h"
 
 //*****************************************************************************
 // Pre-declare the data types.
diff --git a/test/test_xor_checksum.cpp b/test/test_xor_checksum.cpp
index 24c288665..c1e68fbb9 100644
--- a/test/test_xor_checksum.cpp
+++ b/test/test_xor_checksum.cpp
@@ -33,7 +33,7 @@ SOFTWARE.
 #include <vector>
 #include <stdint.h>
 
-#include "../checksum.h"
+#include "../src/checksum.h"
 
 namespace
 {
diff --git a/test/vs2015/etl.vcxproj b/test/vs2015/etl.vcxproj
index 9beecfae9..15a17f676 100644
--- a/test/vs2015/etl.vcxproj
+++ b/test/vs2015/etl.vcxproj
@@ -293,14 +293,14 @@
     <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\TimeConstraint.cpp" />
     <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\Win32\TimeHelpers.cpp" />
     <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\XmlTestReporter.cpp" />
-    <ClCompile Include="..\..\crc16.cpp" />
-    <ClCompile Include="..\..\crc16_ccitt.cpp" />
-    <ClCompile Include="..\..\crc16_kermit.cpp" />
-    <ClCompile Include="..\..\crc32.cpp" />
-    <ClCompile Include="..\..\crc64_ecma.cpp" />
-    <ClCompile Include="..\..\crc8_ccitt.cpp" />
-    <ClCompile Include="..\..\error_handler.cpp" />
-    <ClCompile Include="..\..\pearson.cpp" />
+    <ClCompile Include="..\..\src\crc16.cpp" />
+    <ClCompile Include="..\..\src\crc16_ccitt.cpp" />
+    <ClCompile Include="..\..\src\crc16_kermit.cpp" />
+    <ClCompile Include="..\..\src\crc32.cpp" />
+    <ClCompile Include="..\..\src\crc64_ecma.cpp" />
+    <ClCompile Include="..\..\src\crc8_ccitt.cpp" />
+    <ClCompile Include="..\..\src\error_handler.cpp" />
+    <ClCompile Include="..\..\src\pearson.cpp" />
     <ClCompile Include="..\main.cpp" />
     <ClCompile Include="..\murmurhash3.cpp" />
     <ClCompile Include="..\test_algorithm.cpp" />
diff --git a/test/vs2015/etl.vcxproj.filters b/test/vs2015/etl.vcxproj.filters
index 5d8d15861..5c6fd941a 100644
--- a/test/vs2015/etl.vcxproj.filters
+++ b/test/vs2015/etl.vcxproj.filters
@@ -584,21 +584,6 @@
     <ClCompile Include="..\test_crc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\crc16.cpp">
-      <Filter>ETL\Maths</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\crc16_ccitt.cpp">
-      <Filter>ETL\Maths</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\crc32.cpp">
-      <Filter>ETL\Maths</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\crc64_ecma.cpp">
-      <Filter>ETL\Maths</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\crc8_ccitt.cpp">
-      <Filter>ETL\Maths</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_deque.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -611,9 +596,6 @@
     <ClCompile Include="..\test_variant.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\crc16_kermit.cpp">
-      <Filter>ETL\Maths</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_smallest.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -629,9 +611,6 @@
     <ClCompile Include="..\test_algorithm.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\error_handler.cpp">
-      <Filter>ETL\Utilities</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_error_handler.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -707,9 +686,6 @@
     <ClCompile Include="..\test_flat_multiset.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\pearson.cpp">
-      <Filter>ETL\Maths</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_pearson.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -740,6 +716,30 @@
     <ClCompile Include="..\test_unordered_multiset.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\pearson.cpp">
+      <Filter>ETL\Maths</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\crc64_ecma.cpp">
+      <Filter>ETL\Maths</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\crc32.cpp">
+      <Filter>ETL\Maths</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\crc16_kermit.cpp">
+      <Filter>ETL\Maths</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\crc16_ccitt.cpp">
+      <Filter>ETL\Maths</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\crc16.cpp">
+      <Filter>ETL\Maths</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\crc8_ccitt.cpp">
+      <Filter>ETL\Maths</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\error_handler.cpp">
+      <Filter>ETL\Utilities</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\Doxyfile">