diff --git a/alib2std/test-src/extensions/ArrayTest.cpp b/alib2std/test-src/extensions/container/ArrayTest.cpp
similarity index 100%
rename from alib2std/test-src/extensions/ArrayTest.cpp
rename to alib2std/test-src/extensions/container/ArrayTest.cpp
diff --git a/alib2std/test-src/extensions/ArrayTest.h b/alib2std/test-src/extensions/container/ArrayTest.h
similarity index 100%
rename from alib2std/test-src/extensions/ArrayTest.h
rename to alib2std/test-src/extensions/container/ArrayTest.h
diff --git a/alib2std/test-src/extensions/ForwardTreeTest.cpp b/alib2std/test-src/extensions/container/ForwardTreeTest.cpp
similarity index 100%
rename from alib2std/test-src/extensions/ForwardTreeTest.cpp
rename to alib2std/test-src/extensions/container/ForwardTreeTest.cpp
diff --git a/alib2std/test-src/extensions/ForwardTreeTest.h b/alib2std/test-src/extensions/container/ForwardTreeTest.h
similarity index 100%
rename from alib2std/test-src/extensions/ForwardTreeTest.h
rename to alib2std/test-src/extensions/container/ForwardTreeTest.h
diff --git a/alib2std/test-src/extensions/LinearSetTest.cpp b/alib2std/test-src/extensions/container/LinearSetTest.cpp
similarity index 100%
rename from alib2std/test-src/extensions/LinearSetTest.cpp
rename to alib2std/test-src/extensions/container/LinearSetTest.cpp
diff --git a/alib2std/test-src/extensions/LinearSetTest.h b/alib2std/test-src/extensions/container/LinearSetTest.h
similarity index 100%
rename from alib2std/test-src/extensions/LinearSetTest.h
rename to alib2std/test-src/extensions/container/LinearSetTest.h
diff --git a/alib2std/test-src/extensions/MapTest.cpp b/alib2std/test-src/extensions/container/MapTest.cpp
similarity index 100%
rename from alib2std/test-src/extensions/MapTest.cpp
rename to alib2std/test-src/extensions/container/MapTest.cpp
diff --git a/alib2std/test-src/extensions/MapTest.h b/alib2std/test-src/extensions/container/MapTest.h
similarity index 100%
rename from alib2std/test-src/extensions/MapTest.h
rename to alib2std/test-src/extensions/container/MapTest.h
diff --git a/alib2std/test-src/extensions/PtrArrayTest.cpp b/alib2std/test-src/extensions/container/PtrArrayTest.cpp
similarity index 100%
rename from alib2std/test-src/extensions/PtrArrayTest.cpp
rename to alib2std/test-src/extensions/container/PtrArrayTest.cpp
diff --git a/alib2std/test-src/extensions/PtrArrayTest.h b/alib2std/test-src/extensions/container/PtrArrayTest.h
similarity index 100%
rename from alib2std/test-src/extensions/PtrArrayTest.h
rename to alib2std/test-src/extensions/container/PtrArrayTest.h
diff --git a/alib2std/test-src/extensions/PtrTupleTest.cpp b/alib2std/test-src/extensions/container/PtrTupleTest.cpp
similarity index 100%
rename from alib2std/test-src/extensions/PtrTupleTest.cpp
rename to alib2std/test-src/extensions/container/PtrTupleTest.cpp
diff --git a/alib2std/test-src/extensions/PtrTupleTest.h b/alib2std/test-src/extensions/container/PtrTupleTest.h
similarity index 100%
rename from alib2std/test-src/extensions/PtrTupleTest.h
rename to alib2std/test-src/extensions/container/PtrTupleTest.h
diff --git a/alib2std/test-src/extensions/PtrVectorTest.cpp b/alib2std/test-src/extensions/container/PtrVectorTest.cpp
similarity index 100%
rename from alib2std/test-src/extensions/PtrVectorTest.cpp
rename to alib2std/test-src/extensions/container/PtrVectorTest.cpp
diff --git a/alib2std/test-src/extensions/PtrVectorTest.h b/alib2std/test-src/extensions/container/PtrVectorTest.h
similarity index 100%
rename from alib2std/test-src/extensions/PtrVectorTest.h
rename to alib2std/test-src/extensions/container/PtrVectorTest.h
diff --git a/alib2std/test-src/extensions/SetTest.cpp b/alib2std/test-src/extensions/container/SetTest.cpp
similarity index 100%
rename from alib2std/test-src/extensions/SetTest.cpp
rename to alib2std/test-src/extensions/container/SetTest.cpp
diff --git a/alib2std/test-src/extensions/SetTest.h b/alib2std/test-src/extensions/container/SetTest.h
similarity index 100%
rename from alib2std/test-src/extensions/SetTest.h
rename to alib2std/test-src/extensions/container/SetTest.h
diff --git a/alib2std/test-src/extensions/StringTest.cpp b/alib2std/test-src/extensions/container/StringTest.cpp
similarity index 100%
rename from alib2std/test-src/extensions/StringTest.cpp
rename to alib2std/test-src/extensions/container/StringTest.cpp
diff --git a/alib2std/test-src/extensions/StringTest.h b/alib2std/test-src/extensions/container/StringTest.h
similarity index 100%
rename from alib2std/test-src/extensions/StringTest.h
rename to alib2std/test-src/extensions/container/StringTest.h
diff --git a/alib2std/test-src/extensions/TreeBaseTest.cpp b/alib2std/test-src/extensions/container/TreeBaseTest.cpp
similarity index 100%
rename from alib2std/test-src/extensions/TreeBaseTest.cpp
rename to alib2std/test-src/extensions/container/TreeBaseTest.cpp
diff --git a/alib2std/test-src/extensions/TreeBaseTest.h b/alib2std/test-src/extensions/container/TreeBaseTest.h
similarity index 100%
rename from alib2std/test-src/extensions/TreeBaseTest.h
rename to alib2std/test-src/extensions/container/TreeBaseTest.h
diff --git a/alib2std/test-src/extensions/TreeTest.cpp b/alib2std/test-src/extensions/container/TreeTest.cpp
similarity index 100%
rename from alib2std/test-src/extensions/TreeTest.cpp
rename to alib2std/test-src/extensions/container/TreeTest.cpp
diff --git a/alib2std/test-src/extensions/TreeTest.h b/alib2std/test-src/extensions/container/TreeTest.h
similarity index 100%
rename from alib2std/test-src/extensions/TreeTest.h
rename to alib2std/test-src/extensions/container/TreeTest.h
diff --git a/alib2std/test-src/extensions/TrieTest.cpp b/alib2std/test-src/extensions/container/TrieTest.cpp
similarity index 100%
rename from alib2std/test-src/extensions/TrieTest.cpp
rename to alib2std/test-src/extensions/container/TrieTest.cpp
diff --git a/alib2std/test-src/extensions/TrieTest.h b/alib2std/test-src/extensions/container/TrieTest.h
similarity index 100%
rename from alib2std/test-src/extensions/TrieTest.h
rename to alib2std/test-src/extensions/container/TrieTest.h
diff --git a/alib2std/test-src/extensions/TupleTest.cpp b/alib2std/test-src/extensions/container/TupleTest.cpp
similarity index 100%
rename from alib2std/test-src/extensions/TupleTest.cpp
rename to alib2std/test-src/extensions/container/TupleTest.cpp
diff --git a/alib2std/test-src/extensions/TupleTest.h b/alib2std/test-src/extensions/container/TupleTest.h
similarity index 100%
rename from alib2std/test-src/extensions/TupleTest.h
rename to alib2std/test-src/extensions/container/TupleTest.h
diff --git a/alib2std/test-src/extensions/VariantTest.cpp b/alib2std/test-src/extensions/container/VariantTest.cpp
similarity index 100%
rename from alib2std/test-src/extensions/VariantTest.cpp
rename to alib2std/test-src/extensions/container/VariantTest.cpp
diff --git a/alib2std/test-src/extensions/VariantTest.h b/alib2std/test-src/extensions/container/VariantTest.h
similarity index 100%
rename from alib2std/test-src/extensions/VariantTest.h
rename to alib2std/test-src/extensions/container/VariantTest.h
diff --git a/alib2std/test-src/extensions/VectorTest.cpp b/alib2std/test-src/extensions/container/VectorTest.cpp
similarity index 100%
rename from alib2std/test-src/extensions/VectorTest.cpp
rename to alib2std/test-src/extensions/container/VectorTest.cpp
diff --git a/alib2std/test-src/extensions/VectorTest.h b/alib2std/test-src/extensions/container/VectorTest.h
similarity index 100%
rename from alib2std/test-src/extensions/VectorTest.h
rename to alib2std/test-src/extensions/container/VectorTest.h