diff --git a/src/navigate/MaxSizedArray.hpp b/include/helpers/MaxSizedArray.hpp
similarity index 97%
rename from src/navigate/MaxSizedArray.hpp
rename to include/helpers/MaxSizedArray.hpp
index 6082b7b..d147176 100644
--- a/src/navigate/MaxSizedArray.hpp
+++ b/include/helpers/MaxSizedArray.hpp
@@ -18,15 +18,15 @@
 #ifndef idBC9F804ADD33468A9C7657E823FFC706
 #define idBC9F804ADD33468A9C7657E823FFC706
 
-#include "AutomemBase.hpp"
-#include "IteratorOnPtr.hpp"
+#include "implem/AutomemBase.hpp"
+#include "implem/IteratorOnPtr.hpp"
 #include <memory>
 #include <cstddef>
 #include <type_traits>
 #include <cassert>
 #include <utility>
 
-namespace din {
+namespace dinhelp {
 	const size_t MAXSZARR_MAX_STACK_ALLOC_SIZE = MAX_STACK_ALLOC_SIZE;
 
 	//TODO: add a template parameter to force stack allocation regardless of
@@ -107,7 +107,7 @@ namespace din {
 		T* m_localMem; //A copy of memory pointer is required
 		size_type m_used;
 	};
-} //namespace din
+} //namespace dinhelp
 
 #include "MaxSizedArray.inl"
 
diff --git a/src/navigate/MaxSizedArray.inl b/include/helpers/MaxSizedArray.inl
similarity index 99%
rename from src/navigate/MaxSizedArray.inl
rename to include/helpers/MaxSizedArray.inl
index e89f6a2..f46661d 100644
--- a/src/navigate/MaxSizedArray.inl
+++ b/include/helpers/MaxSizedArray.inl
@@ -15,7 +15,7 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace din {
+namespace dinhelp {
 	///-------------------------------------------------------------------------
 	///-------------------------------------------------------------------------
 	template <typename T, size_t S, typename A>
@@ -278,4 +278,4 @@ namespace din {
 			throw std::length_error("Unable to reserve more memory than the build-time size for MaxSizedArray");
 		}
 	}
-} //namespace din
+} //namespace dinhelp
diff --git a/src/navigate/AutomemBase.hpp b/include/helpers/implem/AutomemBase.hpp
similarity index 98%
rename from src/navigate/AutomemBase.hpp
rename to include/helpers/implem/AutomemBase.hpp
index fd2d78c..c632976 100644
--- a/src/navigate/AutomemBase.hpp
+++ b/include/helpers/implem/AutomemBase.hpp
@@ -30,7 +30,7 @@
 #	define ASSERTIONSENABLED
 #endif
 
-namespace din {
+namespace dinhelp {
 	const size_t MAX_STACK_ALLOC_SIZE = 128;
 
 	///-------------------------------------------------------------------------
@@ -81,7 +81,7 @@ namespace din {
 		void operator= (const AutomemRawBase_stack&);
 		typename std::aligned_storage<sizeof(T), alignof(T)>::type m_localMem[S];
 	};
-} //namespace din
+} //namespace dinhelp
 
 #include "AutomemBase.inl"
 
diff --git a/src/navigate/AutomemBase.inl b/include/helpers/implem/AutomemBase.inl
similarity index 99%
rename from src/navigate/AutomemBase.inl
rename to include/helpers/implem/AutomemBase.inl
index ba25d2e..6909bda 100644
--- a/src/navigate/AutomemBase.inl
+++ b/include/helpers/implem/AutomemBase.inl
@@ -15,7 +15,7 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace din {
+namespace dinhelp {
 	namespace {
 #if defined(ASSERTIONSENABLED)
 		const char g_guard = 0xAB;
@@ -115,4 +115,4 @@ namespace din {
 #endif
 		return new(location) T(std::forward<Args...>(parArgs)...);
 	}
-} //namespace din
+} //namespace dinhelp
diff --git a/src/navigate/IteratorOnPtr.hpp b/include/helpers/implem/IteratorOnPtr.hpp
similarity index 99%
rename from src/navigate/IteratorOnPtr.hpp
rename to include/helpers/implem/IteratorOnPtr.hpp
index c384c40..4845592 100644
--- a/src/navigate/IteratorOnPtr.hpp
+++ b/include/helpers/implem/IteratorOnPtr.hpp
@@ -23,7 +23,7 @@
 #include <type_traits>
 #include <cassert>
 
-namespace din {
+namespace dinhelp {
 	namespace implem_iop {
 		template <typename P, typename T, int32_t I>
 		class IteratorOnPtr_base : public std::iterator<std::random_access_iterator_tag, T> {
@@ -309,6 +309,6 @@ namespace din {
 		this->MoveIterator(-parOther);
 		return *this;
 	}
-} //namespace din
+} //namespace dinhelp
 
 #endif
diff --git a/src/navigate/dbsource.hpp b/src/navigate/dbsource.hpp
index 5da8df9..acef295 100644
--- a/src/navigate/dbsource.hpp
+++ b/src/navigate/dbsource.hpp
@@ -20,7 +20,7 @@
 
 #include "dindexer-machinery/recorddata.hpp"
 #include "flatinsertin2dlist.hpp"
-#include "MaxSizedArray.hpp"
+#include "helpers/MaxSizedArray.hpp"
 #include <memory>
 #include <cstdint>
 #include <vector>
@@ -40,6 +40,8 @@ namespace pq {
 } //namespace pq
 
 namespace din {
+	using dinhelp::MaxSizedArray;
+
 	enum SetDetails {
 		SetDetail_Desc = 0x01,
 		SetDetail_Type = 0x02,