From 4864e95b364538f30e41f9fa4b066712c8604dde Mon Sep 17 00:00:00 2001
From: John Wellbelove <github@wellbelove.co.uk>
Date: Sun, 18 Mar 2018 17:29:52 +0000
Subject: [PATCH] New directory layout

---
 CMakeLists.txt                                |   8 +-
 {src => include/etl}/.vscode/settings.json    |   0
 {src => include/etl}/algorithm.h              |   0
 {src => include/etl}/alignment.h              |   0
 {src => include/etl}/array.h                  |   0
 {src => include/etl}/array_view.h             |   0
 {src => include/etl}/array_wrapper.h          |   0
 {src => include/etl}/atomic.h                 |   0
 {src => include/etl}/atomic/atomic_arm.h      |   0
 {src => include/etl}/atomic/atomic_gcc.h      |   0
 {src => include/etl}/atomic/atomic_windows.h  |   0
 {src => include/etl}/basic_string.h           |   0
 {src => include/etl}/binary.h                 |   0
 {src => include/etl}/bitset.h                 |   0
 {src => include/etl}/bloom_filter.h           |   0
 {src => include/etl}/c/ecl_timer.h            |   0
 {src => include/etl}/callback.h               |   0
 {src => include/etl}/callback_timer.h         |   0
 {src => include/etl}/char_traits.h            |   0
 {src => include/etl}/checksum.h               |   0
 {src => include/etl}/compare.h                |   0
 {src => include/etl}/constant.h               |   0
 {src => include/etl}/container.h              |   0
 {src => include/etl}/crc16.h                  |   0
 {src => include/etl}/crc16_ccitt.h            |   0
 {src => include/etl}/crc16_kermit.h           |   0
 {src => include/etl}/crc32.h                  |   0
 {src => include/etl}/crc64_ecma.h             |   0
 {src => include/etl}/crc8_ccitt.h             |   0
 {src => include/etl}/cstring.h                |   0
 {src => include/etl}/cyclic_value.h           |   0
 {src => include/etl}/debounce.h               |   0
 {src => include/etl}/debug_count.h            |   0
 {src => include/etl}/deque.h                  |   0
 {src => include/etl}/doxygen.h                |   0
 {src => include/etl}/endianness.h             |   0
 {src => include/etl}/enum_type.h              |   0
 {src => include/etl}/error_handler.h          |   0
 {src => include/etl}/exception.h              |   0
 {src => include/etl}/experimental/atomic.h    |   0
 .../etl}/experimental/spsc_queue.h            |   0
 {src => include/etl}/factorial.h              |   0
 {src => include/etl}/factory.h                |   0
 {src => include/etl}/fibonacci.h              |   0
 {src => include/etl}/file_error_numbers.txt   |   0
 {src => include/etl}/fixed_iterator.h         |   0
 {src => include/etl}/flat_map.h               |   0
 {src => include/etl}/flat_multimap.h          |   0
 {src => include/etl}/flat_multiset.h          |   0
 {src => include/etl}/flat_set.h               |   0
 {src => include/etl}/fnv_1.h                  |   0
 {src => include/etl}/forward_list.h           |   0
 {src => include/etl}/frame_check_sequence.h   |   0
 {src => include/etl}/fsm.h                    |   0
 {src => include/etl}/fsm_generator.h          |   0
 {src => include/etl}/function.h               |   0
 {src => include/etl}/functional.h             |   0
 {src => include/etl}/generate.bat             |   0
 {src => include/etl}/generate_fsm.bat         |   0
 {src => include/etl}/generate_largest.bat     |   0
 .../etl}/generate_message_router.bat          |   0
 {src => include/etl}/generate_smallest.bat    |   0
 {src => include/etl}/generate_type_lookup.bat |   0
 {src => include/etl}/generate_type_traits.bat |   0
 .../etl}/generate_variant_pool.bat            |   0
 {src => include/etl}/hash.h                   |   0
 {src => include/etl}/icache.h                 |   0
 {src => include/etl}/ihash.h                  |   0
 {src => include/etl}/instance_count.h         |   0
 {src => include/etl}/integral_limits.h        |   0
 {src => include/etl}/intrusive_forward_list.h |   0
 {src => include/etl}/intrusive_links.h        |   0
 {src => include/etl}/intrusive_list.h         |   0
 {src => include/etl}/intrusive_queue.h        |   0
 {src => include/etl}/intrusive_stack.h        |   0
 {src => include/etl}/io_port.h                |   0
 {src => include/etl}/iterator.h               |   0
 {src => include/etl}/jenkins.h                |   0
 {src => include/etl}/largest.h                |   0
 {src => include/etl}/largest_generator.h      |   0
 {src => include/etl}/list.h                   |   0
 {src => include/etl}/log.h                    |   0
 {src => include/etl}/map.h                    |   0
 {src => include/etl}/memory.h                 |   0
 {src => include/etl}/message.h                |   0
 {src => include/etl}/message_bus.h            |   0
 {src => include/etl}/message_router.h         |   0
 .../etl}/message_router_generator.h           |   0
 {src => include/etl}/message_timer.h          |   0
 {src => include/etl}/message_types.h          |   0
 {src => include/etl}/multimap.h               |   0
 {src => include/etl}/multiset.h               |   0
 {src => include/etl}/murmur3.h                |   0
 {src => include/etl}/nullptr.h                |   0
 {src => include/etl}/numeric.h                |   0
 {src => include/etl}/observer.h               |   0
 {src => include/etl}/optional.h               |   0
 {src => include/etl}/packet.h                 |   0
 {src => include/etl}/parameter_type.h         |   0
 {src => include/etl}/pearson.h                |   0
 {src => include/etl}/platform.h               |   0
 {src => include/etl}/pool.h                   |   0
 {src => include/etl}/power.h                  |   0
 {src => include/etl}/priority_queue.h         |   0
 {src => include/etl}/private/ivectorpointer.h |   0
 {src => include/etl}/private/pvoidvector.h    |   0
 {src => include/etl}/private/vector_base.h    |   0
 {src => include/etl}/profiles/arduino_arm.h   |   0
 {src => include/etl}/profiles/armv5.h         |   0
 {src => include/etl}/profiles/armv6.h         |   0
 {src => include/etl}/profiles/cpp03.h         |   0
 {src => include/etl}/profiles/cpp11.h         |   0
 {src => include/etl}/profiles/cpp14.h         |   0
 {src => include/etl}/profiles/etl_profile.h   |   0
 {src => include/etl}/profiles/gcc_generic.h   |   0
 {src => include/etl}/profiles/gcc_linux_x86.h |   0
 .../etl}/profiles/gcc_windows_x86.h           |   0
 {src => include/etl}/profiles/msvc_x86.h      |   0
 {src => include/etl}/profiles/ticc.h          |   0
 {src => include/etl}/queue.h                  |   0
 {src => include/etl}/radix.h                  |   0
 {src => include/etl}/random.h                 |   0
 {src => include/etl}/ratio.h                  |   0
 {src => include/etl}/reference_flat_map.h     |   0
 .../etl}/reference_flat_multimap.h            |   0
 .../etl}/reference_flat_multiset.h            |   0
 {src => include/etl}/reference_flat_set.h     |   0
 {src => include/etl}/scheduler.h              |   0
 {src => include/etl}/set.h                    |   0
 {src => include/etl}/smallest.h               |   0
 {src => include/etl}/smallest_generator.h     |   0
 {src => include/etl}/sqrt.h                   |   0
 {src => include/etl}/stack.h                  |   0
 {src => include/etl}/static_assert.h          |   0
 {src => include/etl}/string_view.h            |   0
 {src => include/etl}/task.h                   |   0
 {src => include/etl}/temp.h                   |   0
 {src => include/etl}/timer.h                  |   0
 {src => include/etl}/type_def.h               |   0
 {src => include/etl}/type_lookup.h            |   0
 {src => include/etl}/type_lookup_generator.h  |   0
 {src => include/etl}/type_traits.h            |   0
 {src => include/etl}/type_traits_generator.h  |   0
 {src => include/etl}/u16string.h              |   0
 {src => include/etl}/u32string.h              |   0
 {src => include/etl}/unordered_map.h          |   0
 {src => include/etl}/unordered_multimap.h     |   0
 {src => include/etl}/unordered_multiset.h     |   0
 {src => include/etl}/unordered_set.h          |   0
 {src => include/etl}/user_type.h              |   0
 {src => include/etl}/utility.h                |   0
 {src => include/etl}/variant.h                |   0
 {src => include/etl}/variant_pool.h           |   0
 {src => include/etl}/variant_pool_generator.h |   0
 {src => include/etl}/vector.h                 |   0
 {src => include/etl}/version.h                |   0
 {src => include/etl}/visitor.h                |   0
 {src => include/etl}/wstring.h                |   0
 src/c/ecl_timer.c                             |  16 +-
 src/private/pvoidvector.cpp                   |   4 +-
 support/Release notes.txt                     |   6 +
 test/codeblocks/ETL.cbp                       | 291 +++++++-------
 test/test_c_timer_framework.cpp               |   2 +-
 test/vs2017/etl.vcxproj                       | 316 +++++++--------
 test/vs2017/etl.vcxproj.filters               | 376 +++++++++---------
 165 files changed, 515 insertions(+), 504 deletions(-)
 rename {src => include/etl}/.vscode/settings.json (100%)
 rename {src => include/etl}/algorithm.h (100%)
 rename {src => include/etl}/alignment.h (100%)
 rename {src => include/etl}/array.h (100%)
 rename {src => include/etl}/array_view.h (100%)
 rename {src => include/etl}/array_wrapper.h (100%)
 rename {src => include/etl}/atomic.h (100%)
 rename {src => include/etl}/atomic/atomic_arm.h (100%)
 rename {src => include/etl}/atomic/atomic_gcc.h (100%)
 rename {src => include/etl}/atomic/atomic_windows.h (100%)
 rename {src => include/etl}/basic_string.h (100%)
 rename {src => include/etl}/binary.h (100%)
 rename {src => include/etl}/bitset.h (100%)
 rename {src => include/etl}/bloom_filter.h (100%)
 rename {src => include/etl}/c/ecl_timer.h (100%)
 rename {src => include/etl}/callback.h (100%)
 rename {src => include/etl}/callback_timer.h (100%)
 rename {src => include/etl}/char_traits.h (100%)
 rename {src => include/etl}/checksum.h (100%)
 rename {src => include/etl}/compare.h (100%)
 rename {src => include/etl}/constant.h (100%)
 rename {src => include/etl}/container.h (100%)
 rename {src => include/etl}/crc16.h (100%)
 rename {src => include/etl}/crc16_ccitt.h (100%)
 rename {src => include/etl}/crc16_kermit.h (100%)
 rename {src => include/etl}/crc32.h (100%)
 rename {src => include/etl}/crc64_ecma.h (100%)
 rename {src => include/etl}/crc8_ccitt.h (100%)
 rename {src => include/etl}/cstring.h (100%)
 rename {src => include/etl}/cyclic_value.h (100%)
 rename {src => include/etl}/debounce.h (100%)
 rename {src => include/etl}/debug_count.h (100%)
 rename {src => include/etl}/deque.h (100%)
 rename {src => include/etl}/doxygen.h (100%)
 rename {src => include/etl}/endianness.h (100%)
 rename {src => include/etl}/enum_type.h (100%)
 rename {src => include/etl}/error_handler.h (100%)
 rename {src => include/etl}/exception.h (100%)
 rename {src => include/etl}/experimental/atomic.h (100%)
 rename {src => include/etl}/experimental/spsc_queue.h (100%)
 rename {src => include/etl}/factorial.h (100%)
 rename {src => include/etl}/factory.h (100%)
 rename {src => include/etl}/fibonacci.h (100%)
 rename {src => include/etl}/file_error_numbers.txt (100%)
 rename {src => include/etl}/fixed_iterator.h (100%)
 rename {src => include/etl}/flat_map.h (100%)
 rename {src => include/etl}/flat_multimap.h (100%)
 rename {src => include/etl}/flat_multiset.h (100%)
 rename {src => include/etl}/flat_set.h (100%)
 rename {src => include/etl}/fnv_1.h (100%)
 rename {src => include/etl}/forward_list.h (100%)
 rename {src => include/etl}/frame_check_sequence.h (100%)
 rename {src => include/etl}/fsm.h (100%)
 rename {src => include/etl}/fsm_generator.h (100%)
 rename {src => include/etl}/function.h (100%)
 rename {src => include/etl}/functional.h (100%)
 rename {src => include/etl}/generate.bat (100%)
 rename {src => include/etl}/generate_fsm.bat (100%)
 rename {src => include/etl}/generate_largest.bat (100%)
 rename {src => include/etl}/generate_message_router.bat (100%)
 rename {src => include/etl}/generate_smallest.bat (100%)
 rename {src => include/etl}/generate_type_lookup.bat (100%)
 rename {src => include/etl}/generate_type_traits.bat (100%)
 rename {src => include/etl}/generate_variant_pool.bat (100%)
 rename {src => include/etl}/hash.h (100%)
 rename {src => include/etl}/icache.h (100%)
 rename {src => include/etl}/ihash.h (100%)
 rename {src => include/etl}/instance_count.h (100%)
 rename {src => include/etl}/integral_limits.h (100%)
 rename {src => include/etl}/intrusive_forward_list.h (100%)
 rename {src => include/etl}/intrusive_links.h (100%)
 rename {src => include/etl}/intrusive_list.h (100%)
 rename {src => include/etl}/intrusive_queue.h (100%)
 rename {src => include/etl}/intrusive_stack.h (100%)
 rename {src => include/etl}/io_port.h (100%)
 rename {src => include/etl}/iterator.h (100%)
 rename {src => include/etl}/jenkins.h (100%)
 rename {src => include/etl}/largest.h (100%)
 rename {src => include/etl}/largest_generator.h (100%)
 rename {src => include/etl}/list.h (100%)
 rename {src => include/etl}/log.h (100%)
 rename {src => include/etl}/map.h (100%)
 rename {src => include/etl}/memory.h (100%)
 rename {src => include/etl}/message.h (100%)
 rename {src => include/etl}/message_bus.h (100%)
 rename {src => include/etl}/message_router.h (100%)
 rename {src => include/etl}/message_router_generator.h (100%)
 rename {src => include/etl}/message_timer.h (100%)
 rename {src => include/etl}/message_types.h (100%)
 rename {src => include/etl}/multimap.h (100%)
 rename {src => include/etl}/multiset.h (100%)
 rename {src => include/etl}/murmur3.h (100%)
 rename {src => include/etl}/nullptr.h (100%)
 rename {src => include/etl}/numeric.h (100%)
 rename {src => include/etl}/observer.h (100%)
 rename {src => include/etl}/optional.h (100%)
 rename {src => include/etl}/packet.h (100%)
 rename {src => include/etl}/parameter_type.h (100%)
 rename {src => include/etl}/pearson.h (100%)
 rename {src => include/etl}/platform.h (100%)
 rename {src => include/etl}/pool.h (100%)
 rename {src => include/etl}/power.h (100%)
 rename {src => include/etl}/priority_queue.h (100%)
 rename {src => include/etl}/private/ivectorpointer.h (100%)
 rename {src => include/etl}/private/pvoidvector.h (100%)
 rename {src => include/etl}/private/vector_base.h (100%)
 rename {src => include/etl}/profiles/arduino_arm.h (100%)
 rename {src => include/etl}/profiles/armv5.h (100%)
 rename {src => include/etl}/profiles/armv6.h (100%)
 rename {src => include/etl}/profiles/cpp03.h (100%)
 rename {src => include/etl}/profiles/cpp11.h (100%)
 rename {src => include/etl}/profiles/cpp14.h (100%)
 rename {src => include/etl}/profiles/etl_profile.h (100%)
 rename {src => include/etl}/profiles/gcc_generic.h (100%)
 rename {src => include/etl}/profiles/gcc_linux_x86.h (100%)
 rename {src => include/etl}/profiles/gcc_windows_x86.h (100%)
 rename {src => include/etl}/profiles/msvc_x86.h (100%)
 rename {src => include/etl}/profiles/ticc.h (100%)
 rename {src => include/etl}/queue.h (100%)
 rename {src => include/etl}/radix.h (100%)
 rename {src => include/etl}/random.h (100%)
 rename {src => include/etl}/ratio.h (100%)
 rename {src => include/etl}/reference_flat_map.h (100%)
 rename {src => include/etl}/reference_flat_multimap.h (100%)
 rename {src => include/etl}/reference_flat_multiset.h (100%)
 rename {src => include/etl}/reference_flat_set.h (100%)
 rename {src => include/etl}/scheduler.h (100%)
 rename {src => include/etl}/set.h (100%)
 rename {src => include/etl}/smallest.h (100%)
 rename {src => include/etl}/smallest_generator.h (100%)
 rename {src => include/etl}/sqrt.h (100%)
 rename {src => include/etl}/stack.h (100%)
 rename {src => include/etl}/static_assert.h (100%)
 rename {src => include/etl}/string_view.h (100%)
 rename {src => include/etl}/task.h (100%)
 rename {src => include/etl}/temp.h (100%)
 rename {src => include/etl}/timer.h (100%)
 rename {src => include/etl}/type_def.h (100%)
 rename {src => include/etl}/type_lookup.h (100%)
 rename {src => include/etl}/type_lookup_generator.h (100%)
 rename {src => include/etl}/type_traits.h (100%)
 rename {src => include/etl}/type_traits_generator.h (100%)
 rename {src => include/etl}/u16string.h (100%)
 rename {src => include/etl}/u32string.h (100%)
 rename {src => include/etl}/unordered_map.h (100%)
 rename {src => include/etl}/unordered_multimap.h (100%)
 rename {src => include/etl}/unordered_multiset.h (100%)
 rename {src => include/etl}/unordered_set.h (100%)
 rename {src => include/etl}/user_type.h (100%)
 rename {src => include/etl}/utility.h (100%)
 rename {src => include/etl}/variant.h (100%)
 rename {src => include/etl}/variant_pool.h (100%)
 rename {src => include/etl}/variant_pool_generator.h (100%)
 rename {src => include/etl}/vector.h (100%)
 rename {src => include/etl}/version.h (100%)
 rename {src => include/etl}/visitor.h (100%)
 rename {src => include/etl}/wstring.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b2b698a..3456c7be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,11 +28,11 @@ add_library(etl
   )
 target_include_directories(etl
   PUBLIC
-  src/
-  src/atomic
-  src/profiles
+  include/etl/
+  include/etl/atomic
+  include/etl/profiles
   PRIVATE
-  src/private
+  include/etl/private
   )
 
 if (${ETL_PROFILE} STREQUAL DEFAULT)
diff --git a/src/.vscode/settings.json b/include/etl/.vscode/settings.json
similarity index 100%
rename from src/.vscode/settings.json
rename to include/etl/.vscode/settings.json
diff --git a/src/algorithm.h b/include/etl/algorithm.h
similarity index 100%
rename from src/algorithm.h
rename to include/etl/algorithm.h
diff --git a/src/alignment.h b/include/etl/alignment.h
similarity index 100%
rename from src/alignment.h
rename to include/etl/alignment.h
diff --git a/src/array.h b/include/etl/array.h
similarity index 100%
rename from src/array.h
rename to include/etl/array.h
diff --git a/src/array_view.h b/include/etl/array_view.h
similarity index 100%
rename from src/array_view.h
rename to include/etl/array_view.h
diff --git a/src/array_wrapper.h b/include/etl/array_wrapper.h
similarity index 100%
rename from src/array_wrapper.h
rename to include/etl/array_wrapper.h
diff --git a/src/atomic.h b/include/etl/atomic.h
similarity index 100%
rename from src/atomic.h
rename to include/etl/atomic.h
diff --git a/src/atomic/atomic_arm.h b/include/etl/atomic/atomic_arm.h
similarity index 100%
rename from src/atomic/atomic_arm.h
rename to include/etl/atomic/atomic_arm.h
diff --git a/src/atomic/atomic_gcc.h b/include/etl/atomic/atomic_gcc.h
similarity index 100%
rename from src/atomic/atomic_gcc.h
rename to include/etl/atomic/atomic_gcc.h
diff --git a/src/atomic/atomic_windows.h b/include/etl/atomic/atomic_windows.h
similarity index 100%
rename from src/atomic/atomic_windows.h
rename to include/etl/atomic/atomic_windows.h
diff --git a/src/basic_string.h b/include/etl/basic_string.h
similarity index 100%
rename from src/basic_string.h
rename to include/etl/basic_string.h
diff --git a/src/binary.h b/include/etl/binary.h
similarity index 100%
rename from src/binary.h
rename to include/etl/binary.h
diff --git a/src/bitset.h b/include/etl/bitset.h
similarity index 100%
rename from src/bitset.h
rename to include/etl/bitset.h
diff --git a/src/bloom_filter.h b/include/etl/bloom_filter.h
similarity index 100%
rename from src/bloom_filter.h
rename to include/etl/bloom_filter.h
diff --git a/src/c/ecl_timer.h b/include/etl/c/ecl_timer.h
similarity index 100%
rename from src/c/ecl_timer.h
rename to include/etl/c/ecl_timer.h
diff --git a/src/callback.h b/include/etl/callback.h
similarity index 100%
rename from src/callback.h
rename to include/etl/callback.h
diff --git a/src/callback_timer.h b/include/etl/callback_timer.h
similarity index 100%
rename from src/callback_timer.h
rename to include/etl/callback_timer.h
diff --git a/src/char_traits.h b/include/etl/char_traits.h
similarity index 100%
rename from src/char_traits.h
rename to include/etl/char_traits.h
diff --git a/src/checksum.h b/include/etl/checksum.h
similarity index 100%
rename from src/checksum.h
rename to include/etl/checksum.h
diff --git a/src/compare.h b/include/etl/compare.h
similarity index 100%
rename from src/compare.h
rename to include/etl/compare.h
diff --git a/src/constant.h b/include/etl/constant.h
similarity index 100%
rename from src/constant.h
rename to include/etl/constant.h
diff --git a/src/container.h b/include/etl/container.h
similarity index 100%
rename from src/container.h
rename to include/etl/container.h
diff --git a/src/crc16.h b/include/etl/crc16.h
similarity index 100%
rename from src/crc16.h
rename to include/etl/crc16.h
diff --git a/src/crc16_ccitt.h b/include/etl/crc16_ccitt.h
similarity index 100%
rename from src/crc16_ccitt.h
rename to include/etl/crc16_ccitt.h
diff --git a/src/crc16_kermit.h b/include/etl/crc16_kermit.h
similarity index 100%
rename from src/crc16_kermit.h
rename to include/etl/crc16_kermit.h
diff --git a/src/crc32.h b/include/etl/crc32.h
similarity index 100%
rename from src/crc32.h
rename to include/etl/crc32.h
diff --git a/src/crc64_ecma.h b/include/etl/crc64_ecma.h
similarity index 100%
rename from src/crc64_ecma.h
rename to include/etl/crc64_ecma.h
diff --git a/src/crc8_ccitt.h b/include/etl/crc8_ccitt.h
similarity index 100%
rename from src/crc8_ccitt.h
rename to include/etl/crc8_ccitt.h
diff --git a/src/cstring.h b/include/etl/cstring.h
similarity index 100%
rename from src/cstring.h
rename to include/etl/cstring.h
diff --git a/src/cyclic_value.h b/include/etl/cyclic_value.h
similarity index 100%
rename from src/cyclic_value.h
rename to include/etl/cyclic_value.h
diff --git a/src/debounce.h b/include/etl/debounce.h
similarity index 100%
rename from src/debounce.h
rename to include/etl/debounce.h
diff --git a/src/debug_count.h b/include/etl/debug_count.h
similarity index 100%
rename from src/debug_count.h
rename to include/etl/debug_count.h
diff --git a/src/deque.h b/include/etl/deque.h
similarity index 100%
rename from src/deque.h
rename to include/etl/deque.h
diff --git a/src/doxygen.h b/include/etl/doxygen.h
similarity index 100%
rename from src/doxygen.h
rename to include/etl/doxygen.h
diff --git a/src/endianness.h b/include/etl/endianness.h
similarity index 100%
rename from src/endianness.h
rename to include/etl/endianness.h
diff --git a/src/enum_type.h b/include/etl/enum_type.h
similarity index 100%
rename from src/enum_type.h
rename to include/etl/enum_type.h
diff --git a/src/error_handler.h b/include/etl/error_handler.h
similarity index 100%
rename from src/error_handler.h
rename to include/etl/error_handler.h
diff --git a/src/exception.h b/include/etl/exception.h
similarity index 100%
rename from src/exception.h
rename to include/etl/exception.h
diff --git a/src/experimental/atomic.h b/include/etl/experimental/atomic.h
similarity index 100%
rename from src/experimental/atomic.h
rename to include/etl/experimental/atomic.h
diff --git a/src/experimental/spsc_queue.h b/include/etl/experimental/spsc_queue.h
similarity index 100%
rename from src/experimental/spsc_queue.h
rename to include/etl/experimental/spsc_queue.h
diff --git a/src/factorial.h b/include/etl/factorial.h
similarity index 100%
rename from src/factorial.h
rename to include/etl/factorial.h
diff --git a/src/factory.h b/include/etl/factory.h
similarity index 100%
rename from src/factory.h
rename to include/etl/factory.h
diff --git a/src/fibonacci.h b/include/etl/fibonacci.h
similarity index 100%
rename from src/fibonacci.h
rename to include/etl/fibonacci.h
diff --git a/src/file_error_numbers.txt b/include/etl/file_error_numbers.txt
similarity index 100%
rename from src/file_error_numbers.txt
rename to include/etl/file_error_numbers.txt
diff --git a/src/fixed_iterator.h b/include/etl/fixed_iterator.h
similarity index 100%
rename from src/fixed_iterator.h
rename to include/etl/fixed_iterator.h
diff --git a/src/flat_map.h b/include/etl/flat_map.h
similarity index 100%
rename from src/flat_map.h
rename to include/etl/flat_map.h
diff --git a/src/flat_multimap.h b/include/etl/flat_multimap.h
similarity index 100%
rename from src/flat_multimap.h
rename to include/etl/flat_multimap.h
diff --git a/src/flat_multiset.h b/include/etl/flat_multiset.h
similarity index 100%
rename from src/flat_multiset.h
rename to include/etl/flat_multiset.h
diff --git a/src/flat_set.h b/include/etl/flat_set.h
similarity index 100%
rename from src/flat_set.h
rename to include/etl/flat_set.h
diff --git a/src/fnv_1.h b/include/etl/fnv_1.h
similarity index 100%
rename from src/fnv_1.h
rename to include/etl/fnv_1.h
diff --git a/src/forward_list.h b/include/etl/forward_list.h
similarity index 100%
rename from src/forward_list.h
rename to include/etl/forward_list.h
diff --git a/src/frame_check_sequence.h b/include/etl/frame_check_sequence.h
similarity index 100%
rename from src/frame_check_sequence.h
rename to include/etl/frame_check_sequence.h
diff --git a/src/fsm.h b/include/etl/fsm.h
similarity index 100%
rename from src/fsm.h
rename to include/etl/fsm.h
diff --git a/src/fsm_generator.h b/include/etl/fsm_generator.h
similarity index 100%
rename from src/fsm_generator.h
rename to include/etl/fsm_generator.h
diff --git a/src/function.h b/include/etl/function.h
similarity index 100%
rename from src/function.h
rename to include/etl/function.h
diff --git a/src/functional.h b/include/etl/functional.h
similarity index 100%
rename from src/functional.h
rename to include/etl/functional.h
diff --git a/src/generate.bat b/include/etl/generate.bat
similarity index 100%
rename from src/generate.bat
rename to include/etl/generate.bat
diff --git a/src/generate_fsm.bat b/include/etl/generate_fsm.bat
similarity index 100%
rename from src/generate_fsm.bat
rename to include/etl/generate_fsm.bat
diff --git a/src/generate_largest.bat b/include/etl/generate_largest.bat
similarity index 100%
rename from src/generate_largest.bat
rename to include/etl/generate_largest.bat
diff --git a/src/generate_message_router.bat b/include/etl/generate_message_router.bat
similarity index 100%
rename from src/generate_message_router.bat
rename to include/etl/generate_message_router.bat
diff --git a/src/generate_smallest.bat b/include/etl/generate_smallest.bat
similarity index 100%
rename from src/generate_smallest.bat
rename to include/etl/generate_smallest.bat
diff --git a/src/generate_type_lookup.bat b/include/etl/generate_type_lookup.bat
similarity index 100%
rename from src/generate_type_lookup.bat
rename to include/etl/generate_type_lookup.bat
diff --git a/src/generate_type_traits.bat b/include/etl/generate_type_traits.bat
similarity index 100%
rename from src/generate_type_traits.bat
rename to include/etl/generate_type_traits.bat
diff --git a/src/generate_variant_pool.bat b/include/etl/generate_variant_pool.bat
similarity index 100%
rename from src/generate_variant_pool.bat
rename to include/etl/generate_variant_pool.bat
diff --git a/src/hash.h b/include/etl/hash.h
similarity index 100%
rename from src/hash.h
rename to include/etl/hash.h
diff --git a/src/icache.h b/include/etl/icache.h
similarity index 100%
rename from src/icache.h
rename to include/etl/icache.h
diff --git a/src/ihash.h b/include/etl/ihash.h
similarity index 100%
rename from src/ihash.h
rename to include/etl/ihash.h
diff --git a/src/instance_count.h b/include/etl/instance_count.h
similarity index 100%
rename from src/instance_count.h
rename to include/etl/instance_count.h
diff --git a/src/integral_limits.h b/include/etl/integral_limits.h
similarity index 100%
rename from src/integral_limits.h
rename to include/etl/integral_limits.h
diff --git a/src/intrusive_forward_list.h b/include/etl/intrusive_forward_list.h
similarity index 100%
rename from src/intrusive_forward_list.h
rename to include/etl/intrusive_forward_list.h
diff --git a/src/intrusive_links.h b/include/etl/intrusive_links.h
similarity index 100%
rename from src/intrusive_links.h
rename to include/etl/intrusive_links.h
diff --git a/src/intrusive_list.h b/include/etl/intrusive_list.h
similarity index 100%
rename from src/intrusive_list.h
rename to include/etl/intrusive_list.h
diff --git a/src/intrusive_queue.h b/include/etl/intrusive_queue.h
similarity index 100%
rename from src/intrusive_queue.h
rename to include/etl/intrusive_queue.h
diff --git a/src/intrusive_stack.h b/include/etl/intrusive_stack.h
similarity index 100%
rename from src/intrusive_stack.h
rename to include/etl/intrusive_stack.h
diff --git a/src/io_port.h b/include/etl/io_port.h
similarity index 100%
rename from src/io_port.h
rename to include/etl/io_port.h
diff --git a/src/iterator.h b/include/etl/iterator.h
similarity index 100%
rename from src/iterator.h
rename to include/etl/iterator.h
diff --git a/src/jenkins.h b/include/etl/jenkins.h
similarity index 100%
rename from src/jenkins.h
rename to include/etl/jenkins.h
diff --git a/src/largest.h b/include/etl/largest.h
similarity index 100%
rename from src/largest.h
rename to include/etl/largest.h
diff --git a/src/largest_generator.h b/include/etl/largest_generator.h
similarity index 100%
rename from src/largest_generator.h
rename to include/etl/largest_generator.h
diff --git a/src/list.h b/include/etl/list.h
similarity index 100%
rename from src/list.h
rename to include/etl/list.h
diff --git a/src/log.h b/include/etl/log.h
similarity index 100%
rename from src/log.h
rename to include/etl/log.h
diff --git a/src/map.h b/include/etl/map.h
similarity index 100%
rename from src/map.h
rename to include/etl/map.h
diff --git a/src/memory.h b/include/etl/memory.h
similarity index 100%
rename from src/memory.h
rename to include/etl/memory.h
diff --git a/src/message.h b/include/etl/message.h
similarity index 100%
rename from src/message.h
rename to include/etl/message.h
diff --git a/src/message_bus.h b/include/etl/message_bus.h
similarity index 100%
rename from src/message_bus.h
rename to include/etl/message_bus.h
diff --git a/src/message_router.h b/include/etl/message_router.h
similarity index 100%
rename from src/message_router.h
rename to include/etl/message_router.h
diff --git a/src/message_router_generator.h b/include/etl/message_router_generator.h
similarity index 100%
rename from src/message_router_generator.h
rename to include/etl/message_router_generator.h
diff --git a/src/message_timer.h b/include/etl/message_timer.h
similarity index 100%
rename from src/message_timer.h
rename to include/etl/message_timer.h
diff --git a/src/message_types.h b/include/etl/message_types.h
similarity index 100%
rename from src/message_types.h
rename to include/etl/message_types.h
diff --git a/src/multimap.h b/include/etl/multimap.h
similarity index 100%
rename from src/multimap.h
rename to include/etl/multimap.h
diff --git a/src/multiset.h b/include/etl/multiset.h
similarity index 100%
rename from src/multiset.h
rename to include/etl/multiset.h
diff --git a/src/murmur3.h b/include/etl/murmur3.h
similarity index 100%
rename from src/murmur3.h
rename to include/etl/murmur3.h
diff --git a/src/nullptr.h b/include/etl/nullptr.h
similarity index 100%
rename from src/nullptr.h
rename to include/etl/nullptr.h
diff --git a/src/numeric.h b/include/etl/numeric.h
similarity index 100%
rename from src/numeric.h
rename to include/etl/numeric.h
diff --git a/src/observer.h b/include/etl/observer.h
similarity index 100%
rename from src/observer.h
rename to include/etl/observer.h
diff --git a/src/optional.h b/include/etl/optional.h
similarity index 100%
rename from src/optional.h
rename to include/etl/optional.h
diff --git a/src/packet.h b/include/etl/packet.h
similarity index 100%
rename from src/packet.h
rename to include/etl/packet.h
diff --git a/src/parameter_type.h b/include/etl/parameter_type.h
similarity index 100%
rename from src/parameter_type.h
rename to include/etl/parameter_type.h
diff --git a/src/pearson.h b/include/etl/pearson.h
similarity index 100%
rename from src/pearson.h
rename to include/etl/pearson.h
diff --git a/src/platform.h b/include/etl/platform.h
similarity index 100%
rename from src/platform.h
rename to include/etl/platform.h
diff --git a/src/pool.h b/include/etl/pool.h
similarity index 100%
rename from src/pool.h
rename to include/etl/pool.h
diff --git a/src/power.h b/include/etl/power.h
similarity index 100%
rename from src/power.h
rename to include/etl/power.h
diff --git a/src/priority_queue.h b/include/etl/priority_queue.h
similarity index 100%
rename from src/priority_queue.h
rename to include/etl/priority_queue.h
diff --git a/src/private/ivectorpointer.h b/include/etl/private/ivectorpointer.h
similarity index 100%
rename from src/private/ivectorpointer.h
rename to include/etl/private/ivectorpointer.h
diff --git a/src/private/pvoidvector.h b/include/etl/private/pvoidvector.h
similarity index 100%
rename from src/private/pvoidvector.h
rename to include/etl/private/pvoidvector.h
diff --git a/src/private/vector_base.h b/include/etl/private/vector_base.h
similarity index 100%
rename from src/private/vector_base.h
rename to include/etl/private/vector_base.h
diff --git a/src/profiles/arduino_arm.h b/include/etl/profiles/arduino_arm.h
similarity index 100%
rename from src/profiles/arduino_arm.h
rename to include/etl/profiles/arduino_arm.h
diff --git a/src/profiles/armv5.h b/include/etl/profiles/armv5.h
similarity index 100%
rename from src/profiles/armv5.h
rename to include/etl/profiles/armv5.h
diff --git a/src/profiles/armv6.h b/include/etl/profiles/armv6.h
similarity index 100%
rename from src/profiles/armv6.h
rename to include/etl/profiles/armv6.h
diff --git a/src/profiles/cpp03.h b/include/etl/profiles/cpp03.h
similarity index 100%
rename from src/profiles/cpp03.h
rename to include/etl/profiles/cpp03.h
diff --git a/src/profiles/cpp11.h b/include/etl/profiles/cpp11.h
similarity index 100%
rename from src/profiles/cpp11.h
rename to include/etl/profiles/cpp11.h
diff --git a/src/profiles/cpp14.h b/include/etl/profiles/cpp14.h
similarity index 100%
rename from src/profiles/cpp14.h
rename to include/etl/profiles/cpp14.h
diff --git a/src/profiles/etl_profile.h b/include/etl/profiles/etl_profile.h
similarity index 100%
rename from src/profiles/etl_profile.h
rename to include/etl/profiles/etl_profile.h
diff --git a/src/profiles/gcc_generic.h b/include/etl/profiles/gcc_generic.h
similarity index 100%
rename from src/profiles/gcc_generic.h
rename to include/etl/profiles/gcc_generic.h
diff --git a/src/profiles/gcc_linux_x86.h b/include/etl/profiles/gcc_linux_x86.h
similarity index 100%
rename from src/profiles/gcc_linux_x86.h
rename to include/etl/profiles/gcc_linux_x86.h
diff --git a/src/profiles/gcc_windows_x86.h b/include/etl/profiles/gcc_windows_x86.h
similarity index 100%
rename from src/profiles/gcc_windows_x86.h
rename to include/etl/profiles/gcc_windows_x86.h
diff --git a/src/profiles/msvc_x86.h b/include/etl/profiles/msvc_x86.h
similarity index 100%
rename from src/profiles/msvc_x86.h
rename to include/etl/profiles/msvc_x86.h
diff --git a/src/profiles/ticc.h b/include/etl/profiles/ticc.h
similarity index 100%
rename from src/profiles/ticc.h
rename to include/etl/profiles/ticc.h
diff --git a/src/queue.h b/include/etl/queue.h
similarity index 100%
rename from src/queue.h
rename to include/etl/queue.h
diff --git a/src/radix.h b/include/etl/radix.h
similarity index 100%
rename from src/radix.h
rename to include/etl/radix.h
diff --git a/src/random.h b/include/etl/random.h
similarity index 100%
rename from src/random.h
rename to include/etl/random.h
diff --git a/src/ratio.h b/include/etl/ratio.h
similarity index 100%
rename from src/ratio.h
rename to include/etl/ratio.h
diff --git a/src/reference_flat_map.h b/include/etl/reference_flat_map.h
similarity index 100%
rename from src/reference_flat_map.h
rename to include/etl/reference_flat_map.h
diff --git a/src/reference_flat_multimap.h b/include/etl/reference_flat_multimap.h
similarity index 100%
rename from src/reference_flat_multimap.h
rename to include/etl/reference_flat_multimap.h
diff --git a/src/reference_flat_multiset.h b/include/etl/reference_flat_multiset.h
similarity index 100%
rename from src/reference_flat_multiset.h
rename to include/etl/reference_flat_multiset.h
diff --git a/src/reference_flat_set.h b/include/etl/reference_flat_set.h
similarity index 100%
rename from src/reference_flat_set.h
rename to include/etl/reference_flat_set.h
diff --git a/src/scheduler.h b/include/etl/scheduler.h
similarity index 100%
rename from src/scheduler.h
rename to include/etl/scheduler.h
diff --git a/src/set.h b/include/etl/set.h
similarity index 100%
rename from src/set.h
rename to include/etl/set.h
diff --git a/src/smallest.h b/include/etl/smallest.h
similarity index 100%
rename from src/smallest.h
rename to include/etl/smallest.h
diff --git a/src/smallest_generator.h b/include/etl/smallest_generator.h
similarity index 100%
rename from src/smallest_generator.h
rename to include/etl/smallest_generator.h
diff --git a/src/sqrt.h b/include/etl/sqrt.h
similarity index 100%
rename from src/sqrt.h
rename to include/etl/sqrt.h
diff --git a/src/stack.h b/include/etl/stack.h
similarity index 100%
rename from src/stack.h
rename to include/etl/stack.h
diff --git a/src/static_assert.h b/include/etl/static_assert.h
similarity index 100%
rename from src/static_assert.h
rename to include/etl/static_assert.h
diff --git a/src/string_view.h b/include/etl/string_view.h
similarity index 100%
rename from src/string_view.h
rename to include/etl/string_view.h
diff --git a/src/task.h b/include/etl/task.h
similarity index 100%
rename from src/task.h
rename to include/etl/task.h
diff --git a/src/temp.h b/include/etl/temp.h
similarity index 100%
rename from src/temp.h
rename to include/etl/temp.h
diff --git a/src/timer.h b/include/etl/timer.h
similarity index 100%
rename from src/timer.h
rename to include/etl/timer.h
diff --git a/src/type_def.h b/include/etl/type_def.h
similarity index 100%
rename from src/type_def.h
rename to include/etl/type_def.h
diff --git a/src/type_lookup.h b/include/etl/type_lookup.h
similarity index 100%
rename from src/type_lookup.h
rename to include/etl/type_lookup.h
diff --git a/src/type_lookup_generator.h b/include/etl/type_lookup_generator.h
similarity index 100%
rename from src/type_lookup_generator.h
rename to include/etl/type_lookup_generator.h
diff --git a/src/type_traits.h b/include/etl/type_traits.h
similarity index 100%
rename from src/type_traits.h
rename to include/etl/type_traits.h
diff --git a/src/type_traits_generator.h b/include/etl/type_traits_generator.h
similarity index 100%
rename from src/type_traits_generator.h
rename to include/etl/type_traits_generator.h
diff --git a/src/u16string.h b/include/etl/u16string.h
similarity index 100%
rename from src/u16string.h
rename to include/etl/u16string.h
diff --git a/src/u32string.h b/include/etl/u32string.h
similarity index 100%
rename from src/u32string.h
rename to include/etl/u32string.h
diff --git a/src/unordered_map.h b/include/etl/unordered_map.h
similarity index 100%
rename from src/unordered_map.h
rename to include/etl/unordered_map.h
diff --git a/src/unordered_multimap.h b/include/etl/unordered_multimap.h
similarity index 100%
rename from src/unordered_multimap.h
rename to include/etl/unordered_multimap.h
diff --git a/src/unordered_multiset.h b/include/etl/unordered_multiset.h
similarity index 100%
rename from src/unordered_multiset.h
rename to include/etl/unordered_multiset.h
diff --git a/src/unordered_set.h b/include/etl/unordered_set.h
similarity index 100%
rename from src/unordered_set.h
rename to include/etl/unordered_set.h
diff --git a/src/user_type.h b/include/etl/user_type.h
similarity index 100%
rename from src/user_type.h
rename to include/etl/user_type.h
diff --git a/src/utility.h b/include/etl/utility.h
similarity index 100%
rename from src/utility.h
rename to include/etl/utility.h
diff --git a/src/variant.h b/include/etl/variant.h
similarity index 100%
rename from src/variant.h
rename to include/etl/variant.h
diff --git a/src/variant_pool.h b/include/etl/variant_pool.h
similarity index 100%
rename from src/variant_pool.h
rename to include/etl/variant_pool.h
diff --git a/src/variant_pool_generator.h b/include/etl/variant_pool_generator.h
similarity index 100%
rename from src/variant_pool_generator.h
rename to include/etl/variant_pool_generator.h
diff --git a/src/vector.h b/include/etl/vector.h
similarity index 100%
rename from src/vector.h
rename to include/etl/vector.h
diff --git a/src/version.h b/include/etl/version.h
similarity index 100%
rename from src/version.h
rename to include/etl/version.h
diff --git a/src/visitor.h b/include/etl/visitor.h
similarity index 100%
rename from src/visitor.h
rename to include/etl/visitor.h
diff --git a/src/wstring.h b/include/etl/wstring.h
similarity index 100%
rename from src/wstring.h
rename to include/etl/wstring.h
diff --git a/src/c/ecl_timer.c b/src/c/ecl_timer.c
index 6f648f88..004ee669 100644
--- a/src/c/ecl_timer.c
+++ b/src/c/ecl_timer.c
@@ -29,7 +29,7 @@ SOFTWARE.
 #include <stdint.h>
 #include <assert.h>
 
-#include "ecl_timer.h"
+#include "../../include/etl/c/ecl_timer.h"
 
 //*****************************************************************************
 // Internal timer list
@@ -326,7 +326,7 @@ ecl_timer_id_t ecl_timer_register(void             (*pcallback_)(),
 ecl_timer_result_t ecl_timer_unregister(ecl_timer_id_t id_)
 {
   assert(ecl.ptimers != 0);
-  
+
   ecl_timer_result_t result = ECL_TIMER_FAIL;
 
   if (id_ != ECL_TIMER_NO_TIMER)
@@ -376,7 +376,7 @@ ecl_timer_result_t ecl_timer_is_running()
 /// Clears the timer of data.
 //*******************************************
 void ecl_timer_clear()
-{ 
+{
   ecl_timer_list_clear();
 
   int i;
@@ -398,7 +398,7 @@ void ecl_timer_clear()
 ecl_timer_result_t ecl_timer_tick(uint32_t count)
 {
   assert(ecl.ptimers != 0);
-  
+
   if (ecl.enabled)
   {
     if (ECL_TIMER_PROCESSING_ENABLED)
@@ -452,7 +452,7 @@ ecl_timer_result_t ecl_timer_tick(uint32_t count)
 ecl_timer_result_t ecl_timer_start(ecl_timer_id_t id_, ecl_timer_start_t immediate_)
 {
   assert(ecl.ptimers != 0);
-  
+
   ecl_timer_result_t result = ECL_TIMER_FAIL;
 
   // Valid timer id?
@@ -490,7 +490,7 @@ ecl_timer_result_t ecl_timer_start(ecl_timer_id_t id_, ecl_timer_start_t immedia
 ecl_timer_result_t ecl_timer_stop(ecl_timer_id_t id_)
 {
   assert(ecl.ptimers != 0);
-  
+
   ecl_timer_result_t result = ECL_TIMER_FAIL;
 
   // Valid timer id?
@@ -520,7 +520,7 @@ ecl_timer_result_t ecl_timer_stop(ecl_timer_id_t id_)
 ecl_timer_result_t ecl_timer_set_period(ecl_timer_id_t id_, ecl_timer_time_t period_)
 {
   assert(ecl.ptimers != 0);
-  
+
   if (ecl_timer_stop(id_))
   {
     ecl.ptimers[id_].period = period_;
@@ -536,7 +536,7 @@ ecl_timer_result_t ecl_timer_set_period(ecl_timer_id_t id_, ecl_timer_time_t per
 ecl_timer_result_t ecl_timer_set_mode(ecl_timer_id_t id_, ecl_timer_mode_t repeating_)
 {
   assert(ecl.ptimers != 0);
-  
+
   if (ecl_timer_stop(id_))
   {
     ecl.ptimers[id_].repeating = repeating_;
diff --git a/src/private/pvoidvector.cpp b/src/private/pvoidvector.cpp
index e714921e..5b000adf 100644
--- a/src/private/pvoidvector.cpp
+++ b/src/private/pvoidvector.cpp
@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#include "../platform.h"
-#include "pvoidvector.h"
+#include "../../include/etl/platform.h"
+#include "../../include/etl/private/pvoidvector.h"
 
 namespace etl
 {
diff --git a/support/Release notes.txt b/support/Release notes.txt
index 8b7238fd..1f55c588 100644
--- a/support/Release notes.txt	
+++ b/support/Release notes.txt	
@@ -1,3 +1,9 @@
+===============================================================================
+11.00.0
+New directory structure.
+C & CPP files in src/
+H files in include/etl/
+
 ===============================================================================
 10.21.2
 Added version.h
diff --git a/test/codeblocks/ETL.cbp b/test/codeblocks/ETL.cbp
index 9857c6e7..a399f5d1 100644
--- a/test/codeblocks/ETL.cbp
+++ b/test/codeblocks/ETL.cbp
@@ -53,164 +53,169 @@
 			<Add directory="../../src" />
 			<Add directory="../" />
 			<Add directory="../../src/c" />
+			<Add directory="../../include/etl" />
 		</Compiler>
-		<Unit filename="../../src/algorithm.h" />
-		<Unit filename="../../src/alignment.h" />
-		<Unit filename="../../src/array.h" />
-		<Unit filename="../../src/array_view.h" />
-		<Unit filename="../../src/array_wrapper.h" />
-		<Unit filename="../../src/basic_string.h" />
+		<Unit filename="../../include/etl/algorithm.h" />
+		<Unit filename="../../include/etl/alignment.h" />
+		<Unit filename="../../include/etl/array.h" />
+		<Unit filename="../../include/etl/array_view.h" />
+		<Unit filename="../../include/etl/array_wrapper.h" />
+		<Unit filename="../../include/etl/atomic.h" />
+		<Unit filename="../../include/etl/atomic/atomic_arm.h" />
+		<Unit filename="../../include/etl/atomic/atomic_gcc.h" />
+		<Unit filename="../../include/etl/atomic/atomic_windows.h" />
+		<Unit filename="../../include/etl/basic_string.h" />
+		<Unit filename="../../include/etl/binary.h" />
+		<Unit filename="../../include/etl/bitset.h" />
+		<Unit filename="../../include/etl/bloom_filter.h" />
+		<Unit filename="../../include/etl/c/ecl_timer.h" />
+		<Unit filename="../../include/etl/callback.h" />
+		<Unit filename="../../include/etl/callback_timer.h" />
+		<Unit filename="../../include/etl/char_traits.h" />
+		<Unit filename="../../include/etl/checksum.h" />
+		<Unit filename="../../include/etl/compare.h" />
+		<Unit filename="../../include/etl/constant.h" />
+		<Unit filename="../../include/etl/container.h" />
+		<Unit filename="../../include/etl/crc16.h" />
+		<Unit filename="../../include/etl/crc16_ccitt.h" />
+		<Unit filename="../../include/etl/crc16_kermit.h" />
+		<Unit filename="../../include/etl/crc32.h" />
+		<Unit filename="../../include/etl/crc64_ecma.h" />
+		<Unit filename="../../include/etl/crc8_ccitt.h" />
+		<Unit filename="../../include/etl/cstring.h" />
+		<Unit filename="../../include/etl/cyclic_value.h" />
+		<Unit filename="../../include/etl/debounce.h" />
+		<Unit filename="../../include/etl/debug_count.h" />
+		<Unit filename="../../include/etl/deque.h" />
+		<Unit filename="../../include/etl/doxygen.h" />
+		<Unit filename="../../include/etl/endianness.h" />
+		<Unit filename="../../include/etl/enum_type.h" />
+		<Unit filename="../../include/etl/error_handler.h" />
+		<Unit filename="../../include/etl/exception.h" />
+		<Unit filename="../../include/etl/experimental/atomic.h" />
+		<Unit filename="../../include/etl/experimental/spsc_queue.h" />
+		<Unit filename="../../include/etl/factorial.h" />
+		<Unit filename="../../include/etl/factory.h" />
+		<Unit filename="../../include/etl/fibonacci.h" />
+		<Unit filename="../../include/etl/fixed_iterator.h" />
+		<Unit filename="../../include/etl/flat_map.h" />
+		<Unit filename="../../include/etl/flat_multimap.h" />
+		<Unit filename="../../include/etl/flat_multiset.h" />
+		<Unit filename="../../include/etl/flat_set.h" />
+		<Unit filename="../../include/etl/fnv_1.h" />
+		<Unit filename="../../include/etl/forward_list.h" />
+		<Unit filename="../../include/etl/frame_check_sequence.h" />
+		<Unit filename="../../include/etl/fsm.h" />
+		<Unit filename="../../include/etl/fsm_generator.h" />
+		<Unit filename="../../include/etl/function.h" />
+		<Unit filename="../../include/etl/functional.h" />
+		<Unit filename="../../include/etl/hash.h" />
+		<Unit filename="../../include/etl/icache.h" />
+		<Unit filename="../../include/etl/ihash.h" />
+		<Unit filename="../../include/etl/instance_count.h" />
+		<Unit filename="../../include/etl/integral_limits.h" />
+		<Unit filename="../../include/etl/intrusive_forward_list.h" />
+		<Unit filename="../../include/etl/intrusive_links.h" />
+		<Unit filename="../../include/etl/intrusive_list.h" />
+		<Unit filename="../../include/etl/intrusive_queue.h" />
+		<Unit filename="../../include/etl/intrusive_stack.h" />
+		<Unit filename="../../include/etl/io_port.h" />
+		<Unit filename="../../include/etl/iterator.h" />
+		<Unit filename="../../include/etl/jenkins.h" />
+		<Unit filename="../../include/etl/largest.h" />
+		<Unit filename="../../include/etl/largest_generator.h" />
+		<Unit filename="../../include/etl/list.h" />
+		<Unit filename="../../include/etl/log.h" />
+		<Unit filename="../../include/etl/map.h" />
+		<Unit filename="../../include/etl/memory.h" />
+		<Unit filename="../../include/etl/message.h" />
+		<Unit filename="../../include/etl/message_bus.h" />
+		<Unit filename="../../include/etl/message_router.h" />
+		<Unit filename="../../include/etl/message_router_generator.h" />
+		<Unit filename="../../include/etl/message_timer.h" />
+		<Unit filename="../../include/etl/message_types.h" />
+		<Unit filename="../../include/etl/multimap.h" />
+		<Unit filename="../../include/etl/multiset.h" />
+		<Unit filename="../../include/etl/murmur3.h" />
+		<Unit filename="../../include/etl/nullptr.h" />
+		<Unit filename="../../include/etl/numeric.h" />
+		<Unit filename="../../include/etl/observer.h" />
+		<Unit filename="../../include/etl/optional.h" />
+		<Unit filename="../../include/etl/packet.h" />
+		<Unit filename="../../include/etl/parameter_type.h" />
+		<Unit filename="../../include/etl/pearson.h" />
+		<Unit filename="../../include/etl/platform.h" />
+		<Unit filename="../../include/etl/pool.h" />
+		<Unit filename="../../include/etl/power.h" />
+		<Unit filename="../../include/etl/priority_queue.h" />
+		<Unit filename="../../include/etl/private/ivectorpointer.h" />
+		<Unit filename="../../include/etl/private/pvoidvector.h" />
+		<Unit filename="../../include/etl/private/vector_base.h" />
+		<Unit filename="../../include/etl/profiles/arduino_arm.h" />
+		<Unit filename="../../include/etl/profiles/armv5.h" />
+		<Unit filename="../../include/etl/profiles/armv6.h" />
+		<Unit filename="../../include/etl/profiles/cpp03.h" />
+		<Unit filename="../../include/etl/profiles/cpp11.h" />
+		<Unit filename="../../include/etl/profiles/cpp14.h" />
+		<Unit filename="../../include/etl/profiles/etl_profile.h" />
+		<Unit filename="../../include/etl/profiles/gcc_generic.h" />
+		<Unit filename="../../include/etl/profiles/gcc_linux_x86.h" />
+		<Unit filename="../../include/etl/profiles/gcc_windows_x86.h" />
+		<Unit filename="../../include/etl/profiles/msvc_x86.h" />
+		<Unit filename="../../include/etl/profiles/ticc.h" />
+		<Unit filename="../../include/etl/queue.h" />
+		<Unit filename="../../include/etl/radix.h" />
+		<Unit filename="../../include/etl/random.h" />
+		<Unit filename="../../include/etl/ratio.h" />
+		<Unit filename="../../include/etl/reference_flat_map.h" />
+		<Unit filename="../../include/etl/reference_flat_multimap.h" />
+		<Unit filename="../../include/etl/reference_flat_multiset.h" />
+		<Unit filename="../../include/etl/reference_flat_set.h" />
+		<Unit filename="../../include/etl/scheduler.h" />
+		<Unit filename="../../include/etl/set.h" />
+		<Unit filename="../../include/etl/smallest.h" />
+		<Unit filename="../../include/etl/smallest_generator.h" />
+		<Unit filename="../../include/etl/sqrt.h" />
+		<Unit filename="../../include/etl/stack.h" />
+		<Unit filename="../../include/etl/static_assert.h" />
+		<Unit filename="../../include/etl/string_view.h" />
+		<Unit filename="../../include/etl/task.h" />
+		<Unit filename="../../include/etl/temp.h" />
+		<Unit filename="../../include/etl/timer.h" />
+		<Unit filename="../../include/etl/type_def.h" />
+		<Unit filename="../../include/etl/type_lookup.h" />
+		<Unit filename="../../include/etl/type_lookup_generator.h" />
+		<Unit filename="../../include/etl/type_traits.h" />
+		<Unit filename="../../include/etl/type_traits_generator.h" />
+		<Unit filename="../../include/etl/u16string.h" />
+		<Unit filename="../../include/etl/u32string.h" />
+		<Unit filename="../../include/etl/unordered_map.h" />
+		<Unit filename="../../include/etl/unordered_multimap.h" />
+		<Unit filename="../../include/etl/unordered_multiset.h" />
+		<Unit filename="../../include/etl/unordered_set.h" />
+		<Unit filename="../../include/etl/user_type.h" />
+		<Unit filename="../../include/etl/utility.h" />
+		<Unit filename="../../include/etl/variant.h" />
+		<Unit filename="../../include/etl/variant_pool.h" />
+		<Unit filename="../../include/etl/variant_pool_generator.h" />
+		<Unit filename="../../include/etl/vector.h" />
+		<Unit filename="../../include/etl/version.h" />
+		<Unit filename="../../include/etl/visitor.h" />
+		<Unit filename="../../include/etl/wstring.h" />
 		<Unit filename="../../src/binary.cpp" />
-		<Unit filename="../../src/binary.h" />
-		<Unit filename="../../src/bitset.h" />
-		<Unit filename="../../src/bloom_filter.h" />
 		<Unit filename="../../src/c/ecl_timer.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../../src/c/ecl_timer.h" />
-		<Unit filename="../../src/callback.h" />
-		<Unit filename="../../src/callback_timer.h" />
-		<Unit filename="../../src/char_traits.h" />
-		<Unit filename="../../src/checksum.h" />
-		<Unit filename="../../src/compare.h" />
-		<Unit filename="../../src/container.h" />
 		<Unit filename="../../src/crc16.cpp" />
-		<Unit filename="../../src/crc16.h" />
 		<Unit filename="../../src/crc16_ccitt.cpp" />
-		<Unit filename="../../src/crc16_ccitt.h" />
 		<Unit filename="../../src/crc16_kermit.cpp" />
-		<Unit filename="../../src/crc16_kermit.h" />
 		<Unit filename="../../src/crc32.cpp" />
-		<Unit filename="../../src/crc32.h" />
 		<Unit filename="../../src/crc64_ecma.cpp" />
-		<Unit filename="../../src/crc64_ecma.h" />
 		<Unit filename="../../src/crc8_ccitt.cpp" />
-		<Unit filename="../../src/crc8_ccitt.h" />
-		<Unit filename="../../src/cstring.h" />
-		<Unit filename="../../src/cyclic_hash.h" />
-		<Unit filename="../../src/cyclic_value.h" />
-		<Unit filename="../../src/debounce.h" />
-		<Unit filename="../../src/debug_count.h" />
-		<Unit filename="../../src/deque.h" />
-		<Unit filename="../../src/doxygen.h" />
-		<Unit filename="../../src/endianness.h" />
-		<Unit filename="../../src/enum_type.h" />
 		<Unit filename="../../src/error_handler.cpp" />
-		<Unit filename="../../src/error_handler.h" />
-		<Unit filename="../../src/etl_arduino.h" />
-		<Unit filename="../../src/exception.h" />
-		<Unit filename="../../src/factorial.h" />
-		<Unit filename="../../src/fibonacci.h" />
-		<Unit filename="../../src/fixed_iterator.h" />
-		<Unit filename="../../src/flat_map.h" />
-		<Unit filename="../../src/flat_multimap.h" />
-		<Unit filename="../../src/flat_multiset.h" />
-		<Unit filename="../../src/flat_set.h" />
-		<Unit filename="../../src/fnv_1.h" />
-		<Unit filename="../../src/forward_list.h" />
-		<Unit filename="../../src/frame_check_sequence.h" />
-		<Unit filename="../../src/fsm.h" />
-		<Unit filename="../../src/fsm_generator.h" />
-		<Unit filename="../../src/function.h" />
-		<Unit filename="../../src/functional.h" />
-		<Unit filename="../../src/functors.h" />
-		<Unit filename="../../src/hash.h" />
-		<Unit filename="../../src/icache.h" />
-		<Unit filename="../../src/ihash.h" />
-		<Unit filename="../../src/instance_count.h" />
-		<Unit filename="../../src/integral_limits.h" />
-		<Unit filename="../../src/intrusive_flat_map.h" />
-		<Unit filename="../../src/intrusive_flat_multimap.h" />
-		<Unit filename="../../src/intrusive_flat_multiset.h" />
-		<Unit filename="../../src/intrusive_flat_set.h" />
-		<Unit filename="../../src/intrusive_forward_list.h" />
-		<Unit filename="../../src/intrusive_links.h" />
-		<Unit filename="../../src/intrusive_list.h" />
-		<Unit filename="../../src/intrusive_queue.h" />
-		<Unit filename="../../src/intrusive_stack.h" />
-		<Unit filename="../../src/io_port.h" />
-		<Unit filename="../../src/iterator.h" />
-		<Unit filename="../../src/jenkins.h" />
-		<Unit filename="../../src/largest.h" />
-		<Unit filename="../../src/largest_generator.h" />
-		<Unit filename="../../src/list.h" />
-		<Unit filename="../../src/log.h" />
-		<Unit filename="../../src/map.h" />
-		<Unit filename="../../src/memory.h" />
-		<Unit filename="../../src/message_bus.h" />
-		<Unit filename="../../src/message_processor.h" />
-		<Unit filename="../../src/message_processor_generator.h" />
-		<Unit filename="../../src/message_router.h" />
-		<Unit filename="../../src/message_router_generator.h" />
-		<Unit filename="../../src/message_timer.h" />
-		<Unit filename="../../src/message_types.h" />
-		<Unit filename="../../src/multimap.h" />
-		<Unit filename="../../src/multiset.h" />
-		<Unit filename="../../src/murmur3.h" />
-		<Unit filename="../../src/nullptr.h" />
-		<Unit filename="../../src/numeric.h" />
-		<Unit filename="../../src/observer.h" />
-		<Unit filename="../../src/optional.h" />
-		<Unit filename="../../src/packet.h" />
-		<Unit filename="../../src/parameter_type.h" />
 		<Unit filename="../../src/pearson.cpp" />
-		<Unit filename="../../src/pearson.h" />
-		<Unit filename="../../src/platform.h" />
-		<Unit filename="../../src/pool.h" />
-		<Unit filename="../../src/power.h" />
-		<Unit filename="../../src/priority_queue.h" />
-		<Unit filename="../../src/private/ivectorpointer.h" />
 		<Unit filename="../../src/private/pvoidvector.cpp" />
-		<Unit filename="../../src/private/pvoidvector.h" />
-		<Unit filename="../../src/private/vector_base.h" />
-		<Unit filename="../../src/profiles/arduino_arm.h" />
-		<Unit filename="../../src/profiles/armv5.h" />
-		<Unit filename="../../src/profiles/armv6.h" />
-		<Unit filename="../../src/profiles/cpp03.h" />
-		<Unit filename="../../src/profiles/cpp11.h" />
-		<Unit filename="../../src/profiles/cpp14.h" />
-		<Unit filename="../../src/profiles/gcc_generic.h" />
-		<Unit filename="../../src/profiles/gcc_linux_x86.h" />
-		<Unit filename="../../src/profiles/gcc_windows_x86.h" />
-		<Unit filename="../../src/profiles/msvc_x86.h" />
-		<Unit filename="../../src/profiles/ticc.h" />
-		<Unit filename="../../src/queue.h" />
-		<Unit filename="../../src/radix.h" />
 		<Unit filename="../../src/random.cpp" />
-		<Unit filename="../../src/random.h" />
-		<Unit filename="../../src/ratio.h" />
-		<Unit filename="../../src/reference_flat_map.h" />
-		<Unit filename="../../src/reference_flat_multimap.h" />
-		<Unit filename="../../src/reference_flat_multiset.h" />
-		<Unit filename="../../src/reference_flat_set.h" />
-		<Unit filename="../../src/scheduler.h" />
-		<Unit filename="../../src/set.h" />
-		<Unit filename="../../src/smallest.h" />
-		<Unit filename="../../src/smallest_generator.h" />
-		<Unit filename="../../src/stack.h" />
-		<Unit filename="../../src/static_assert.h" />
-		<Unit filename="../../src/string_view.h" />
-		<Unit filename="../../src/task.h" />
-		<Unit filename="../../src/timer.h" />
-		<Unit filename="../../src/type_def.h" />
-		<Unit filename="../../src/type_lookup.h" />
-		<Unit filename="../../src/type_lookup_generator.h" />
-		<Unit filename="../../src/type_traits.h" />
-		<Unit filename="../../src/type_traits_generator.h" />
-		<Unit filename="../../src/u16string.h" />
-		<Unit filename="../../src/u32string.h" />
-		<Unit filename="../../src/unordered_map.h" />
-		<Unit filename="../../src/unordered_multimap.h" />
-		<Unit filename="../../src/unordered_multiset.h" />
-		<Unit filename="../../src/unordered_set.h" />
-		<Unit filename="../../src/user_type.h" />
-		<Unit filename="../../src/utility.h" />
-		<Unit filename="../../src/variant.h" />
-		<Unit filename="../../src/variant_pool.h" />
-		<Unit filename="../../src/vector.h" />
-		<Unit filename="../../src/version.h" />
-		<Unit filename="../../src/visitor.h" />
-		<Unit filename="../../src/wstring.h" />
 		<Unit filename="../../unittest-cpp/UnitTest++/AssertException.cpp" />
 		<Unit filename="../../unittest-cpp/UnitTest++/AssertException.h" />
 		<Unit filename="../../unittest-cpp/UnitTest++/CheckMacros.h" />
diff --git a/test/test_c_timer_framework.cpp b/test/test_c_timer_framework.cpp
index 3868fcc3..47aa0aa9 100644
--- a/test/test_c_timer_framework.cpp
+++ b/test/test_c_timer_framework.cpp
@@ -35,7 +35,7 @@ extern "C"
 {
   uint32_t timer_semaphore;
 
-  #include "ecl_timer.h"
+  #include "../include/etl/c/ecl_timer.h"
 }
 
 #include <iostream>
diff --git a/test/vs2017/etl.vcxproj b/test/vs2017/etl.vcxproj
index 5e1be754..43f7decb 100644
--- a/test/vs2017/etl.vcxproj
+++ b/test/vs2017/etl.vcxproj
@@ -74,7 +74,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../unittest-cpp/UnitTest++/;../../src;../../src/c;../../test</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../unittest-cpp/UnitTest++/;../../include/etl;../../include/etl/c;../../test</AdditionalIncludeDirectories>
       <UndefinePreprocessorDefinitions>
       </UndefinePreprocessorDefinitions>
       <MultiProcessorCompilation>false</MultiProcessorCompilation>
@@ -131,48 +131,48 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\array_view.h" />
-    <ClInclude Include="..\..\src\array_wrapper.h" />
-    <ClInclude Include="..\..\src\atomic.h" />
-    <ClInclude Include="..\..\src\atomic\atomic_arm.h" />
-    <ClInclude Include="..\..\src\atomic\atomic_gcc.h" />
-    <ClInclude Include="..\..\src\callback_timer.h" />
-    <ClInclude Include="..\..\src\compare.h" />
-    <ClInclude Include="..\..\src\constant.h" />
-    <ClInclude Include="..\..\src\c\ecl_timer.h" />
-    <ClInclude Include="..\..\src\fsm.h" />
-    <ClInclude Include="..\..\src\fsm_generator.h" />
-    <ClInclude Include="..\..\src\largest_generator.h" />
-    <ClInclude Include="..\..\src\message.h" />
-    <ClInclude Include="..\..\src\message_bus.h" />
-    <ClInclude Include="..\..\src\message_timer.h" />
-    <ClInclude Include="..\..\src\message_types.h" />
-    <ClInclude Include="..\..\src\message_router.h" />
-    <ClInclude Include="..\..\src\message_router_generator.h" />
-    <ClInclude Include="..\..\src\packet.h" />
-    <ClInclude Include="..\..\src\profiles\arduino_arm.h" />
-    <ClInclude Include="..\..\src\profiles\armv5.h" />
-    <ClInclude Include="..\..\src\profiles\armv6.h" />
-    <ClInclude Include="..\..\src\profiles\cpp03.h" />
-    <ClInclude Include="..\..\src\profiles\cpp11.h" />
-    <ClInclude Include="..\..\src\profiles\cpp14.h" />
-    <ClInclude Include="..\..\src\profiles\gcc_generic.h" />
-    <ClInclude Include="..\..\src\profiles\gcc_linux_x86.h" />
-    <ClInclude Include="..\..\src\profiles\gcc_windows_x86.h" />
-    <ClInclude Include="..\..\src\profiles\msvc_x86.h" />
-    <ClInclude Include="..\..\src\profiles\ticc.h" />
-    <ClInclude Include="..\..\src\scheduler.h" />
-    <ClInclude Include="..\..\src\smallest_generator.h" />
-    <ClInclude Include="..\..\src\sqrt.h" />
-    <ClInclude Include="..\..\src\string_view.h" />
-    <ClInclude Include="..\..\src\task.h" />
-    <ClInclude Include="..\..\src\timer.h" />
-    <ClInclude Include="..\..\src\type_lookup.h" />
-    <ClInclude Include="..\..\src\type_lookup_generator.h" />
-    <ClInclude Include="..\..\src\type_traits_generator.h" />
-    <ClInclude Include="..\..\src\variant_pool.h" />
-    <ClInclude Include="..\..\src\variant_pool_generator.h" />
-    <ClInclude Include="..\..\src\version.h" />
+    <ClInclude Include="..\..\include\etl\array_view.h" />
+    <ClInclude Include="..\..\include\etl\array_wrapper.h" />
+    <ClInclude Include="..\..\include\etl\atomic.h" />
+    <ClInclude Include="..\..\include\etl\atomic\atomic_arm.h" />
+    <ClInclude Include="..\..\include\etl\atomic\atomic_gcc.h" />
+    <ClInclude Include="..\..\include\etl\callback_timer.h" />
+    <ClInclude Include="..\..\include\etl\compare.h" />
+    <ClInclude Include="..\..\include\etl\constant.h" />
+    <ClInclude Include="..\..\include\etl\c\ecl_timer.h" />
+    <ClInclude Include="..\..\include\etl\fsm.h" />
+    <ClInclude Include="..\..\include\etl\fsm_generator.h" />
+    <ClInclude Include="..\..\include\etl\largest_generator.h" />
+    <ClInclude Include="..\..\include\etl\message.h" />
+    <ClInclude Include="..\..\include\etl\message_bus.h" />
+    <ClInclude Include="..\..\include\etl\message_timer.h" />
+    <ClInclude Include="..\..\include\etl\message_types.h" />
+    <ClInclude Include="..\..\include\etl\message_router.h" />
+    <ClInclude Include="..\..\include\etl\message_router_generator.h" />
+    <ClInclude Include="..\..\include\etl\packet.h" />
+    <ClInclude Include="..\..\include\etl\profiles\arduino_arm.h" />
+    <ClInclude Include="..\..\include\etl\profiles\armv5.h" />
+    <ClInclude Include="..\..\include\etl\profiles\armv6.h" />
+    <ClInclude Include="..\..\include\etl\profiles\cpp03.h" />
+    <ClInclude Include="..\..\include\etl\profiles\cpp11.h" />
+    <ClInclude Include="..\..\include\etl\profiles\cpp14.h" />
+    <ClInclude Include="..\..\include\etl\profiles\gcc_generic.h" />
+    <ClInclude Include="..\..\include\etl\profiles\gcc_linux_x86.h" />
+    <ClInclude Include="..\..\include\etl\profiles\gcc_windows_x86.h" />
+    <ClInclude Include="..\..\include\etl\profiles\msvc_x86.h" />
+    <ClInclude Include="..\..\include\etl\profiles\ticc.h" />
+    <ClInclude Include="..\..\include\etl\scheduler.h" />
+    <ClInclude Include="..\..\include\etl\smallest_generator.h" />
+    <ClInclude Include="..\..\include\etl\sqrt.h" />
+    <ClInclude Include="..\..\include\etl\string_view.h" />
+    <ClInclude Include="..\..\include\etl\task.h" />
+    <ClInclude Include="..\..\include\etl\timer.h" />
+    <ClInclude Include="..\..\include\etl\type_lookup.h" />
+    <ClInclude Include="..\..\include\etl\type_lookup_generator.h" />
+    <ClInclude Include="..\..\include\etl\type_traits_generator.h" />
+    <ClInclude Include="..\..\include\etl\variant_pool.h" />
+    <ClInclude Include="..\..\include\etl\variant_pool_generator.h" />
+    <ClInclude Include="..\..\include\etl\version.h" />
     <ClInclude Include="..\..\unittest-cpp\UnitTest++\AssertException.h" />
     <ClInclude Include="..\..\unittest-cpp\UnitTest++\CheckMacros.h" />
     <ClInclude Include="..\..\unittest-cpp\UnitTest++\Checks.h" />
@@ -202,102 +202,102 @@
     <ClInclude Include="..\..\unittest-cpp\UnitTest++\UnitTestPP.h" />
     <ClInclude Include="..\..\unittest-cpp\UnitTest++\Win32\TimeHelpers.h" />
     <ClInclude Include="..\..\unittest-cpp\UnitTest++\XmlTestReporter.h" />
-    <ClInclude Include="..\..\src\algorithm.h" />
-    <ClInclude Include="..\..\src\alignment.h" />
-    <ClInclude Include="..\..\src\array.h" />
-    <ClInclude Include="..\..\src\basic_string.h" />
-    <ClInclude Include="..\..\src\binary.h" />
-    <ClInclude Include="..\..\src\bitset.h" />
-    <ClInclude Include="..\..\src\bloom_filter.h" />
-    <ClInclude Include="..\..\src\char_traits.h" />
-    <ClInclude Include="..\..\src\checksum.h" />
-    <ClInclude Include="..\..\src\crc16.h" />
-    <ClInclude Include="..\..\src\crc16_ccitt.h" />
-    <ClInclude Include="..\..\src\crc16_kermit.h" />
-    <ClInclude Include="..\..\src\crc32.h" />
-    <ClInclude Include="..\..\src\crc64_ecma.h" />
-    <ClInclude Include="..\..\src\crc8_ccitt.h" />
-    <ClInclude Include="..\..\src\cstring.h" />
-    <ClInclude Include="..\..\src\cyclic_value.h" />
-    <ClInclude Include="..\..\src\debounce.h" />
-    <ClInclude Include="..\..\src\debug_count.h" />
-    <ClInclude Include="..\..\src\deque.h" />
-    <ClInclude Include="..\..\src\doxygen.h" />
-    <ClInclude Include="..\..\src\endianness.h" />
-    <ClInclude Include="..\..\src\enum_type.h" />
-    <ClInclude Include="..\..\src\error_handler.h" />
-    <ClInclude Include="..\..\src\exception.h" />
-    <ClInclude Include="..\..\src\factorial.h" />
-    <ClInclude Include="..\..\src\fibonacci.h" />
-    <ClInclude Include="..\..\src\fixed_iterator.h" />
-    <ClInclude Include="..\..\src\flat_multimap.h" />
-    <ClInclude Include="..\..\src\flat_multiset.h" />
-    <ClInclude Include="..\..\src\flat_set.h" />
-    <ClInclude Include="..\..\src\fnv_1.h" />
-    <ClInclude Include="..\..\src\forward_list.h" />
-    <ClInclude Include="..\..\src\function.h" />
-    <ClInclude Include="..\..\src\functional.h" />
-    <ClInclude Include="..\..\src\hash.h" />
-    <ClInclude Include="..\..\src\ihash.h" />
-    <ClInclude Include="..\..\src\instance_count.h" />
-    <ClInclude Include="..\..\src\integral_limits.h" />
-    <ClInclude Include="..\..\src\intrusive_forward_list.h" />
-    <ClInclude Include="..\..\src\intrusive_links.h" />
-    <ClInclude Include="..\..\src\intrusive_list.h" />
-    <ClInclude Include="..\..\src\intrusive_queue.h" />
-    <ClInclude Include="..\..\src\intrusive_stack.h" />
-    <ClInclude Include="..\..\src\io_port.h" />
-    <ClInclude Include="..\..\src\container.h" />
-    <ClInclude Include="..\..\src\iterator.h" />
-    <ClInclude Include="..\..\src\jenkins.h" />
-    <ClInclude Include="..\..\src\largest.h" />
-    <ClInclude Include="..\..\src\list.h" />
-    <ClInclude Include="..\..\src\log.h" />
-    <ClInclude Include="..\..\src\flat_map.h" />
-    <ClInclude Include="..\..\src\map.h" />
-    <ClInclude Include="..\..\src\memory.h" />
-    <ClInclude Include="..\..\src\multimap.h" />
-    <ClInclude Include="..\..\src\multiset.h" />
-    <ClInclude Include="..\..\src\murmur3.h" />
-    <ClInclude Include="..\..\src\nullptr.h" />
-    <ClInclude Include="..\..\src\numeric.h" />
-    <ClInclude Include="..\..\src\observer.h" />
-    <ClInclude Include="..\..\src\optional.h" />
-    <ClInclude Include="..\..\src\parameter_type.h" />
-    <ClInclude Include="..\..\src\pearson.h" />
-    <ClInclude Include="..\..\src\platform.h" />
-    <ClInclude Include="..\..\src\pool.h" />
-    <ClInclude Include="..\..\src\power.h" />
-    <ClInclude Include="..\..\src\priority_queue.h" />
-    <ClInclude Include="..\..\src\private\pvoidvector.h" />
-    <ClInclude Include="..\..\src\private\vector_base.h" />
-    <ClInclude Include="..\..\src\queue.h" />
-    <ClInclude Include="..\..\src\radix.h" />
-    <ClInclude Include="..\..\src\random.h" />
-    <ClInclude Include="..\..\src\reference_flat_map.h" />
-    <ClInclude Include="..\..\src\reference_flat_multimap.h" />
-    <ClInclude Include="..\..\src\reference_flat_multiset.h" />
-    <ClInclude Include="..\..\src\reference_flat_set.h" />
-    <ClInclude Include="..\..\src\set.h" />
-    <ClInclude Include="..\..\src\smallest.h" />
-    <ClInclude Include="..\..\src\stack.h" />
-    <ClInclude Include="..\..\src\static_assert.h" />
-    <ClInclude Include="..\..\src\test1.h" />
-    <ClInclude Include="..\..\src\test2.h" />
-    <ClInclude Include="..\..\src\type_def.h" />
-    <ClInclude Include="..\..\src\type_traits.h" />
-    <ClInclude Include="..\..\src\u16string.h" />
-    <ClInclude Include="..\..\src\u32string.h" />
-    <ClInclude Include="..\..\src\unordered_map.h" />
-    <ClInclude Include="..\..\src\unordered_multimap.h" />
-    <ClInclude Include="..\..\src\unordered_multiset.h" />
-    <ClInclude Include="..\..\src\unordered_set.h" />
-    <ClInclude Include="..\..\src\user_type.h" />
-    <ClInclude Include="..\..\src\utility.h" />
-    <ClInclude Include="..\..\src\variant.h" />
-    <ClInclude Include="..\..\src\vector.h" />
-    <ClInclude Include="..\..\src\visitor.h" />
-    <ClInclude Include="..\..\src\wstring.h" />
+    <ClInclude Include="..\..\include\etl\algorithm.h" />
+    <ClInclude Include="..\..\include\etl\alignment.h" />
+    <ClInclude Include="..\..\include\etl\array.h" />
+    <ClInclude Include="..\..\include\etl\basic_string.h" />
+    <ClInclude Include="..\..\include\etl\binary.h" />
+    <ClInclude Include="..\..\include\etl\bitset.h" />
+    <ClInclude Include="..\..\include\etl\bloom_filter.h" />
+    <ClInclude Include="..\..\include\etl\char_traits.h" />
+    <ClInclude Include="..\..\include\etl\checksum.h" />
+    <ClInclude Include="..\..\include\etl\crc16.h" />
+    <ClInclude Include="..\..\include\etl\crc16_ccitt.h" />
+    <ClInclude Include="..\..\include\etl\crc16_kermit.h" />
+    <ClInclude Include="..\..\include\etl\crc32.h" />
+    <ClInclude Include="..\..\include\etl\crc64_ecma.h" />
+    <ClInclude Include="..\..\include\etl\crc8_ccitt.h" />
+    <ClInclude Include="..\..\include\etl\cstring.h" />
+    <ClInclude Include="..\..\include\etl\cyclic_value.h" />
+    <ClInclude Include="..\..\include\etl\debounce.h" />
+    <ClInclude Include="..\..\include\etl\debug_count.h" />
+    <ClInclude Include="..\..\include\etl\deque.h" />
+    <ClInclude Include="..\..\include\etl\doxygen.h" />
+    <ClInclude Include="..\..\include\etl\endianness.h" />
+    <ClInclude Include="..\..\include\etl\enum_type.h" />
+    <ClInclude Include="..\..\include\etl\error_handler.h" />
+    <ClInclude Include="..\..\include\etl\exception.h" />
+    <ClInclude Include="..\..\include\etl\factorial.h" />
+    <ClInclude Include="..\..\include\etl\fibonacci.h" />
+    <ClInclude Include="..\..\include\etl\fixed_iterator.h" />
+    <ClInclude Include="..\..\include\etl\flat_multimap.h" />
+    <ClInclude Include="..\..\include\etl\flat_multiset.h" />
+    <ClInclude Include="..\..\include\etl\flat_set.h" />
+    <ClInclude Include="..\..\include\etl\fnv_1.h" />
+    <ClInclude Include="..\..\include\etl\forward_list.h" />
+    <ClInclude Include="..\..\include\etl\function.h" />
+    <ClInclude Include="..\..\include\etl\functional.h" />
+    <ClInclude Include="..\..\include\etl\hash.h" />
+    <ClInclude Include="..\..\include\etl\ihash.h" />
+    <ClInclude Include="..\..\include\etl\instance_count.h" />
+    <ClInclude Include="..\..\include\etl\integral_limits.h" />
+    <ClInclude Include="..\..\include\etl\intrusive_forward_list.h" />
+    <ClInclude Include="..\..\include\etl\intrusive_links.h" />
+    <ClInclude Include="..\..\include\etl\intrusive_list.h" />
+    <ClInclude Include="..\..\include\etl\intrusive_queue.h" />
+    <ClInclude Include="..\..\include\etl\intrusive_stack.h" />
+    <ClInclude Include="..\..\include\etl\io_port.h" />
+    <ClInclude Include="..\..\include\etl\container.h" />
+    <ClInclude Include="..\..\include\etl\iterator.h" />
+    <ClInclude Include="..\..\include\etl\jenkins.h" />
+    <ClInclude Include="..\..\include\etl\largest.h" />
+    <ClInclude Include="..\..\include\etl\list.h" />
+    <ClInclude Include="..\..\include\etl\log.h" />
+    <ClInclude Include="..\..\include\etl\flat_map.h" />
+    <ClInclude Include="..\..\include\etl\map.h" />
+    <ClInclude Include="..\..\include\etl\memory.h" />
+    <ClInclude Include="..\..\include\etl\multimap.h" />
+    <ClInclude Include="..\..\include\etl\multiset.h" />
+    <ClInclude Include="..\..\include\etl\murmur3.h" />
+    <ClInclude Include="..\..\include\etl\nullptr.h" />
+    <ClInclude Include="..\..\include\etl\numeric.h" />
+    <ClInclude Include="..\..\include\etl\observer.h" />
+    <ClInclude Include="..\..\include\etl\optional.h" />
+    <ClInclude Include="..\..\include\etl\parameter_type.h" />
+    <ClInclude Include="..\..\include\etl\pearson.h" />
+    <ClInclude Include="..\..\include\etl\platform.h" />
+    <ClInclude Include="..\..\include\etl\pool.h" />
+    <ClInclude Include="..\..\include\etl\power.h" />
+    <ClInclude Include="..\..\include\etl\priority_queue.h" />
+    <ClInclude Include="..\..\include\etl\private\pvoidvector.h" />
+    <ClInclude Include="..\..\include\etl\private\vector_base.h" />
+    <ClInclude Include="..\..\include\etl\queue.h" />
+    <ClInclude Include="..\..\include\etl\radix.h" />
+    <ClInclude Include="..\..\include\etl\random.h" />
+    <ClInclude Include="..\..\include\etl\reference_flat_map.h" />
+    <ClInclude Include="..\..\include\etl\reference_flat_multimap.h" />
+    <ClInclude Include="..\..\include\etl\reference_flat_multiset.h" />
+    <ClInclude Include="..\..\include\etl\reference_flat_set.h" />
+    <ClInclude Include="..\..\include\etl\set.h" />
+    <ClInclude Include="..\..\include\etl\smallest.h" />
+    <ClInclude Include="..\..\include\etl\stack.h" />
+    <ClInclude Include="..\..\include\etl\static_assert.h" />
+    <ClInclude Include="..\..\include\etl\test1.h" />
+    <ClInclude Include="..\..\include\etl\test2.h" />
+    <ClInclude Include="..\..\include\etl\type_def.h" />
+    <ClInclude Include="..\..\include\etl\type_traits.h" />
+    <ClInclude Include="..\..\include\etl\u16string.h" />
+    <ClInclude Include="..\..\include\etl\u32string.h" />
+    <ClInclude Include="..\..\include\etl\unordered_map.h" />
+    <ClInclude Include="..\..\include\etl\unordered_multimap.h" />
+    <ClInclude Include="..\..\include\etl\unordered_multiset.h" />
+    <ClInclude Include="..\..\include\etl\unordered_set.h" />
+    <ClInclude Include="..\..\include\etl\user_type.h" />
+    <ClInclude Include="..\..\include\etl\utility.h" />
+    <ClInclude Include="..\..\include\etl\variant.h" />
+    <ClInclude Include="..\..\include\etl\vector.h" />
+    <ClInclude Include="..\..\include\etl\visitor.h" />
+    <ClInclude Include="..\..\include\etl\wstring.h" />
     <ClInclude Include="..\ecl_user.h" />
     <ClInclude Include="..\data.h" />
     <ClInclude Include="..\etl_profile.h" />
@@ -306,7 +306,17 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\binary.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\c\ecl_timer.c" />
+    <ClCompile Include="..\..\src\error_handler.cpp" />
+    <ClCompile Include="..\..\src\pearson.cpp" />
+    <ClCompile Include="..\..\src\private\pvoidvector.cpp" />
+    <ClCompile Include="..\..\src\random.cpp" />
     <ClCompile Include="..\..\unittest-cpp\UnitTest++\AssertException.cpp" />
     <ClCompile Include="..\..\unittest-cpp\UnitTest++\Checks.cpp" />
     <ClCompile Include="..\..\unittest-cpp\UnitTest++\CompositeTestReporter.cpp" />
@@ -325,16 +335,6 @@
     <ClCompile Include="..\..\unittest-cpp\UnitTest++\TimeConstraint.cpp" />
     <ClCompile Include="..\..\unittest-cpp\UnitTest++\Win32\TimeHelpers.cpp" />
     <ClCompile Include="..\..\unittest-cpp\UnitTest++\XmlTestReporter.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="..\..\src\private\pvoidvector.cpp" />
-    <ClCompile Include="..\..\src\random.cpp" />
     <ClCompile Include="..\main.cpp" />
     <ClCompile Include="..\murmurhash3.cpp" />
     <ClCompile Include="..\test_algorithm.cpp" />
@@ -473,17 +473,17 @@
   <ItemGroup>
     <None Include="..\..\Doxyfile" />
     <None Include="..\..\library.properties" />
-    <None Include="..\..\src\generate.bat" />
-    <None Include="..\..\src\generate_fsm.bat" />
-    <None Include="..\..\src\generate_largest.bat" />
-    <None Include="..\..\src\generate_message_router.bat" />
-    <None Include="..\..\src\generate_smallest.bat" />
-    <None Include="..\..\src\generate_type_lookup.bat" />
-    <None Include="..\..\src\generate_type_traits.bat" />
-    <None Include="..\..\src\generate_variant_pool.bat" />
+    <None Include="..\..\include\etl\generate.bat" />
+    <None Include="..\..\include\etl\generate_fsm.bat" />
+    <None Include="..\..\include\etl\generate_largest.bat" />
+    <None Include="..\..\include\etl\generate_message_router.bat" />
+    <None Include="..\..\include\etl\generate_smallest.bat" />
+    <None Include="..\..\include\etl\generate_type_lookup.bat" />
+    <None Include="..\..\include\etl\generate_type_traits.bat" />
+    <None Include="..\..\include\etl\generate_variant_pool.bat" />
   </ItemGroup>
   <ItemGroup>
-    <Text Include="..\..\src\file_error_numbers.txt" />
+    <Text Include="..\..\include\etl\file_error_numbers.txt" />
     <Text Include="..\..\support\Release notes.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/test/vs2017/etl.vcxproj.filters b/test/vs2017/etl.vcxproj.filters
index 4f5dbef1..32ae59ed 100644
--- a/test/vs2017/etl.vcxproj.filters
+++ b/test/vs2017/etl.vcxproj.filters
@@ -63,295 +63,295 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\doxygen.h">
+    <ClInclude Include="..\..\include\etl\doxygen.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\enum_type.h">
+    <ClInclude Include="..\..\include\etl\enum_type.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\exception.h">
+    <ClInclude Include="..\..\include\etl\exception.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\function.h">
+    <ClInclude Include="..\..\include\etl\function.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\array.h">
+    <ClInclude Include="..\..\include\etl\array.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\container.h">
+    <ClInclude Include="..\..\include\etl\container.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\queue.h">
+    <ClInclude Include="..\..\include\etl\queue.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\stack.h">
+    <ClInclude Include="..\..\include\etl\stack.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\vector.h">
+    <ClInclude Include="..\..\include\etl\vector.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\largest.h">
+    <ClInclude Include="..\..\include\etl\largest.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\nullptr.h">
+    <ClInclude Include="..\..\include\etl\nullptr.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\numeric.h">
+    <ClInclude Include="..\..\include\etl\numeric.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\cyclic_value.h">
+    <ClInclude Include="..\..\include\etl\cyclic_value.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\static_assert.h">
+    <ClInclude Include="..\..\include\etl\static_assert.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\type_traits.h">
+    <ClInclude Include="..\..\include\etl\type_traits.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\visitor.h">
+    <ClInclude Include="..\..\include\etl\visitor.h">
       <Filter>ETL\Patterns</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\observer.h">
+    <ClInclude Include="..\..\include\etl\observer.h">
       <Filter>ETL\Patterns</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\functional.h">
+    <ClInclude Include="..\..\include\etl\functional.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\list.h">
+    <ClInclude Include="..\..\include\etl\list.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\map.h">
+    <ClInclude Include="..\..\include\etl\map.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\crc16.h">
+    <ClInclude Include="..\..\include\etl\crc16.h">
       <Filter>ETL\Maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\crc16_ccitt.h">
+    <ClInclude Include="..\..\include\etl\crc16_ccitt.h">
       <Filter>ETL\Maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\crc32.h">
+    <ClInclude Include="..\..\include\etl\crc32.h">
       <Filter>ETL\Maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\crc64_ecma.h">
+    <ClInclude Include="..\..\include\etl\crc64_ecma.h">
       <Filter>ETL\Maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\crc8_ccitt.h">
+    <ClInclude Include="..\..\include\etl\crc8_ccitt.h">
       <Filter>ETL\Maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\log.h">
+    <ClInclude Include="..\..\include\etl\log.h">
       <Filter>ETL\Maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\deque.h">
+    <ClInclude Include="..\..\include\etl\deque.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
     <ClInclude Include="..\ExtraCheckMacros.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\forward_list.h">
+    <ClInclude Include="..\..\include\etl\forward_list.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\bitset.h">
+    <ClInclude Include="..\..\include\etl\bitset.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\smallest.h">
+    <ClInclude Include="..\..\include\etl\smallest.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\integral_limits.h">
+    <ClInclude Include="..\..\include\etl\integral_limits.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\variant.h">
+    <ClInclude Include="..\..\include\etl\variant.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\crc16_kermit.h">
+    <ClInclude Include="..\..\include\etl\crc16_kermit.h">
       <Filter>ETL\Maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\parameter_type.h">
+    <ClInclude Include="..\..\include\etl\parameter_type.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\alignment.h">
+    <ClInclude Include="..\..\include\etl\alignment.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\pool.h">
+    <ClInclude Include="..\..\include\etl\pool.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\power.h">
+    <ClInclude Include="..\..\include\etl\power.h">
       <Filter>ETL\Maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\fibonacci.h">
+    <ClInclude Include="..\..\include\etl\fibonacci.h">
       <Filter>ETL\Maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\factorial.h">
+    <ClInclude Include="..\..\include\etl\factorial.h">
       <Filter>ETL\Maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\algorithm.h">
+    <ClInclude Include="..\..\include\etl\algorithm.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\error_handler.h">
+    <ClInclude Include="..\..\include\etl\error_handler.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\instance_count.h">
+    <ClInclude Include="..\..\include\etl\instance_count.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\checksum.h">
+    <ClInclude Include="..\..\include\etl\checksum.h">
       <Filter>ETL\Maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\fnv_1.h">
+    <ClInclude Include="..\..\include\etl\fnv_1.h">
       <Filter>ETL\Maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\hash.h">
+    <ClInclude Include="..\..\include\etl\hash.h">
       <Filter>ETL\Maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\radix.h">
+    <ClInclude Include="..\..\include\etl\radix.h">
       <Filter>ETL\Maths</Filter>
     </ClInclude>
     <ClInclude Include="..\data.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\bloom_filter.h">
+    <ClInclude Include="..\..\include\etl\bloom_filter.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\fixed_iterator.h">
+    <ClInclude Include="..\..\include\etl\fixed_iterator.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\binary.h">
+    <ClInclude Include="..\..\include\etl\binary.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\flat_map.h">
+    <ClInclude Include="..\..\include\etl\flat_map.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ihash.h">
+    <ClInclude Include="..\..\include\etl\ihash.h">
       <Filter>ETL\Maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\flat_set.h">
+    <ClInclude Include="..\..\include\etl\flat_set.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\unordered_map.h">
+    <ClInclude Include="..\..\include\etl\unordered_map.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\io_port.h">
+    <ClInclude Include="..\..\include\etl\io_port.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\optional.h">
+    <ClInclude Include="..\..\include\etl\optional.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\set.h">
+    <ClInclude Include="..\..\include\etl\set.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\multimap.h">
+    <ClInclude Include="..\..\include\etl\multimap.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\multiset.h">
+    <ClInclude Include="..\..\include\etl\multiset.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\priority_queue.h">
+    <ClInclude Include="..\..\include\etl\priority_queue.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\jenkins.h">
+    <ClInclude Include="..\..\include\etl\jenkins.h">
       <Filter>ETL\Maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\murmur3.h">
+    <ClInclude Include="..\..\include\etl\murmur3.h">
       <Filter>ETL\Maths</Filter>
     </ClInclude>
     <ClInclude Include="..\murmurhash3.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\pearson.h">
+    <ClInclude Include="..\..\include\etl\pearson.h">
       <Filter>ETL\Maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\flat_multimap.h">
+    <ClInclude Include="..\..\include\etl\flat_multimap.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\flat_multiset.h">
+    <ClInclude Include="..\..\include\etl\flat_multiset.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\intrusive_forward_list.h">
+    <ClInclude Include="..\..\include\etl\intrusive_forward_list.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\private\vector_base.h">
+    <ClInclude Include="..\..\include\etl\private\vector_base.h">
       <Filter>ETL\Private</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\char_traits.h">
+    <ClInclude Include="..\..\include\etl\char_traits.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\intrusive_links.h">
+    <ClInclude Include="..\..\include\etl\intrusive_links.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\intrusive_list.h">
+    <ClInclude Include="..\..\include\etl\intrusive_list.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\unordered_set.h">
+    <ClInclude Include="..\..\include\etl\unordered_set.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\unordered_multiset.h">
+    <ClInclude Include="..\..\include\etl\unordered_multiset.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\test1.h">
+    <ClInclude Include="..\..\include\etl\test1.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\test2.h">
+    <ClInclude Include="..\..\include\etl\test2.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\debounce.h">
+    <ClInclude Include="..\..\include\etl\debounce.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\platform.h">
+    <ClInclude Include="..\..\include\etl\platform.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\basic_string.h">
+    <ClInclude Include="..\..\include\etl\basic_string.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\u16string.h">
+    <ClInclude Include="..\..\include\etl\u16string.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\u32string.h">
+    <ClInclude Include="..\..\include\etl\u32string.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\wstring.h">
+    <ClInclude Include="..\..\include\etl\wstring.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\private\pvoidvector.h">
+    <ClInclude Include="..\..\include\etl\private\pvoidvector.h">
       <Filter>ETL\Private</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\type_def.h">
+    <ClInclude Include="..\..\include\etl\type_def.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\intrusive_stack.h">
+    <ClInclude Include="..\..\include\etl\intrusive_stack.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\utility.h">
+    <ClInclude Include="..\..\include\etl\utility.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\intrusive_queue.h">
+    <ClInclude Include="..\..\include\etl\intrusive_queue.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\cstring.h">
+    <ClInclude Include="..\..\include\etl\cstring.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\unordered_multimap.h">
+    <ClInclude Include="..\..\include\etl\unordered_multimap.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\user_type.h">
+    <ClInclude Include="..\..\include\etl\user_type.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\debug_count.h">
+    <ClInclude Include="..\..\include\etl\debug_count.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\iterator.h">
+    <ClInclude Include="..\..\include\etl\iterator.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\memory.h">
+    <ClInclude Include="..\..\include\etl\memory.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\reference_flat_map.h">
+    <ClInclude Include="..\..\include\etl\reference_flat_map.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\reference_flat_multimap.h">
+    <ClInclude Include="..\..\include\etl\reference_flat_multimap.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\reference_flat_multiset.h">
+    <ClInclude Include="..\..\include\etl\reference_flat_multiset.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\reference_flat_set.h">
+    <ClInclude Include="..\..\include\etl\reference_flat_set.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
     <ClInclude Include="..\..\unittest-cpp\UnitTest++\AssertException.h">
@@ -441,144 +441,144 @@
     <ClInclude Include="..\..\unittest-cpp\UnitTest++\XmlTestReporter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\fsm.h">
+    <ClInclude Include="..\..\include\etl\fsm.h">
       <Filter>ETL\Frameworks</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\message_router.h">
+    <ClInclude Include="..\..\include\etl\message_router.h">
       <Filter>ETL\Frameworks</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\packet.h">
+    <ClInclude Include="..\..\include\etl\packet.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\fsm_generator.h">
+    <ClInclude Include="..\..\include\etl\fsm_generator.h">
       <Filter>ETL\Frameworks\Generators</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\message_router_generator.h">
+    <ClInclude Include="..\..\include\etl\message_router_generator.h">
       <Filter>ETL\Frameworks\Generators</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\largest_generator.h">
+    <ClInclude Include="..\..\include\etl\largest_generator.h">
       <Filter>ETL\Utilities\Generators</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\type_traits_generator.h">
+    <ClInclude Include="..\..\include\etl\type_traits_generator.h">
       <Filter>ETL\Utilities\Generators</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\smallest_generator.h">
+    <ClInclude Include="..\..\include\etl\smallest_generator.h">
       <Filter>ETL\Utilities\Generators</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\message.h">
+    <ClInclude Include="..\..\include\etl\message.h">
       <Filter>ETL\Frameworks</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\message_bus.h">
+    <ClInclude Include="..\..\include\etl\message_bus.h">
       <Filter>ETL\Frameworks</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\message_types.h">
+    <ClInclude Include="..\..\include\etl\message_types.h">
       <Filter>ETL\Frameworks</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\scheduler.h">
+    <ClInclude Include="..\..\include\etl\scheduler.h">
       <Filter>ETL\Frameworks</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\task.h">
+    <ClInclude Include="..\..\include\etl\task.h">
       <Filter>ETL\Frameworks</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\random.h">
+    <ClInclude Include="..\..\include\etl\random.h">
       <Filter>ETL\Maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\endianness.h">
+    <ClInclude Include="..\..\include\etl\endianness.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\constant.h">
+    <ClInclude Include="..\..\include\etl\constant.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\sqrt.h">
+    <ClInclude Include="..\..\include\etl\sqrt.h">
       <Filter>ETL\Maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\type_lookup.h">
+    <ClInclude Include="..\..\include\etl\type_lookup.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\type_lookup_generator.h">
+    <ClInclude Include="..\..\include\etl\type_lookup_generator.h">
       <Filter>ETL\Utilities\Generators</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\compare.h">
+    <ClInclude Include="..\..\include\etl\compare.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\message_timer.h">
+    <ClInclude Include="..\..\include\etl\message_timer.h">
       <Filter>ETL\Frameworks</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\callback_timer.h">
+    <ClInclude Include="..\..\include\etl\callback_timer.h">
       <Filter>ETL\Frameworks</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\timer.h">
+    <ClInclude Include="..\..\include\etl\timer.h">
       <Filter>ETL\Frameworks</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\atomic.h">
+    <ClInclude Include="..\..\include\etl\atomic.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\profiles\cpp03.h">
+    <ClInclude Include="..\..\include\etl\profiles\cpp03.h">
       <Filter>ETL\Profiles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\profiles\cpp11.h">
+    <ClInclude Include="..\..\include\etl\profiles\cpp11.h">
       <Filter>ETL\Profiles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\profiles\cpp14.h">
+    <ClInclude Include="..\..\include\etl\profiles\cpp14.h">
       <Filter>ETL\Profiles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\profiles\armv5.h">
+    <ClInclude Include="..\..\include\etl\profiles\armv5.h">
       <Filter>ETL\Profiles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\profiles\armv6.h">
+    <ClInclude Include="..\..\include\etl\profiles\armv6.h">
       <Filter>ETL\Profiles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\profiles\ticc.h">
+    <ClInclude Include="..\..\include\etl\profiles\ticc.h">
       <Filter>ETL\Profiles</Filter>
     </ClInclude>
     <ClInclude Include="..\etl_profile.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\profiles\gcc_generic.h">
+    <ClInclude Include="..\..\include\etl\profiles\gcc_generic.h">
       <Filter>ETL\Profiles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\profiles\gcc_linux_x86.h">
+    <ClInclude Include="..\..\include\etl\profiles\gcc_linux_x86.h">
       <Filter>ETL\Profiles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\profiles\gcc_windows_x86.h">
+    <ClInclude Include="..\..\include\etl\profiles\gcc_windows_x86.h">
       <Filter>ETL\Profiles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\profiles\arduino_arm.h">
+    <ClInclude Include="..\..\include\etl\profiles\arduino_arm.h">
       <Filter>ETL\Profiles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\profiles\msvc_x86.h">
+    <ClInclude Include="..\..\include\etl\profiles\msvc_x86.h">
       <Filter>ETL\Profiles</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\atomic\atomic_arm.h">
+    <ClInclude Include="..\..\include\etl\atomic\atomic_arm.h">
       <Filter>ETL\Utilities\Atomic</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\atomic\atomic_gcc.h">
+    <ClInclude Include="..\..\include\etl\atomic\atomic_gcc.h">
       <Filter>ETL\Utilities\Atomic</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\c\ecl_timer.h">
-      <Filter>ECL</Filter>
-    </ClInclude>
     <ClInclude Include="..\ecl_user.h">
       <Filter>Source Files\ECL</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\variant_pool.h">
+    <ClInclude Include="..\..\include\etl\variant_pool.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\array_view.h">
+    <ClInclude Include="..\..\include\etl\array_view.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\string_view.h">
+    <ClInclude Include="..\..\include\etl\string_view.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\array_wrapper.h">
+    <ClInclude Include="..\..\include\etl\array_wrapper.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\variant_pool_generator.h">
+    <ClInclude Include="..\..\include\etl\variant_pool_generator.h">
       <Filter>ETL\Containers\Generators</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\version.h">
+    <ClInclude Include="..\..\include\etl\version.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\etl\c\ecl_timer.h">
+      <Filter>ECL</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\main.cpp">
@@ -752,30 +752,6 @@
     <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>
     <ClCompile Include="..\test_debounce.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -797,9 +773,6 @@
     <ClCompile Include="..\test_type_def.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\private\pvoidvector.cpp">
-      <Filter>ETL\Private</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_intrusive_stack.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -863,9 +836,6 @@
     <ClCompile Include="..\test_user_type.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\random.cpp">
-      <Filter>ETL\Maths</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_constant.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -941,15 +911,6 @@
     <ClCompile Include="..\test_compare.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\c\ecl_timer.c">
-      <Filter>ECL</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_c_timer_framework.cpp">
-      <Filter>Source Files\ECL</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\binary.cpp">
-      <Filter>ETL\Utilities</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_variant_pool.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -965,6 +926,45 @@
     <ClCompile Include="..\test_xor_rotate_checksum.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\private\pvoidvector.cpp">
+      <Filter>ETL\Private</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\crc8_ccitt.cpp">
+      <Filter>ETL\Maths</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\crc16.cpp">
+      <Filter>ETL\Maths</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\crc16_ccitt.cpp">
+      <Filter>ETL\Maths</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\crc16_kermit.cpp">
+      <Filter>ETL\Maths</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\crc32.cpp">
+      <Filter>ETL\Maths</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\crc64_ecma.cpp">
+      <Filter>ETL\Maths</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\pearson.cpp">
+      <Filter>ETL\Maths</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\random.cpp">
+      <Filter>ETL\Maths</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\binary.cpp">
+      <Filter>ETL\Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\error_handler.cpp">
+      <Filter>ETL\Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\c\ecl_timer.c">
+      <Filter>ECL</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_c_timer_framework.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\Doxyfile">
@@ -973,33 +973,33 @@
     <None Include="..\..\library.properties">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\..\src\generate.bat">
+    <None Include="..\..\include\etl\generate.bat">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\..\src\generate_message_router.bat">
+    <None Include="..\..\include\etl\generate_message_router.bat">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\..\src\generate_fsm.bat">
+    <None Include="..\..\include\etl\generate_fsm.bat">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\..\src\generate_largest.bat">
+    <None Include="..\..\include\etl\generate_largest.bat">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\..\src\generate_smallest.bat">
+    <None Include="..\..\include\etl\generate_smallest.bat">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\..\src\generate_type_traits.bat">
+    <None Include="..\..\include\etl\generate_type_traits.bat">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\..\src\generate_type_lookup.bat">
+    <None Include="..\..\include\etl\generate_type_lookup.bat">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\..\src\generate_variant_pool.bat">
+    <None Include="..\..\include\etl\generate_variant_pool.bat">
       <Filter>Resource Files</Filter>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Text Include="..\..\src\file_error_numbers.txt">
+    <Text Include="..\..\include\etl\file_error_numbers.txt">
       <Filter>Resource Files</Filter>
     </Text>
     <Text Include="..\..\support\Release notes.txt">