diff --git a/alib2xml/src/container/xml/Container.cpp b/alib2xml/src/container/xml/Container.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..555152a702e96ebe7880a5975fe3974e241122e0
--- /dev/null
+++ b/alib2xml/src/container/xml/Container.cpp
@@ -0,0 +1,19 @@
+#include <alib/deque>
+#include <alib/list>
+#include <alib/map>
+#include <alib/multimap>
+#include <alib/pair>
+#include <alib/set>
+#include <alib/tree>
+#include <alib/trie>
+#include <alib/vector>
+
+#include "ObjectsDeque.cxx"
+#include "ObjectsList.cxx"
+#include "ObjectsMap.cxx"
+#include "ObjectsMultimap.cxx"
+#include "ObjectsPair.cxx"
+#include "ObjectsSet.cxx"
+#include "ObjectsTree.cxx"
+#include "ObjectsTrie.cxx"
+#include "ObjectsVector.cxx"
diff --git a/alib2xml/src/container/xml/ObjectsDeque.cpp b/alib2xml/src/container/xml/ObjectsDeque.cpp
deleted file mode 100644
index 6a827fadb694579f9b539cd9522c050a1441e2ec..0000000000000000000000000000000000000000
--- a/alib2xml/src/container/xml/ObjectsDeque.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Deque.cpp
- *
- * Created on: Apr 1, 2013
- * Author: Jan Travnicek
- */
-
-#include "ObjectsDeque.h"
-
-#include <registration/XmlRegistration.hpp>
-
-namespace {
-
-auto xmlWrite = registration::XmlWriterRegister < ext::deque < object::Object > > ( );
-auto xmlReader = registration::XmlReaderRegister < ext::deque < object::Object > > ( );
-
-auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, ext::deque < object::Object > > ( );
-
-} /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsDeque.cxx b/alib2xml/src/container/xml/ObjectsDeque.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..c3cf3ce93e148267a53544ef3a441e469fdee0c7
--- /dev/null
+++ b/alib2xml/src/container/xml/ObjectsDeque.cxx
@@ -0,0 +1,19 @@
+/*
+ * Deque.cpp
+ *
+ * Created on: Apr 1, 2013
+ * Author: Jan Travnicek
+ */
+
+#include "ObjectsDeque.h"
+
+#include <registration/XmlRegistration.hpp>
+
+namespace {
+
+auto xmlWriteObjectsDeque = registration::XmlWriterRegister < ext::deque < object::Object > > ( );
+auto xmlReaderObjectsDeque = registration::XmlReaderRegister < ext::deque < object::Object > > ( );
+
+auto xmlGroupObjectsDeque = registration::XmlRegisterTypeInGroup < object::Object, ext::deque < object::Object > > ( );
+
+} /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsList.cpp b/alib2xml/src/container/xml/ObjectsList.cpp
deleted file mode 100644
index dfd640ae6e5c17d4793ba1d6f70a9e7aa28276ec..0000000000000000000000000000000000000000
--- a/alib2xml/src/container/xml/ObjectsList.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * List.cpp
- *
- * Created on: Apr 1, 2013
- * Author: Jan Travnicek
- */
-
-#include "ObjectsList.h"
-
-#include <registration/XmlRegistration.hpp>
-
-namespace {
-
-auto xmlWrite = registration::XmlWriterRegister < ext::list < object::Object > > ( );
-auto xmlRead = registration::XmlReaderRegister < ext::list < object::Object > > ( );
-
-auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, ext::list < object::Object > > ( );
-
-} /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsList.cxx b/alib2xml/src/container/xml/ObjectsList.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..ff05fb035f29a253310a8070917a0e479bc79174
--- /dev/null
+++ b/alib2xml/src/container/xml/ObjectsList.cxx
@@ -0,0 +1,19 @@
+/*
+ * List.cpp
+ *
+ * Created on: Apr 1, 2013
+ * Author: Jan Travnicek
+ */
+
+#include "ObjectsList.h"
+
+#include <registration/XmlRegistration.hpp>
+
+namespace {
+
+auto xmlWriteObjectsList = registration::XmlWriterRegister < ext::list < object::Object > > ( );
+auto xmlReadObjectsList = registration::XmlReaderRegister < ext::list < object::Object > > ( );
+
+auto xmlGroupObjectsList = registration::XmlRegisterTypeInGroup < object::Object, ext::list < object::Object > > ( );
+
+} /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsMap.cpp b/alib2xml/src/container/xml/ObjectsMap.cpp
deleted file mode 100644
index 10f0051fd4c1ea696a4bba4d95a334f7c7cf256f..0000000000000000000000000000000000000000
--- a/alib2xml/src/container/xml/ObjectsMap.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Map.cpp
- *
- * Created on: Apr 1, 2013
- * Author: Jan Travnicek
- */
-
-#include "ObjectsMap.h"
-
-#include <registration/XmlRegistration.hpp>
-
-namespace {
-
-auto xmlWrite = registration::XmlWriterRegister < ext::map < object::Object, object::Object > > ( );
-auto xmlRead = registration::XmlReaderRegister < ext::map < object::Object, object::Object > > ( );
-
-auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, ext::map < object::Object, object::Object > > ( );
-
-} /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsMap.cxx b/alib2xml/src/container/xml/ObjectsMap.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..ce5ebc1822195df2b943cd2bf40ae32af6b22adb
--- /dev/null
+++ b/alib2xml/src/container/xml/ObjectsMap.cxx
@@ -0,0 +1,19 @@
+/*
+ * Map.cpp
+ *
+ * Created on: Apr 1, 2013
+ * Author: Jan Travnicek
+ */
+
+#include "ObjectsMap.h"
+
+#include <registration/XmlRegistration.hpp>
+
+namespace {
+
+auto xmlWriteObjectsMap = registration::XmlWriterRegister < ext::map < object::Object, object::Object > > ( );
+auto xmlReadObjectsMap = registration::XmlReaderRegister < ext::map < object::Object, object::Object > > ( );
+
+auto xmlGroupObjectsMap = registration::XmlRegisterTypeInGroup < object::Object, ext::map < object::Object, object::Object > > ( );
+
+} /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsMultimap.cpp b/alib2xml/src/container/xml/ObjectsMultimap.cpp
deleted file mode 100644
index 78597790730791297aa6325e2c141fee3beea2a2..0000000000000000000000000000000000000000
--- a/alib2xml/src/container/xml/ObjectsMultimap.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Multimap.cpp
- *
- * Created on: Apr 1, 2013
- * Author: Jan Travnicek
- */
-
-#include "ObjectsMultimap.h"
-
-#include <registration/XmlRegistration.hpp>
-
-namespace {
-
-auto xmlWrite = registration::XmlWriterRegister < ext::multimap < object::Object, object::Object > > ( );
-auto xmlRead = registration::XmlReaderRegister < ext::multimap < object::Object, object::Object > > ( );
-
-auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, ext::multimap < object::Object, object::Object > > ( );
-
-} /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsMultimap.cxx b/alib2xml/src/container/xml/ObjectsMultimap.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..2a337260622e52c3d49b4aaf56722cc6618bb571
--- /dev/null
+++ b/alib2xml/src/container/xml/ObjectsMultimap.cxx
@@ -0,0 +1,19 @@
+/*
+ * Multimap.cpp
+ *
+ * Created on: Apr 1, 2013
+ * Author: Jan Travnicek
+ */
+
+#include "ObjectsMultimap.h"
+
+#include <registration/XmlRegistration.hpp>
+
+namespace {
+
+auto xmlWriteObjectsMultimap = registration::XmlWriterRegister < ext::multimap < object::Object, object::Object > > ( );
+auto xmlReadObjectsMultimap = registration::XmlReaderRegister < ext::multimap < object::Object, object::Object > > ( );
+
+auto xmlGroupObjectsMultimap = registration::XmlRegisterTypeInGroup < object::Object, ext::multimap < object::Object, object::Object > > ( );
+
+} /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsPair.cpp b/alib2xml/src/container/xml/ObjectsPair.cpp
deleted file mode 100644
index a792ce8ff1af4e5f8f836ff068559aa158186488..0000000000000000000000000000000000000000
--- a/alib2xml/src/container/xml/ObjectsPair.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Pair.cpp
- *
- * Created on: Apr 1, 2013
- * Author: Jan Travnicek
- */
-
-#include "ObjectsPair.h"
-
-#include <registration/XmlRegistration.hpp>
-
-namespace {
-
-auto xmlWrite = registration::XmlWriterRegister < ext::pair < object::Object, object::Object > > ( );
-auto xmlRead = registration::XmlReaderRegister < ext::pair < object::Object, object::Object > > ( );
-
-auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, ext::pair < object::Object, object::Object > > ( );
-
-} /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsPair.cxx b/alib2xml/src/container/xml/ObjectsPair.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..80838809dc85dfa36e9f94b2d0a6fa95537a0061
--- /dev/null
+++ b/alib2xml/src/container/xml/ObjectsPair.cxx
@@ -0,0 +1,19 @@
+/*
+ * Pair.cpp
+ *
+ * Created on: Apr 1, 2013
+ * Author: Jan Travnicek
+ */
+
+#include "ObjectsPair.h"
+
+#include <registration/XmlRegistration.hpp>
+
+namespace {
+
+auto xmlWriteObjectsPair = registration::XmlWriterRegister < ext::pair < object::Object, object::Object > > ( );
+auto xmlReadObjectsPair = registration::XmlReaderRegister < ext::pair < object::Object, object::Object > > ( );
+
+auto xmlGroupObjectsPair = registration::XmlRegisterTypeInGroup < object::Object, ext::pair < object::Object, object::Object > > ( );
+
+} /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsSet.cpp b/alib2xml/src/container/xml/ObjectsSet.cpp
deleted file mode 100644
index 7cec2f864cd34f39eedd7dad910f1bcb26bc35df..0000000000000000000000000000000000000000
--- a/alib2xml/src/container/xml/ObjectsSet.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Set.cpp
- *
- * Created on: Apr 1, 2013
- * Author: Jan Travnicek
- */
-
-#include "ObjectsSet.h"
-
-#include <registration/XmlRegistration.hpp>
-
-namespace {
-
-auto xmlWrite = registration::XmlWriterRegister < ext::set < object::Object > > ( );
-auto xmlRead = registration::XmlReaderRegister < ext::set < object::Object > > ( );
-
-auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, ext::set < object::Object > > ( );
-
-} /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsSet.cxx b/alib2xml/src/container/xml/ObjectsSet.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..73c62cae179e6d0066d78accf68740d328660ade
--- /dev/null
+++ b/alib2xml/src/container/xml/ObjectsSet.cxx
@@ -0,0 +1,19 @@
+/*
+ * Set.cpp
+ *
+ * Created on: Apr 1, 2013
+ * Author: Jan Travnicek
+ */
+
+#include "ObjectsSet.h"
+
+#include <registration/XmlRegistration.hpp>
+
+namespace {
+
+auto xmlWriteObjectsSet = registration::XmlWriterRegister < ext::set < object::Object > > ( );
+auto xmlReadObjectsSet = registration::XmlReaderRegister < ext::set < object::Object > > ( );
+
+auto xmlGroupObjectsSet = registration::XmlRegisterTypeInGroup < object::Object, ext::set < object::Object > > ( );
+
+} /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsTree.cpp b/alib2xml/src/container/xml/ObjectsTree.cpp
deleted file mode 100644
index 22b6f8d213eacf9c9a308f54d6dd0523f67235e6..0000000000000000000000000000000000000000
--- a/alib2xml/src/container/xml/ObjectsTree.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * ObjectsTree.cpp
- *
- * Created on: Apr 1, 2013
- * Author: Jan Travnicek
- */
-
-#include "ObjectsTree.h"
-
-#include <registration/XmlRegistration.hpp>
-
-namespace {
-
-auto xmlWrite = registration::XmlWriterRegister < ext::tree < object::Object > > ( );
-auto xmlRead = registration::XmlReaderRegister < ext::tree < object::Object > > ( );
-
-auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, ext::tree < object::Object > > ( );
-
-} /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsTree.cxx b/alib2xml/src/container/xml/ObjectsTree.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..773c2c1849426d4e7f17855c6f6bb647ad6ad86c
--- /dev/null
+++ b/alib2xml/src/container/xml/ObjectsTree.cxx
@@ -0,0 +1,19 @@
+/*
+ * ObjectsTree.cpp
+ *
+ * Created on: Apr 1, 2013
+ * Author: Jan Travnicek
+ */
+
+#include "ObjectsTree.h"
+
+#include <registration/XmlRegistration.hpp>
+
+namespace {
+
+auto xmlWriteObjectsTree = registration::XmlWriterRegister < ext::tree < object::Object > > ( );
+auto xmlReadObjectsTree = registration::XmlReaderRegister < ext::tree < object::Object > > ( );
+
+auto xmlGroupObjectsTree = registration::XmlRegisterTypeInGroup < object::Object, ext::tree < object::Object > > ( );
+
+} /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsTrie.cpp b/alib2xml/src/container/xml/ObjectsTrie.cpp
deleted file mode 100644
index 5335ee6b4444ce77a0112c5aa87313f398b91df0..0000000000000000000000000000000000000000
--- a/alib2xml/src/container/xml/ObjectsTrie.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * ObjectsTrie.cpp
- *
- * Created on: Apr 1, 2013
- * Author: Jan Travnicek
- */
-
-#include "ObjectsTrie.h"
-
-#include <registration/XmlRegistration.hpp>
-
-namespace {
-
-auto xmlWrite = registration::XmlWriterRegister < ext::trie < object::Object, object::Object > > ( );
-auto xmlRead = registration::XmlReaderRegister < ext::trie < object::Object, object::Object > > ( );
-
-auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, ext::trie < object::Object, object::Object > > ( );
-
-} /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsTrie.cxx b/alib2xml/src/container/xml/ObjectsTrie.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..38ccebddaa48c3f120124d8242712b7606b67590
--- /dev/null
+++ b/alib2xml/src/container/xml/ObjectsTrie.cxx
@@ -0,0 +1,19 @@
+/*
+ * ObjectsTrie.cpp
+ *
+ * Created on: Apr 1, 2013
+ * Author: Jan Travnicek
+ */
+
+#include "ObjectsTrie.h"
+
+#include <registration/XmlRegistration.hpp>
+
+namespace {
+
+auto xmlWriteObjectsTrie = registration::XmlWriterRegister < ext::trie < object::Object, object::Object > > ( );
+auto xmlReadObjectsTrie = registration::XmlReaderRegister < ext::trie < object::Object, object::Object > > ( );
+
+auto xmlGroupObjectsTrie = registration::XmlRegisterTypeInGroup < object::Object, ext::trie < object::Object, object::Object > > ( );
+
+} /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsVector.cpp b/alib2xml/src/container/xml/ObjectsVector.cpp
deleted file mode 100644
index 641d350df1b0d9f77199c334fbaf6dec3d73d879..0000000000000000000000000000000000000000
--- a/alib2xml/src/container/xml/ObjectsVector.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Vector.cpp
- *
- * Created on: Apr 1, 2013
- * Author: Jan Travnicek
- */
-
-#include "ObjectsVector.h"
-
-#include <registration/XmlRegistration.hpp>
-
-namespace {
-
-auto xmlWrite = registration::XmlWriterRegister < ext::vector < object::Object > > ( );
-auto xmlRead = registration::XmlReaderRegister < ext::vector < object::Object > > ( );
-
-auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, ext::vector < object::Object > > ( );
-
-} /* namespace */
diff --git a/alib2xml/src/container/xml/ObjectsVector.cxx b/alib2xml/src/container/xml/ObjectsVector.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..57aa8f78b06f64b2c149ef067bbf726d51c87dc7
--- /dev/null
+++ b/alib2xml/src/container/xml/ObjectsVector.cxx
@@ -0,0 +1,19 @@
+/*
+ * Vector.cpp
+ *
+ * Created on: Apr 1, 2013
+ * Author: Jan Travnicek
+ */
+
+#include "ObjectsVector.h"
+
+#include <registration/XmlRegistration.hpp>
+
+namespace {
+
+auto xmlWriteObjectsVector = registration::XmlWriterRegister < ext::vector < object::Object > > ( );
+auto xmlReadObjectsVector = registration::XmlReaderRegister < ext::vector < object::Object > > ( );
+
+auto xmlGroupObjectsVector = registration::XmlRegisterTypeInGroup < object::Object, ext::vector < object::Object > > ( );
+
+} /* namespace */