diff --git a/OdfFile/Common/CPString.cpp b/OdfFile/Common/CPString.cpp
index 4a781bc7b6..052f68a0db 100644
--- a/OdfFile/Common/CPString.cpp
+++ b/OdfFile/Common/CPString.cpp
@@ -29,8 +29,8 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
-#include "../../Common/CPString.h"
-#include "../../../DesktopEditor/common/File.h"
+#include "CPString.h"
+#include "../../DesktopEditor/common/File.h"
 
 namespace cpdoccore {
 
diff --git a/OdfFile/DataTypes/errors.h b/OdfFile/Common/errors.h
similarity index 100%
rename from OdfFile/DataTypes/errors.h
rename to OdfFile/Common/errors.h
diff --git a/OdfFile/Common/logging.cpp b/OdfFile/Common/logging.cpp
new file mode 100644
index 0000000000..68f0486df3
--- /dev/null
+++ b/OdfFile/Common/logging.cpp
@@ -0,0 +1,41 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+#include "logging.h"
+#include <iostream>
+
+namespace cpdoccore {
+
+logging< std::wostream > logging_err(std::wcerr);
+logging< std::wostream > logging_cout(std::wcout);
+
+}
diff --git a/OdfFile/Common/readstring.h b/OdfFile/Common/readstring.h
index bee9c56534..34261d8c23 100644
--- a/OdfFile/Common/readstring.h
+++ b/OdfFile/Common/readstring.h
@@ -31,7 +31,7 @@
  */
 #pragma once
 
-#include <CPOptional.h>
+#include "../Common/CPOptional.h"
 #include "logging.h"
 
 namespace cpdoccore { 
diff --git a/OdfFile/Common/xml/sax.cpp b/OdfFile/Common/xml/sax.cpp
index fe2c5a18db..dad973481c 100644
--- a/OdfFile/Common/xml/sax.cpp
+++ b/OdfFile/Common/xml/sax.cpp
@@ -30,7 +30,7 @@
  *
  */
 
-#include "../Common/CPSharedPtr.h"
+#include "../CPSharedPtr.h"
 #include "sax.h"
 #include "sax_xmllite.h"
 #include <sstream>
diff --git a/OdfFile/Common/xml/sax.h b/OdfFile/Common/xml/sax.h
index 773f254a2e..ae9456a698 100644
--- a/OdfFile/Common/xml/sax.h
+++ b/OdfFile/Common/xml/sax.h
@@ -36,7 +36,7 @@
 #include <exception>
 #include <iosfwd>
 
-#include "../Common/CPSharedPtr.h"
+#include "../CPSharedPtr.h"
 #include "nodetype.h"
 
 namespace cpdoccore {
diff --git a/OdfFile/Common/xml/sax_xmllite.h b/OdfFile/Common/xml/sax_xmllite.h
index 0a4bf92d0a..b6b853f72a 100644
--- a/OdfFile/Common/xml/sax_xmllite.h
+++ b/OdfFile/Common/xml/sax_xmllite.h
@@ -32,7 +32,7 @@
 #pragma once
 
 #include "sax.h"
-#include "../Common/CPSharedPtr.h"
+#include "../CPSharedPtr.h"
 
 namespace cpdoccore {
 namespace xml {
diff --git a/OdfFile/Common/xml/utils.cpp b/OdfFile/Common/xml/utils.cpp
index 8aa2756a8b..4dbad80e05 100644
--- a/OdfFile/Common/xml/utils.cpp
+++ b/OdfFile/Common/xml/utils.cpp
@@ -32,7 +32,7 @@
 #include "utils.h"
 
 #include <boost/regex.hpp>
-#include "../../OOXML/Base/Unit.h"
+#include "../../../OOXML/Base/Unit.h"
 
 namespace cpdoccore {
 namespace xml {
diff --git a/OdfFile/DataTypes/common_attlists.h b/OdfFile/DataTypes/common_attlists.h
index 9b501c0ff8..b135960f8d 100644
--- a/OdfFile/DataTypes/common_attlists.h
+++ b/OdfFile/DataTypes/common_attlists.h
@@ -32,7 +32,7 @@
 #pragma once
 
 #include <iosfwd>
-#include <xml/simple_xml_writer.h>
+#include "../Common/xml/simple_xml_writer.h"
 
 #include "bool.h"
 #include "lengthorpercent.h"
diff --git a/OdfFile/DataTypes/lengthorpercent.cpp b/OdfFile/DataTypes/lengthorpercent.cpp
index ec608ba8b6..aef469a570 100644
--- a/OdfFile/DataTypes/lengthorpercent.cpp
+++ b/OdfFile/DataTypes/lengthorpercent.cpp
@@ -32,7 +32,7 @@
 #include <boost/algorithm/string.hpp>
 
 #include "lengthorpercent.h"
-#include "errors.h"
+#include "../Common/errors.h"
 
 namespace cpdoccore { namespace odf_types { 
 
diff --git a/OdfFile/DataTypes/linemode.cpp b/OdfFile/DataTypes/linemode.cpp
index d18ee2f8b2..0c84f61194 100644
--- a/OdfFile/DataTypes/linemode.cpp
+++ b/OdfFile/DataTypes/linemode.cpp
@@ -32,7 +32,7 @@
 #include <boost/algorithm/string.hpp>
 
 #include "linemode.h"
-#include "errors.h"
+#include "../Common/errors.h"
 
 namespace cpdoccore { namespace odf_types { 
 
diff --git a/OdfFile/DataTypes/linestyle.cpp b/OdfFile/DataTypes/linestyle.cpp
index ee5d0e7286..da38e4bbc2 100644
--- a/OdfFile/DataTypes/linestyle.cpp
+++ b/OdfFile/DataTypes/linestyle.cpp
@@ -32,7 +32,7 @@
 #include <boost/algorithm/string.hpp>
 
 #include "linestyle.h"
-#include "errors.h"
+#include "../Common/errors.h"
 
 namespace cpdoccore { namespace odf_types { 
 
diff --git a/OdfFile/DataTypes/linetype.cpp b/OdfFile/DataTypes/linetype.cpp
index cef496c6f4..876184cd7c 100644
--- a/OdfFile/DataTypes/linetype.cpp
+++ b/OdfFile/DataTypes/linetype.cpp
@@ -32,7 +32,7 @@
 #include <boost/algorithm/string.hpp>
 
 #include "linetype.h"
-#include "errors.h"
+#include "../Common/errors.h"
 
 namespace cpdoccore { namespace odf_types { 
 
diff --git a/OdfFile/DataTypes/linewidth.cpp b/OdfFile/DataTypes/linewidth.cpp
index 617acbf84f..05974b949f 100644
--- a/OdfFile/DataTypes/linewidth.cpp
+++ b/OdfFile/DataTypes/linewidth.cpp
@@ -32,7 +32,7 @@
 #include <boost/algorithm/string.hpp>
 
 #include "linewidth.h"
-#include "errors.h"
+#include "../Common/errors.h"
 
 namespace cpdoccore { namespace odf_types { 
 
diff --git a/OdfFile/DataTypes/mathvariant.h b/OdfFile/DataTypes/mathvariant.h
index 560e633109..c0560a174d 100644
--- a/OdfFile/DataTypes/mathvariant.h
+++ b/OdfFile/DataTypes/mathvariant.h
@@ -32,7 +32,7 @@
 #pragma once
 
 #include <string>
-#include <CPOptional.h>
+#include "../Common/CPOptional.h"
 #include "odfattributes.h"
 
 namespace cpdoccore { namespace odf_types { 
diff --git a/OdfFile/DataTypes/odfattributes.h b/OdfFile/DataTypes/odfattributes.h
index 016f9a09f4..5585881afb 100644
--- a/OdfFile/DataTypes/odfattributes.h
+++ b/OdfFile/DataTypes/odfattributes.h
@@ -31,9 +31,9 @@
  */
 #pragma once
 
-#include <xml/attributes.h>
-#include <CPOptional.h>
-#include "errors.h"
+#include "../Common/xml/attributes.h"
+#include "../Common/CPOptional.h"
+#include "../Common/errors.h"
 #include "../Common/logging.h"
 
 namespace cpdoccore {
diff --git a/OdfFile/DataTypes/officevaluetype.cpp b/OdfFile/DataTypes/officevaluetype.cpp
index 235882d4bc..68a3704a4d 100644
--- a/OdfFile/DataTypes/officevaluetype.cpp
+++ b/OdfFile/DataTypes/officevaluetype.cpp
@@ -32,7 +32,7 @@
 #include <boost/algorithm/string.hpp>
 
 #include "officevaluetype.h"
-#include "errors.h"
+#include "../Common/errors.h"
 
 namespace cpdoccore { namespace odf_types { 
 
diff --git a/OdfFile/DataTypes/percent.cpp b/OdfFile/DataTypes/percent.cpp
index 8bbbb14ae6..8152707259 100644
--- a/OdfFile/DataTypes/percent.cpp
+++ b/OdfFile/DataTypes/percent.cpp
@@ -33,7 +33,7 @@
 #include "percent.h"
 #include <iostream>
 #include <sstream>
-#include "errors.h"
+#include "../Common/errors.h"
 
 namespace cpdoccore { namespace odf_types { 
 
diff --git a/OdfFile/DataTypes/percentorscale.cpp b/OdfFile/DataTypes/percentorscale.cpp
index 33d9f36455..433b636583 100644
--- a/OdfFile/DataTypes/percentorscale.cpp
+++ b/OdfFile/DataTypes/percentorscale.cpp
@@ -32,7 +32,7 @@
 #include <boost/algorithm/string.hpp>
 
 #include "percentorscale.h"
-#include "errors.h"
+#include "../Common/errors.h"
 
 namespace cpdoccore { namespace odf_types { 
 
diff --git a/OdfFile/DataTypes/textemphasize.cpp b/OdfFile/DataTypes/textemphasize.cpp
index a741eef07f..b3ca37219f 100644
--- a/OdfFile/DataTypes/textemphasize.cpp
+++ b/OdfFile/DataTypes/textemphasize.cpp
@@ -31,7 +31,7 @@
  */
 
 #include "textemphasize.h"
-#include "errors.h"
+#include "../Common/errors.h"
 
 #include <boost/algorithm/string.hpp>
 
diff --git a/OdfFile/DataTypes/textposition.cpp b/OdfFile/DataTypes/textposition.cpp
index 12923c028c..ed5a89758a 100644
--- a/OdfFile/DataTypes/textposition.cpp
+++ b/OdfFile/DataTypes/textposition.cpp
@@ -31,7 +31,7 @@
  */
 
 #include "textposition.h"
-#include "errors.h"
+#include "../Common/errors.h"
 
 #include <boost/algorithm/string.hpp>
 
diff --git a/OdfFile/DataTypes/texttransform.cpp b/OdfFile/DataTypes/texttransform.cpp
index 855a2e3fca..abeb533c7c 100644
--- a/OdfFile/DataTypes/texttransform.cpp
+++ b/OdfFile/DataTypes/texttransform.cpp
@@ -32,7 +32,7 @@
 #include <boost/algorithm/string.hpp>
 
 #include "texttransform.h"
-#include "errors.h"
+#include "../Common/errors.h"
 
 #include <iostream>
 
diff --git a/OdfFile/Projects/Linux/OdfFormatLib.pro b/OdfFile/Projects/Linux/OdfFormatLib.pro
index b43012c1f1..c3ee3faf09 100644
--- a/OdfFile/Projects/Linux/OdfFormatLib.pro
+++ b/OdfFile/Projects/Linux/OdfFormatLib.pro
@@ -495,7 +495,6 @@ HEADERS += \
 	../../DataTypes/direction.h \
 	../../DataTypes/drawfill.h \
 	../../DataTypes/dropcaplength.h \
-	../../DataTypes/errors.h \
 	../../DataTypes/fillimagerefpoint.h \
 	../../DataTypes/fobreak.h \
 	../../DataTypes/fontfamilygeneric.h \
@@ -659,6 +658,7 @@ HEADERS += \
         ../../Reader/Converter/conversionelement.h \
         ../../Reader/Converter/ConvertOO2OOX.h \
         ../../Common/xml/sax_xmllite.h \
+        ../../Common/errors.h \
         ../../Common/logging.h \
         ../../Common/CPColorUtils.h \
         ../../Common/CPNoncopyable.h \
diff --git a/OdfFile/Projects/Windows/OdfFileTest/OdfFile.sln b/OdfFile/Projects/Windows/OdfFileTest/OdfFile.sln
index fb33936200..388161a419 100644
--- a/OdfFile/Projects/Windows/OdfFileTest/OdfFile.sln
+++ b/OdfFile/Projects/Windows/OdfFileTest/OdfFile.sln
@@ -6,11 +6,8 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFileReaderTest", "OdfFileTest.vcxproj", "{C2882DDD-07E6-4314-AD4B-48F43F38D722}"
 	ProjectSection(ProjectDependencies) = postProject
 		{41BED424-4EAF-4053-8A5F-1E2A387D53D1} = {41BED424-4EAF-4053-8A5F-1E2A387D53D1}
-		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF} = {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptlib", "..\..\Common\3dParty\cryptopp\cryptlib.vcxproj", "{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfCommon", "..\cpcommon.vcxproj", "{609ED938-3CA8-4BED-B363-25096D4C4812}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFormatReaderLib", "..\cpodf.vcxproj", "{50E20601-4A8D-4AFB-8870-63828D328429}"
@@ -47,22 +44,6 @@ Global
 		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|Win32.Build.0 = Release|Win32
 		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|x64.ActiveCfg = Release|x64
 		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|x64.Build.0 = Release|x64
-		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.Build.0 = Debug|Win32
-		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|x64.ActiveCfg = Debug|x64
-		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|x64.Build.0 = Debug|x64
-		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Debug|Win32.ActiveCfg = DLL-Import Debug|Win32
-		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Debug|Win32.Build.0 = DLL-Import Debug|Win32
-		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Debug|x64.ActiveCfg = DLL-Import Debug|x64
-		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Debug|x64.Build.0 = DLL-Import Debug|x64
-		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Release|Win32.ActiveCfg = DLL-Import Release|Win32
-		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Release|Win32.Build.0 = DLL-Import Release|Win32
-		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Release|x64.ActiveCfg = DLL-Import Release|x64
-		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Release|x64.Build.0 = DLL-Import Release|x64
-		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.ActiveCfg = Release|Win32
-		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.Build.0 = Release|Win32
-		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|x64.ActiveCfg = Release|x64
-		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|x64.Build.0 = Release|x64
 		{609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|Win32.ActiveCfg = Debug|Win32
 		{609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|Win32.Build.0 = Debug|Win32
 		{609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/OdfFile/Projects/Windows/OdfFileTest/OdfFileTest.vcxproj b/OdfFile/Projects/Windows/OdfFileTest/OdfFileTest.vcxproj
index 4cca95750e..5bf9e8d760 100644
--- a/OdfFile/Projects/Windows/OdfFileTest/OdfFileTest.vcxproj
+++ b/OdfFile/Projects/Windows/OdfFileTest/OdfFileTest.vcxproj
@@ -182,11 +182,6 @@
       </PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Common\3dParty\cryptopp\cryptlib.vcxproj">
-      <Project>{3423ec9a-52e4-4a4d-9753-edebc38785ef}</Project>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/OdfFile/Projects/Windows/cpcommon.vcxproj b/OdfFile/Projects/Windows/cpcommon.vcxproj
index 1413091a2c..c480cd71bb 100644
--- a/OdfFile/Projects/Windows/cpcommon.vcxproj
+++ b/OdfFile/Projects/Windows/cpcommon.vcxproj
@@ -69,8 +69,8 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(Configuration)\</OutDir>
     <IntDir>$(Configuration)\</IntDir>
-    <IncludePath>..\..\Common\3dParty\boost\build\win_32\include;$(IncludePath)</IncludePath>
-    <LibraryPath>..\..\Common\3dParty\boost\build\win_32\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>..\..\..\Common\3dParty\boost\build\win_32\include;$(IncludePath)</IncludePath>
+    <LibraryPath>..\..\..\Common\3dParty\boost\build\win_32\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(Platform)\$(Configuration)\</OutDir>
@@ -164,256 +164,246 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\ASCOfficeOdfFileW\source\OdfFormat\odf_chart_context.h" />
-    <ClInclude Include="..\include\cpdoccore\common\readdocelement.h" />
-    <ClInclude Include="..\include\cpdoccore\common\writedocelement.h" />
-    <ClInclude Include="..\include\cpdoccore\CPColorUtils.h" />
-    <ClInclude Include="..\include\cpdoccore\CPNoncopyable.h" />
-    <ClInclude Include="..\include\cpdoccore\CPOptional.h" />
-    <ClInclude Include="..\include\cpdoccore\CPScopedPtr.h" />
-    <ClInclude Include="..\include\cpdoccore\CPSharedPtr.h" />
-    <ClInclude Include="..\include\cpdoccore\CPString.h" />
-    <ClInclude Include="..\include\cpdoccore\CPWeakPtr.h" />
-    <ClInclude Include="..\src\docx\oox_chart_axis.h" />
-    <ClInclude Include="..\src\odf\datatypes\anchortype.h" />
-    <ClInclude Include="..\src\odf\datatypes\backgroundcolor.h" />
-    <ClInclude Include="..\src\odf\datatypes\bibliography.h" />
-    <ClInclude Include="..\src\odf\datatypes\bool.h" />
-    <ClInclude Include="..\src\odf\datatypes\bordermodel.h" />
-    <ClInclude Include="..\src\odf\datatypes\borderstyle.h" />
-    <ClInclude Include="..\src\odf\datatypes\borderwidths.h" />
-    <ClInclude Include="..\src\odf\datatypes\calcext_type.h" />
-    <ClInclude Include="..\src\odf\datatypes\stylecellprotect.h" />
-    <ClInclude Include="..\src\odf\datatypes\chartclass.h" />
-    <ClInclude Include="..\src\odf\datatypes\chartdatalabelnumber.h" />
-    <ClInclude Include="..\src\odf\datatypes\charterrorcategory.h" />
-    <ClInclude Include="..\src\odf\datatypes\chartinterpolation.h" />
-    <ClInclude Include="..\src\odf\datatypes\chartlabelarrangement.h" />
-    <ClInclude Include="..\src\odf\datatypes\chartlabelposition.h" />
-    <ClInclude Include="..\src\odf\datatypes\chartregressiontype.h" />
-    <ClInclude Include="..\src\odf\datatypes\chartseriessource.h" />
-    <ClInclude Include="..\src\odf\datatypes\chartsolidtype.h" />
-    <ClInclude Include="..\src\odf\datatypes\chartsymbol.h" />
-    <ClInclude Include="..\src\odf\datatypes\charttimeunit.h" />
-    <ClInclude Include="..\src\odf\datatypes\clockvalue.h" />
-    <ClInclude Include="..\src\odf\datatypes\color.h" />
-    <ClInclude Include="..\src\odf\datatypes\commandtype.h" />
-    <ClInclude Include="..\src\odf\datatypes\common_attlists.h" />
-    <ClInclude Include="..\src\odf\datatypes\dategroup.h" />
-    <ClInclude Include="..\src\odf\datatypes\direction.h" />
-    <ClInclude Include="..\src\odf\datatypes\drawangle.h" />
-    <ClInclude Include="..\src\odf\datatypes\drawfill.h" />
-    <ClInclude Include="..\src\odf\datatypes\dropcaplength.h" />
-    <ClInclude Include="..\src\odf\datatypes\errors.h" />
-    <ClInclude Include="..\src\odf\datatypes\fillimagerefpoint.h" />
-    <ClInclude Include="..\src\odf\datatypes\fobreak.h" />
-    <ClInclude Include="..\src\odf\datatypes\fontfamilygeneric.h" />
-    <ClInclude Include="..\src\odf\datatypes\fontpitch.h" />
-    <ClInclude Include="..\src\odf\datatypes\fontrelief.h" />
-    <ClInclude Include="..\src\odf\datatypes\fontsize.h" />
-    <ClInclude Include="..\src\odf\datatypes\fontstretch.h" />
-    <ClInclude Include="..\src\odf\datatypes\fontstyle.h" />
-    <ClInclude Include="..\src\odf\datatypes\fontvariant.h" />
-    <ClInclude Include="..\src\odf\datatypes\fontweight.h" />
-    <ClInclude Include="..\src\odf\datatypes\gradientstyle.h" />
-    <ClInclude Include="..\src\odf\datatypes\grandtotal.h" />
-    <ClInclude Include="..\src\odf\datatypes\hatchstyle.h" />
-    <ClInclude Include="..\src\odf\datatypes\hyphenationkeep.h" />
-    <ClInclude Include="..\src\odf\datatypes\hyphenationladdercount.h" />
-    <ClInclude Include="..\src\odf\datatypes\keeptogether.h" />
-    <ClInclude Include="..\src\odf\datatypes\layoutgridmode.h" />
-    <ClInclude Include="..\src\odf\datatypes\length.h" />
-    <ClInclude Include="..\src\odf\datatypes\lengthorpercent.h" />
-    <ClInclude Include="..\src\odf\datatypes\letterspacing.h" />
-    <ClInclude Include="..\src\odf\datatypes\linebreak.h" />
-    <ClInclude Include="..\src\odf\datatypes\linemode.h" />
-    <ClInclude Include="..\src\odf\datatypes\linestyle.h" />
-    <ClInclude Include="..\src\odf\datatypes\linetype.h" />
-    <ClInclude Include="..\src\odf\datatypes\linewidth.h" />
-    <ClInclude Include="..\src\odf\datatypes\markerstyle.h" />
-    <ClInclude Include="..\src\odf\datatypes\mathvariant.h" />
-    <ClInclude Include="..\src\odf\datatypes\membertype.h" />
-    <ClInclude Include="..\src\odf\datatypes\messagetype.h" />
-    <ClInclude Include="..\src\odf\datatypes\noteclass.h" />
-    <ClInclude Include="..\src\odf\datatypes\odfattributes.h" />
-    <ClInclude Include="..\src\odf\datatypes\officevaluetype.h" />
-    <ClInclude Include="..\src\odf\datatypes\pageusage.h" />
-    <ClInclude Include="..\src\odf\datatypes\percent.h" />
-    <ClInclude Include="..\src\odf\datatypes\percentorscale.h" />
-    <ClInclude Include="..\src\odf\datatypes\presentationclass.h" />
-    <ClInclude Include="..\src\odf\datatypes\punctuationwrap.h" />
-    <ClInclude Include="..\src\odf\datatypes\rotationalign.h" />
-    <ClInclude Include="..\src\odf\datatypes\runthrough.h" />
-    <ClInclude Include="..\src\odf\datatypes\scripttype.h" />
-    <ClInclude Include="..\src\odf\datatypes\shadowtype.h" />
-    <ClInclude Include="..\src\odf\datatypes\smil_transitiontype.h" />
-    <ClInclude Include="..\src\odf\datatypes\stylefamily.h" />
-    <ClInclude Include="..\src\odf\datatypes\stylehorizontalpos.h" />
-    <ClInclude Include="..\src\odf\datatypes\stylehorizontalrel.h" />
-    <ClInclude Include="..\src\odf\datatypes\styleleadercolor.h" />
-    <ClInclude Include="..\src\odf\datatypes\stylenumformat.h" />
-    <ClInclude Include="..\src\odf\datatypes\styleposition.h" />
-    <ClInclude Include="..\src\odf\datatypes\styleprint.h" />
-    <ClInclude Include="..\src\odf\datatypes\stylerepeat.h" />
-    <ClInclude Include="..\src\odf\datatypes\styletype.h" />
-    <ClInclude Include="..\src\odf\datatypes\styleverticalpos.h" />
-    <ClInclude Include="..\src\odf\datatypes\styleverticalrel.h" />
-    <ClInclude Include="..\src\odf\datatypes\stylewrap.h" />
-    <ClInclude Include="..\src\odf\datatypes\stylewrapcontourmode.h" />
-    <ClInclude Include="..\src\odf\datatypes\style_ref.h" />
-    <ClInclude Include="..\src\odf\datatypes\tablealign.h" />
-    <ClInclude Include="..\src\odf\datatypes\tablecentering.h" />
-    <ClInclude Include="..\src\odf\datatypes\tablefunction.h" />
-    <ClInclude Include="..\src\odf\datatypes\tablemode.h" />
-    <ClInclude Include="..\src\odf\datatypes\tableorder.h" />
-    <ClInclude Include="..\src\odf\datatypes\tableorientation.h" />
-    <ClInclude Include="..\src\odf\datatypes\tabletype.h" />
-    <ClInclude Include="..\src\odf\datatypes\tablevisibility.h" />
-    <ClInclude Include="..\src\odf\datatypes\targetframename.h" />
-    <ClInclude Include="..\src\odf\datatypes\textalign.h" />
-    <ClInclude Include="..\src\odf\datatypes\textalignsource.h" />
-    <ClInclude Include="..\src\odf\datatypes\textautospace.h" />
-    <ClInclude Include="..\src\odf\datatypes\textcombine.h" />
-    <ClInclude Include="..\src\odf\datatypes\textdisplay.h" />
-    <ClInclude Include="..\src\odf\datatypes\textemphasize.h" />
-    <ClInclude Include="..\src\odf\datatypes\textposition.h" />
-    <ClInclude Include="..\src\odf\datatypes\textrotationscale.h" />
-    <ClInclude Include="..\src\odf\datatypes\texttransform.h" />
-    <ClInclude Include="..\src\odf\datatypes\timeperiod.h" />
-    <ClInclude Include="..\src\odf\datatypes\underlinecolor.h" />
-    <ClInclude Include="..\src\odf\datatypes\verticalalign.h" />
-    <ClInclude Include="..\src\odf\datatypes\wrapoption.h" />
-    <ClInclude Include="..\src\odf\datatypes\writingmode.h" />
-    <ClInclude Include="..\src\odf\datatypes\xlink.h" />
+    <ClInclude Include="..\..\Common\CPColorUtils.h" />
+    <ClInclude Include="..\..\Common\CPNoncopyable.h" />
+    <ClInclude Include="..\..\Common\CPOptional.h" />
+    <ClInclude Include="..\..\Common\CPScopedPtr.h" />
+    <ClInclude Include="..\..\Common\CPSharedPtr.h" />
+    <ClInclude Include="..\..\Common\CPString.h" />
+    <ClInclude Include="..\..\Common\CPWeakPtr.h" />
+    <ClInclude Include="..\..\Common\logging.h" />
+    <ClInclude Include="..\..\Common\odf_elements_type.h" />
+    <ClInclude Include="..\..\Common\readdocelement.h" />
+    <ClInclude Include="..\..\Common\readstring.h" />
+    <ClInclude Include="..\..\Common\utils.h" />
+    <ClInclude Include="..\..\Common\writedocelement.h" />
+    <ClInclude Include="..\..\DataTypes\anchortype.h" />
+    <ClInclude Include="..\..\DataTypes\backgroundcolor.h" />
+    <ClInclude Include="..\..\DataTypes\bibliography.h" />
+    <ClInclude Include="..\..\DataTypes\bool.h" />
+    <ClInclude Include="..\..\DataTypes\bordermodel.h" />
+    <ClInclude Include="..\..\DataTypes\borderstyle.h" />
+    <ClInclude Include="..\..\DataTypes\borderwidths.h" />
+    <ClInclude Include="..\..\DataTypes\calcext_type.h" />
+    <ClInclude Include="..\..\DataTypes\chartclass.h" />
+    <ClInclude Include="..\..\DataTypes\chartdatalabelnumber.h" />
+    <ClInclude Include="..\..\DataTypes\charterrorcategory.h" />
+    <ClInclude Include="..\..\DataTypes\chartinterpolation.h" />
+    <ClInclude Include="..\..\DataTypes\chartlabelarrangement.h" />
+    <ClInclude Include="..\..\DataTypes\chartlabelposition.h" />
+    <ClInclude Include="..\..\DataTypes\chartregressiontype.h" />
+    <ClInclude Include="..\..\DataTypes\chartseriessource.h" />
+    <ClInclude Include="..\..\DataTypes\chartsolidtype.h" />
+    <ClInclude Include="..\..\DataTypes\chartsymbol.h" />
+    <ClInclude Include="..\..\DataTypes\charttimeunit.h" />
+    <ClInclude Include="..\..\DataTypes\clockvalue.h" />
+    <ClInclude Include="..\..\DataTypes\color.h" />
+    <ClInclude Include="..\..\DataTypes\commandtype.h" />
+    <ClInclude Include="..\..\DataTypes\common_attlists.h" />
+    <ClInclude Include="..\..\DataTypes\custom_shape_types_convert.h" />
+    <ClInclude Include="..\..\DataTypes\dategroup.h" />
+    <ClInclude Include="..\..\DataTypes\direction.h" />
+    <ClInclude Include="..\..\DataTypes\drawangle.h" />
+    <ClInclude Include="..\..\DataTypes\drawfill.h" />
+    <ClInclude Include="..\..\DataTypes\dropcaplength.h" />
+    <ClInclude Include="..\..\DataTypes\errors.h" />
+    <ClInclude Include="..\..\DataTypes\fillimagerefpoint.h" />
+    <ClInclude Include="..\..\DataTypes\fobreak.h" />
+    <ClInclude Include="..\..\DataTypes\fontfamilygeneric.h" />
+    <ClInclude Include="..\..\DataTypes\fontpitch.h" />
+    <ClInclude Include="..\..\DataTypes\fontrelief.h" />
+    <ClInclude Include="..\..\DataTypes\fontsize.h" />
+    <ClInclude Include="..\..\DataTypes\fontstretch.h" />
+    <ClInclude Include="..\..\DataTypes\fontstyle.h" />
+    <ClInclude Include="..\..\DataTypes\fontvariant.h" />
+    <ClInclude Include="..\..\DataTypes\fontweight.h" />
+    <ClInclude Include="..\..\DataTypes\gradientstyle.h" />
+    <ClInclude Include="..\..\DataTypes\grandtotal.h" />
+    <ClInclude Include="..\..\DataTypes\hatchstyle.h" />
+    <ClInclude Include="..\..\DataTypes\hyphenationkeep.h" />
+    <ClInclude Include="..\..\DataTypes\hyphenationladdercount.h" />
+    <ClInclude Include="..\..\DataTypes\iconset_type.h" />
+    <ClInclude Include="..\..\DataTypes\keeptogether.h" />
+    <ClInclude Include="..\..\DataTypes\layoutgridmode.h" />
+    <ClInclude Include="..\..\DataTypes\length.h" />
+    <ClInclude Include="..\..\DataTypes\lengthorpercent.h" />
+    <ClInclude Include="..\..\DataTypes\letterspacing.h" />
+    <ClInclude Include="..\..\DataTypes\linebreak.h" />
+    <ClInclude Include="..\..\DataTypes\linemode.h" />
+    <ClInclude Include="..\..\DataTypes\linestyle.h" />
+    <ClInclude Include="..\..\DataTypes\linetype.h" />
+    <ClInclude Include="..\..\DataTypes\linewidth.h" />
+    <ClInclude Include="..\..\DataTypes\markerstyle.h" />
+    <ClInclude Include="..\..\DataTypes\mathvariant.h" />
+    <ClInclude Include="..\..\DataTypes\membertype.h" />
+    <ClInclude Include="..\..\DataTypes\messagetype.h" />
+    <ClInclude Include="..\..\DataTypes\noteclass.h" />
+    <ClInclude Include="..\..\DataTypes\odfattributes.h" />
+    <ClInclude Include="..\..\DataTypes\officevaluetype.h" />
+    <ClInclude Include="..\..\DataTypes\pageusage.h" />
+    <ClInclude Include="..\..\DataTypes\percent.h" />
+    <ClInclude Include="..\..\DataTypes\percentorscale.h" />
+    <ClInclude Include="..\..\DataTypes\presentationclass.h" />
+    <ClInclude Include="..\..\DataTypes\punctuationwrap.h" />
+    <ClInclude Include="..\..\DataTypes\rotationalign.h" />
+    <ClInclude Include="..\..\DataTypes\runthrough.h" />
+    <ClInclude Include="..\..\DataTypes\scripttype.h" />
+    <ClInclude Include="..\..\DataTypes\shadowtype.h" />
+    <ClInclude Include="..\..\DataTypes\smil_transitiontype.h" />
+    <ClInclude Include="..\..\DataTypes\stylecellprotect.h" />
+    <ClInclude Include="..\..\DataTypes\stylefamily.h" />
+    <ClInclude Include="..\..\DataTypes\stylehorizontalpos.h" />
+    <ClInclude Include="..\..\DataTypes\stylehorizontalrel.h" />
+    <ClInclude Include="..\..\DataTypes\styleleadercolor.h" />
+    <ClInclude Include="..\..\DataTypes\stylenumformat.h" />
+    <ClInclude Include="..\..\DataTypes\styleposition.h" />
+    <ClInclude Include="..\..\DataTypes\styleprint.h" />
+    <ClInclude Include="..\..\DataTypes\stylerepeat.h" />
+    <ClInclude Include="..\..\DataTypes\styletype.h" />
+    <ClInclude Include="..\..\DataTypes\styleverticalpos.h" />
+    <ClInclude Include="..\..\DataTypes\styleverticalrel.h" />
+    <ClInclude Include="..\..\DataTypes\stylewrap.h" />
+    <ClInclude Include="..\..\DataTypes\stylewrapcontourmode.h" />
+    <ClInclude Include="..\..\DataTypes\style_ref.h" />
+    <ClInclude Include="..\..\DataTypes\tablealign.h" />
+    <ClInclude Include="..\..\DataTypes\tablecentering.h" />
+    <ClInclude Include="..\..\DataTypes\tablefunction.h" />
+    <ClInclude Include="..\..\DataTypes\tablemode.h" />
+    <ClInclude Include="..\..\DataTypes\tableorder.h" />
+    <ClInclude Include="..\..\DataTypes\tableorientation.h" />
+    <ClInclude Include="..\..\DataTypes\tabletype.h" />
+    <ClInclude Include="..\..\DataTypes\tablevisibility.h" />
+    <ClInclude Include="..\..\DataTypes\targetframename.h" />
+    <ClInclude Include="..\..\DataTypes\textalign.h" />
+    <ClInclude Include="..\..\DataTypes\textalignsource.h" />
+    <ClInclude Include="..\..\DataTypes\textautospace.h" />
+    <ClInclude Include="..\..\DataTypes\textcombine.h" />
+    <ClInclude Include="..\..\DataTypes\textdisplay.h" />
+    <ClInclude Include="..\..\DataTypes\textemphasize.h" />
+    <ClInclude Include="..\..\DataTypes\textposition.h" />
+    <ClInclude Include="..\..\DataTypes\textrotationscale.h" />
+    <ClInclude Include="..\..\DataTypes\texttransform.h" />
+    <ClInclude Include="..\..\DataTypes\timeperiod.h" />
+    <ClInclude Include="..\..\DataTypes\underlinecolor.h" />
+    <ClInclude Include="..\..\DataTypes\verticalalign.h" />
+    <ClInclude Include="..\..\DataTypes\wrapoption.h" />
+    <ClInclude Include="..\..\DataTypes\writingmode.h" />
+    <ClInclude Include="..\..\DataTypes\xlink.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\common\CPColorUtils.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="..\src\common\CPString.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="..\src\common\readdocelement.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\anchortype.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\backgroundcolor.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\bibliography.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\bool.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\bordermodel.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\borderstyle.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\borderwidths.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\calcext_type.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\stylecellprotect.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\chartclass.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\chartdatalabelnumber.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\charterrorcategory.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\chartinterpolation.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\chartlabelarrangement.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\chartlabelposition.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\chartregressiontype.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\chartseriessource.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\chartsolidtype.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\chartsymbol.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\charttimeunit.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\clockvalue.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\color.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\commandtype.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\common_attlists.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\dategroup.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\direction.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\drawangle.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\drawfill.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\dropcaplength.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\fillimagerefpoint.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\fobreak.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\fontfamilygeneric.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\fontpitch.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\fontrelief.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\fontsize.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\fontstretch.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\fontstyle.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\fontvariant.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\fontweight.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\gradientstyle.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\grandtotal.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\hatchstyle.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\hyphenationkeep.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\hyphenationladdercount.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\iconset_type.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\keeptogether.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\layoutgridmode.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\length.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\lengthorpercent.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\letterspacing.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\linebreak.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\linemode.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\linestyle.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\linetype.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\linewidth.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\markerstyle.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\mathvariant.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\membertype.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\messagetype.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\noteclass.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\officevaluetype.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\pageusage.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\percent.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\percentorscale.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\presentationclass.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\punctuationwrap.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\rotationalign.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\runthrough.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\scripttype.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\shadowtype.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\smil_transitiontype.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\stylefamily.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\stylehorizontalpos.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\stylehorizontalrel.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\styleleadercolor.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\stylenumformat.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\styleposition.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\styleprint.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\stylerepeat.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\styletype.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\styleverticalpos.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\styleverticalrel.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\stylewrap.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\stylewrapcontourmode.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\style_ref.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\tablealign.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\tablecentering.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\tablefunction.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\tablemode.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\tableorder.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\tableorientation.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\tabletype.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\tablevisibility.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\targetframename.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\textalign.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\textalignsource.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\textautospace.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\textcombine.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\textdisplay.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\textemphasize.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\textposition.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\textrotationscale.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\texttransform.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\timeperiod.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\underlinecolor.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\verticalalign.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\wrapoption.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\writingmode.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\xlink.cpp" />
+    <ClCompile Include="..\..\Common\CPColorUtils.cpp" />
+    <ClCompile Include="..\..\Common\CPString.cpp" />
+    <ClCompile Include="..\..\Common\readdocelement.cpp" />
+    <ClCompile Include="..\..\Common\utils.cpp" />
+    <ClCompile Include="..\..\DataTypes\anchortype.cpp" />
+    <ClCompile Include="..\..\DataTypes\backgroundcolor.cpp" />
+    <ClCompile Include="..\..\DataTypes\bibliography.cpp" />
+    <ClCompile Include="..\..\DataTypes\bool.cpp" />
+    <ClCompile Include="..\..\DataTypes\bordermodel.cpp" />
+    <ClCompile Include="..\..\DataTypes\borderstyle.cpp" />
+    <ClCompile Include="..\..\DataTypes\borderwidths.cpp" />
+    <ClCompile Include="..\..\DataTypes\calcext_type.cpp" />
+    <ClCompile Include="..\..\DataTypes\chartclass.cpp" />
+    <ClCompile Include="..\..\DataTypes\chartdatalabelnumber.cpp" />
+    <ClCompile Include="..\..\DataTypes\charterrorcategory.cpp" />
+    <ClCompile Include="..\..\DataTypes\chartinterpolation.cpp" />
+    <ClCompile Include="..\..\DataTypes\chartlabelarrangement.cpp" />
+    <ClCompile Include="..\..\DataTypes\chartlabelposition.cpp" />
+    <ClCompile Include="..\..\DataTypes\chartregressiontype.cpp" />
+    <ClCompile Include="..\..\DataTypes\chartseriessource.cpp" />
+    <ClCompile Include="..\..\DataTypes\chartsolidtype.cpp" />
+    <ClCompile Include="..\..\DataTypes\chartsymbol.cpp" />
+    <ClCompile Include="..\..\DataTypes\charttimeunit.cpp" />
+    <ClCompile Include="..\..\DataTypes\clockvalue.cpp" />
+    <ClCompile Include="..\..\DataTypes\color.cpp" />
+    <ClCompile Include="..\..\DataTypes\commandtype.cpp" />
+    <ClCompile Include="..\..\DataTypes\common_attlists.cpp" />
+    <ClCompile Include="..\..\DataTypes\dategroup.cpp" />
+    <ClCompile Include="..\..\DataTypes\direction.cpp" />
+    <ClCompile Include="..\..\DataTypes\drawangle.cpp" />
+    <ClCompile Include="..\..\DataTypes\drawfill.cpp" />
+    <ClCompile Include="..\..\DataTypes\dropcaplength.cpp" />
+    <ClCompile Include="..\..\DataTypes\fillimagerefpoint.cpp" />
+    <ClCompile Include="..\..\DataTypes\fobreak.cpp" />
+    <ClCompile Include="..\..\DataTypes\fontfamilygeneric.cpp" />
+    <ClCompile Include="..\..\DataTypes\fontpitch.cpp" />
+    <ClCompile Include="..\..\DataTypes\fontrelief.cpp" />
+    <ClCompile Include="..\..\DataTypes\fontsize.cpp" />
+    <ClCompile Include="..\..\DataTypes\fontstretch.cpp" />
+    <ClCompile Include="..\..\DataTypes\fontstyle.cpp" />
+    <ClCompile Include="..\..\DataTypes\fontvariant.cpp" />
+    <ClCompile Include="..\..\DataTypes\fontweight.cpp" />
+    <ClCompile Include="..\..\DataTypes\gradientstyle.cpp" />
+    <ClCompile Include="..\..\DataTypes\grandtotal.cpp" />
+    <ClCompile Include="..\..\DataTypes\hatchstyle.cpp" />
+    <ClCompile Include="..\..\DataTypes\hyphenationkeep.cpp" />
+    <ClCompile Include="..\..\DataTypes\hyphenationladdercount.cpp" />
+    <ClCompile Include="..\..\DataTypes\iconset_type.cpp" />
+    <ClCompile Include="..\..\DataTypes\keeptogether.cpp" />
+    <ClCompile Include="..\..\DataTypes\layoutgridmode.cpp" />
+    <ClCompile Include="..\..\DataTypes\length.cpp" />
+    <ClCompile Include="..\..\DataTypes\lengthorpercent.cpp" />
+    <ClCompile Include="..\..\DataTypes\letterspacing.cpp" />
+    <ClCompile Include="..\..\DataTypes\linebreak.cpp" />
+    <ClCompile Include="..\..\DataTypes\linemode.cpp" />
+    <ClCompile Include="..\..\DataTypes\linestyle.cpp" />
+    <ClCompile Include="..\..\DataTypes\linetype.cpp" />
+    <ClCompile Include="..\..\DataTypes\linewidth.cpp" />
+    <ClCompile Include="..\..\DataTypes\markerstyle.cpp" />
+    <ClCompile Include="..\..\DataTypes\mathvariant.cpp" />
+    <ClCompile Include="..\..\DataTypes\membertype.cpp" />
+    <ClCompile Include="..\..\DataTypes\messagetype.cpp" />
+    <ClCompile Include="..\..\DataTypes\noteclass.cpp" />
+    <ClCompile Include="..\..\DataTypes\officevaluetype.cpp" />
+    <ClCompile Include="..\..\DataTypes\pageusage.cpp" />
+    <ClCompile Include="..\..\DataTypes\percent.cpp" />
+    <ClCompile Include="..\..\DataTypes\percentorscale.cpp" />
+    <ClCompile Include="..\..\DataTypes\presentationclass.cpp" />
+    <ClCompile Include="..\..\DataTypes\punctuationwrap.cpp" />
+    <ClCompile Include="..\..\DataTypes\rotationalign.cpp" />
+    <ClCompile Include="..\..\DataTypes\runthrough.cpp" />
+    <ClCompile Include="..\..\DataTypes\scripttype.cpp" />
+    <ClCompile Include="..\..\DataTypes\shadowtype.cpp" />
+    <ClCompile Include="..\..\DataTypes\smil_transitiontype.cpp" />
+    <ClCompile Include="..\..\DataTypes\stylecellprotect.cpp" />
+    <ClCompile Include="..\..\DataTypes\stylefamily.cpp" />
+    <ClCompile Include="..\..\DataTypes\stylehorizontalpos.cpp" />
+    <ClCompile Include="..\..\DataTypes\stylehorizontalrel.cpp" />
+    <ClCompile Include="..\..\DataTypes\styleleadercolor.cpp" />
+    <ClCompile Include="..\..\DataTypes\stylenumformat.cpp" />
+    <ClCompile Include="..\..\DataTypes\styleposition.cpp" />
+    <ClCompile Include="..\..\DataTypes\styleprint.cpp" />
+    <ClCompile Include="..\..\DataTypes\stylerepeat.cpp" />
+    <ClCompile Include="..\..\DataTypes\styletype.cpp" />
+    <ClCompile Include="..\..\DataTypes\styleverticalpos.cpp" />
+    <ClCompile Include="..\..\DataTypes\styleverticalrel.cpp" />
+    <ClCompile Include="..\..\DataTypes\stylewrap.cpp" />
+    <ClCompile Include="..\..\DataTypes\stylewrapcontourmode.cpp" />
+    <ClCompile Include="..\..\DataTypes\style_ref.cpp" />
+    <ClCompile Include="..\..\DataTypes\tablealign.cpp" />
+    <ClCompile Include="..\..\DataTypes\tablecentering.cpp" />
+    <ClCompile Include="..\..\DataTypes\tablefunction.cpp" />
+    <ClCompile Include="..\..\DataTypes\tablemode.cpp" />
+    <ClCompile Include="..\..\DataTypes\tableorder.cpp" />
+    <ClCompile Include="..\..\DataTypes\tableorientation.cpp" />
+    <ClCompile Include="..\..\DataTypes\tabletype.cpp" />
+    <ClCompile Include="..\..\DataTypes\tablevisibility.cpp" />
+    <ClCompile Include="..\..\DataTypes\targetframename.cpp" />
+    <ClCompile Include="..\..\DataTypes\textalign.cpp" />
+    <ClCompile Include="..\..\DataTypes\textalignsource.cpp" />
+    <ClCompile Include="..\..\DataTypes\textautospace.cpp" />
+    <ClCompile Include="..\..\DataTypes\textcombine.cpp" />
+    <ClCompile Include="..\..\DataTypes\textdisplay.cpp" />
+    <ClCompile Include="..\..\DataTypes\textemphasize.cpp" />
+    <ClCompile Include="..\..\DataTypes\textposition.cpp" />
+    <ClCompile Include="..\..\DataTypes\textrotationscale.cpp" />
+    <ClCompile Include="..\..\DataTypes\texttransform.cpp" />
+    <ClCompile Include="..\..\DataTypes\timeperiod.cpp" />
+    <ClCompile Include="..\..\DataTypes\underlinecolor.cpp" />
+    <ClCompile Include="..\..\DataTypes\verticalalign.cpp" />
+    <ClCompile Include="..\..\DataTypes\wrapoption.cpp" />
+    <ClCompile Include="..\..\DataTypes\writingmode.cpp" />
+    <ClCompile Include="..\..\DataTypes\xlink.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/OdfFile/Projects/Windows/cpcommon.vcxproj.filters b/OdfFile/Projects/Windows/cpcommon.vcxproj.filters
index c1dd9a8dce..21d5187e03 100644
--- a/OdfFile/Projects/Windows/cpcommon.vcxproj.filters
+++ b/OdfFile/Projects/Windows/cpcommon.vcxproj.filters
@@ -1,690 +1,692 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="include">
-      <UniqueIdentifier>{99b4ef49-83fb-4723-a3a5-93e6ede1ddb6}</UniqueIdentifier>
-    </Filter>
     <Filter Include="datatypes odf">
       <UniqueIdentifier>{c5b21206-a811-4082-8df4-c8306b5518b0}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\include\cpdoccore\common\readdocelement.h">
-      <Filter>include</Filter>
+    <ClInclude Include="..\..\Common\CPColorUtils.h" />
+    <ClInclude Include="..\..\Common\CPNoncopyable.h" />
+    <ClInclude Include="..\..\Common\CPOptional.h" />
+    <ClInclude Include="..\..\Common\CPScopedPtr.h" />
+    <ClInclude Include="..\..\Common\CPSharedPtr.h" />
+    <ClInclude Include="..\..\Common\CPString.h" />
+    <ClInclude Include="..\..\Common\CPWeakPtr.h" />
+    <ClInclude Include="..\..\DataTypes\anchortype.h">
+      <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\cpdoccore\common\writedocelement.h">
-      <Filter>include</Filter>
+    <ClInclude Include="..\..\DataTypes\backgroundcolor.h">
+      <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\anchortype.h">
+    <ClInclude Include="..\..\DataTypes\bibliography.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\backgroundcolor.h">
+    <ClInclude Include="..\..\DataTypes\bool.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\bibliography.h">
+    <ClInclude Include="..\..\DataTypes\bordermodel.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\bool.h">
+    <ClInclude Include="..\..\DataTypes\borderstyle.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\bordermodel.h">
+    <ClInclude Include="..\..\DataTypes\borderwidths.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\borderstyle.h">
+    <ClInclude Include="..\..\DataTypes\calcext_type.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\borderwidths.h">
+    <ClInclude Include="..\..\DataTypes\chartclass.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\calcext_type.h">
+    <ClInclude Include="..\..\DataTypes\chartdatalabelnumber.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\chartdatalabelnumber.h">
+    <ClInclude Include="..\..\DataTypes\charterrorcategory.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\charterrorcategory.h">
+    <ClInclude Include="..\..\DataTypes\chartinterpolation.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\chartinterpolation.h">
+    <ClInclude Include="..\..\DataTypes\chartlabelarrangement.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\chartlabelarrangement.h">
+    <ClInclude Include="..\..\DataTypes\chartlabelposition.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\chartlabelposition.h">
+    <ClInclude Include="..\..\DataTypes\chartregressiontype.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\chartregressiontype.h">
+    <ClInclude Include="..\..\DataTypes\chartseriessource.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\chartseriessource.h">
+    <ClInclude Include="..\..\DataTypes\chartsolidtype.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\chartsolidtype.h">
+    <ClInclude Include="..\..\DataTypes\chartsymbol.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\chartsymbol.h">
+    <ClInclude Include="..\..\DataTypes\charttimeunit.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\charttimeunit.h">
+    <ClInclude Include="..\..\DataTypes\clockvalue.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\clockvalue.h">
+    <ClInclude Include="..\..\DataTypes\color.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\color.h">
+    <ClInclude Include="..\..\DataTypes\commandtype.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\commandtype.h">
+    <ClInclude Include="..\..\DataTypes\common_attlists.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\common_attlists.h">
+    <ClInclude Include="..\..\DataTypes\custom_shape_types_convert.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\dategroup.h">
+    <ClInclude Include="..\..\DataTypes\dategroup.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\direction.h">
+    <ClInclude Include="..\..\DataTypes\direction.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\drawfill.h">
+    <ClInclude Include="..\..\DataTypes\drawangle.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\dropcaplength.h">
+    <ClInclude Include="..\..\DataTypes\drawfill.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\errors.h">
+    <ClInclude Include="..\..\DataTypes\dropcaplength.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\fillimagerefpoint.h">
+    <ClInclude Include="..\..\DataTypes\errors.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\fobreak.h">
+    <ClInclude Include="..\..\DataTypes\fillimagerefpoint.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\fontfamilygeneric.h">
+    <ClInclude Include="..\..\DataTypes\fobreak.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\fontpitch.h">
+    <ClInclude Include="..\..\DataTypes\fontfamilygeneric.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\fontrelief.h">
+    <ClInclude Include="..\..\DataTypes\fontpitch.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\fontsize.h">
+    <ClInclude Include="..\..\DataTypes\fontrelief.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\fontstretch.h">
+    <ClInclude Include="..\..\DataTypes\fontsize.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\fontstyle.h">
+    <ClInclude Include="..\..\DataTypes\fontstretch.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\fontvariant.h">
+    <ClInclude Include="..\..\DataTypes\fontstyle.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\fontweight.h">
+    <ClInclude Include="..\..\DataTypes\fontvariant.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\gradientstyle.h">
+    <ClInclude Include="..\..\DataTypes\fontweight.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\grandtotal.h">
+    <ClInclude Include="..\..\DataTypes\gradientstyle.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\hatchstyle.h">
+    <ClInclude Include="..\..\DataTypes\grandtotal.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\hyphenationkeep.h">
+    <ClInclude Include="..\..\DataTypes\hatchstyle.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\hyphenationladdercount.h">
+    <ClInclude Include="..\..\DataTypes\hyphenationkeep.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\keeptogether.h">
+    <ClInclude Include="..\..\DataTypes\hyphenationladdercount.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\layoutgridmode.h">
+    <ClInclude Include="..\..\DataTypes\iconset_type.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\length.h">
+    <ClInclude Include="..\..\DataTypes\keeptogether.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\lengthorpercent.h">
+    <ClInclude Include="..\..\DataTypes\layoutgridmode.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\letterspacing.h">
+    <ClInclude Include="..\..\DataTypes\length.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\linebreak.h">
+    <ClInclude Include="..\..\DataTypes\lengthorpercent.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\linemode.h">
+    <ClInclude Include="..\..\DataTypes\letterspacing.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\linestyle.h">
+    <ClInclude Include="..\..\DataTypes\linebreak.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\linetype.h">
+    <ClInclude Include="..\..\DataTypes\linemode.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\linewidth.h">
+    <ClInclude Include="..\..\DataTypes\linestyle.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\markerstyle.h">
+    <ClInclude Include="..\..\DataTypes\linetype.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\mathvariant.h">
+    <ClInclude Include="..\..\DataTypes\linewidth.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\membertype.h">
+    <ClInclude Include="..\..\DataTypes\markerstyle.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\noteclass.h">
+    <ClInclude Include="..\..\DataTypes\mathvariant.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\odfattributes.h">
+    <ClInclude Include="..\..\DataTypes\membertype.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\officevaluetype.h">
+    <ClInclude Include="..\..\DataTypes\messagetype.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\pageusage.h">
+    <ClInclude Include="..\..\DataTypes\noteclass.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\percent.h">
+    <ClInclude Include="..\..\DataTypes\odfattributes.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\percentorscale.h">
+    <ClInclude Include="..\..\DataTypes\officevaluetype.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\presentationclass.h">
+    <ClInclude Include="..\..\DataTypes\pageusage.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\punctuationwrap.h">
+    <ClInclude Include="..\..\DataTypes\percent.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\rotationalign.h">
+    <ClInclude Include="..\..\DataTypes\percentorscale.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\runthrough.h">
+    <ClInclude Include="..\..\DataTypes\presentationclass.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\scripttype.h">
+    <ClInclude Include="..\..\DataTypes\punctuationwrap.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\shadowtype.h">
+    <ClInclude Include="..\..\DataTypes\rotationalign.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\smil_transitiontype.h">
+    <ClInclude Include="..\..\DataTypes\runthrough.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\style_ref.h">
+    <ClInclude Include="..\..\DataTypes\scripttype.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\stylefamily.h">
+    <ClInclude Include="..\..\DataTypes\shadowtype.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\stylehorizontalpos.h">
+    <ClInclude Include="..\..\DataTypes\smil_transitiontype.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\stylehorizontalrel.h">
+    <ClInclude Include="..\..\DataTypes\style_ref.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\styleleadercolor.h">
+    <ClInclude Include="..\..\DataTypes\stylecellprotect.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\stylenumformat.h">
+    <ClInclude Include="..\..\DataTypes\stylefamily.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\styleposition.h">
+    <ClInclude Include="..\..\DataTypes\stylehorizontalpos.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\styleprint.h">
+    <ClInclude Include="..\..\DataTypes\stylehorizontalrel.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\stylerepeat.h">
+    <ClInclude Include="..\..\DataTypes\styleleadercolor.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\styletype.h">
+    <ClInclude Include="..\..\DataTypes\stylenumformat.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\styleverticalpos.h">
+    <ClInclude Include="..\..\DataTypes\styleposition.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\styleverticalrel.h">
+    <ClInclude Include="..\..\DataTypes\styleprint.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\stylewrap.h">
+    <ClInclude Include="..\..\DataTypes\stylerepeat.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\stylewrapcontourmode.h">
+    <ClInclude Include="..\..\DataTypes\styletype.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\tablealign.h">
+    <ClInclude Include="..\..\DataTypes\styleverticalpos.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\tablecentering.h">
+    <ClInclude Include="..\..\DataTypes\styleverticalrel.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\tablefunction.h">
+    <ClInclude Include="..\..\DataTypes\stylewrap.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\tablemode.h">
+    <ClInclude Include="..\..\DataTypes\stylewrapcontourmode.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\tableorder.h">
+    <ClInclude Include="..\..\DataTypes\tablealign.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\tableorientation.h">
+    <ClInclude Include="..\..\DataTypes\tablecentering.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\tabletype.h">
+    <ClInclude Include="..\..\DataTypes\tablefunction.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\tablevisibility.h">
+    <ClInclude Include="..\..\DataTypes\tablemode.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\targetframename.h">
+    <ClInclude Include="..\..\DataTypes\tableorder.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\textalign.h">
+    <ClInclude Include="..\..\DataTypes\tableorientation.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\textalignsource.h">
+    <ClInclude Include="..\..\DataTypes\tabletype.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\textautospace.h">
+    <ClInclude Include="..\..\DataTypes\tablevisibility.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\textcombine.h">
+    <ClInclude Include="..\..\DataTypes\targetframename.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\textdisplay.h">
+    <ClInclude Include="..\..\DataTypes\textalign.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\textemphasize.h">
+    <ClInclude Include="..\..\DataTypes\textalignsource.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\textposition.h">
+    <ClInclude Include="..\..\DataTypes\textautospace.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\textrotationscale.h">
+    <ClInclude Include="..\..\DataTypes\textcombine.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\texttransform.h">
+    <ClInclude Include="..\..\DataTypes\textdisplay.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\underlinecolor.h">
+    <ClInclude Include="..\..\DataTypes\textemphasize.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\verticalalign.h">
+    <ClInclude Include="..\..\DataTypes\textposition.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\wrapoption.h">
+    <ClInclude Include="..\..\DataTypes\textrotationscale.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\writingmode.h">
+    <ClInclude Include="..\..\DataTypes\texttransform.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\xlink.h">
+    <ClInclude Include="..\..\DataTypes\timeperiod.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\cpdoccore\CPColorUtils.h" />
-    <ClInclude Include="..\include\cpdoccore\CPNoncopyable.h" />
-    <ClInclude Include="..\include\cpdoccore\CPOptional.h" />
-    <ClInclude Include="..\include\cpdoccore\CPScopedPtr.h" />
-    <ClInclude Include="..\include\cpdoccore\CPSharedPtr.h" />
-    <ClInclude Include="..\include\cpdoccore\CPString.h" />
-    <ClInclude Include="..\include\cpdoccore\CPWeakPtr.h" />
-    <ClInclude Include="..\..\ASCOfficeOdfFileW\source\OdfFormat\odf_chart_context.h" />
-    <ClInclude Include="..\src\docx\oox_chart_axis.h" />
-    <ClInclude Include="..\src\odf\datatypes\chartclass.h">
+    <ClInclude Include="..\..\DataTypes\underlinecolor.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\drawangle.h">
+    <ClInclude Include="..\..\DataTypes\verticalalign.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\messagetype.h">
+    <ClInclude Include="..\..\DataTypes\wrapoption.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\timeperiod.h">
+    <ClInclude Include="..\..\DataTypes\writingmode.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\stylecellprotect.h">
+    <ClInclude Include="..\..\DataTypes\xlink.h">
       <Filter>datatypes odf</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Common\logging.h" />
+    <ClInclude Include="..\..\Common\odf_elements_type.h" />
+    <ClInclude Include="..\..\Common\readdocelement.h" />
+    <ClInclude Include="..\..\Common\readstring.h" />
+    <ClInclude Include="..\..\Common\utils.h" />
+    <ClInclude Include="..\..\Common\writedocelement.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\odf\datatypes\anchortype.cpp">
+    <ClCompile Include="..\..\Common\CPColorUtils.cpp" />
+    <ClCompile Include="..\..\Common\CPString.cpp" />
+    <ClCompile Include="..\..\DataTypes\anchortype.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\backgroundcolor.cpp">
+    <ClCompile Include="..\..\DataTypes\backgroundcolor.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\bibliography.cpp">
+    <ClCompile Include="..\..\DataTypes\bibliography.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\bool.cpp">
+    <ClCompile Include="..\..\DataTypes\bool.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\bordermodel.cpp">
+    <ClCompile Include="..\..\DataTypes\bordermodel.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\borderstyle.cpp">
+    <ClCompile Include="..\..\DataTypes\borderstyle.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\borderwidths.cpp">
+    <ClCompile Include="..\..\DataTypes\borderwidths.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\calcext_type.cpp">
+    <ClCompile Include="..\..\DataTypes\calcext_type.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\chartdatalabelnumber.cpp">
+    <ClCompile Include="..\..\DataTypes\chartclass.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\charterrorcategory.cpp">
+    <ClCompile Include="..\..\DataTypes\chartdatalabelnumber.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\chartinterpolation.cpp">
+    <ClCompile Include="..\..\DataTypes\charterrorcategory.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\chartlabelarrangement.cpp">
+    <ClCompile Include="..\..\DataTypes\chartinterpolation.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\chartlabelposition.cpp">
+    <ClCompile Include="..\..\DataTypes\chartlabelarrangement.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\chartregressiontype.cpp">
+    <ClCompile Include="..\..\DataTypes\chartlabelposition.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\chartseriessource.cpp">
+    <ClCompile Include="..\..\DataTypes\chartregressiontype.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\chartsolidtype.cpp">
+    <ClCompile Include="..\..\DataTypes\chartseriessource.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\chartsymbol.cpp">
+    <ClCompile Include="..\..\DataTypes\chartsolidtype.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\charttimeunit.cpp">
+    <ClCompile Include="..\..\DataTypes\chartsymbol.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\clockvalue.cpp">
+    <ClCompile Include="..\..\DataTypes\charttimeunit.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\color.cpp">
+    <ClCompile Include="..\..\DataTypes\clockvalue.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\commandtype.cpp">
+    <ClCompile Include="..\..\DataTypes\color.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\common_attlists.cpp">
+    <ClCompile Include="..\..\DataTypes\commandtype.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\dategroup.cpp">
+    <ClCompile Include="..\..\DataTypes\common_attlists.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\direction.cpp">
+    <ClCompile Include="..\..\DataTypes\dategroup.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\drawfill.cpp">
+    <ClCompile Include="..\..\DataTypes\direction.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\dropcaplength.cpp">
+    <ClCompile Include="..\..\DataTypes\drawangle.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\fillimagerefpoint.cpp">
+    <ClCompile Include="..\..\DataTypes\drawfill.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\fobreak.cpp">
+    <ClCompile Include="..\..\DataTypes\dropcaplength.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\fontfamilygeneric.cpp">
+    <ClCompile Include="..\..\DataTypes\fillimagerefpoint.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\fontpitch.cpp">
+    <ClCompile Include="..\..\DataTypes\fobreak.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\fontrelief.cpp">
+    <ClCompile Include="..\..\DataTypes\fontfamilygeneric.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\fontsize.cpp">
+    <ClCompile Include="..\..\DataTypes\fontpitch.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\fontstretch.cpp">
+    <ClCompile Include="..\..\DataTypes\fontrelief.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\fontstyle.cpp">
+    <ClCompile Include="..\..\DataTypes\fontsize.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\fontvariant.cpp">
+    <ClCompile Include="..\..\DataTypes\fontstretch.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\fontweight.cpp">
+    <ClCompile Include="..\..\DataTypes\fontstyle.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\gradientstyle.cpp">
+    <ClCompile Include="..\..\DataTypes\fontvariant.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\grandtotal.cpp">
+    <ClCompile Include="..\..\DataTypes\fontweight.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\hatchstyle.cpp">
+    <ClCompile Include="..\..\DataTypes\gradientstyle.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\hyphenationkeep.cpp">
+    <ClCompile Include="..\..\DataTypes\grandtotal.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\hyphenationladdercount.cpp">
+    <ClCompile Include="..\..\DataTypes\hatchstyle.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\iconset_type.cpp">
+    <ClCompile Include="..\..\DataTypes\hyphenationkeep.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\keeptogether.cpp">
+    <ClCompile Include="..\..\DataTypes\hyphenationladdercount.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\layoutgridmode.cpp">
+    <ClCompile Include="..\..\DataTypes\iconset_type.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\length.cpp">
+    <ClCompile Include="..\..\DataTypes\keeptogether.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\lengthorpercent.cpp">
+    <ClCompile Include="..\..\DataTypes\layoutgridmode.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\letterspacing.cpp">
+    <ClCompile Include="..\..\DataTypes\length.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\linebreak.cpp">
+    <ClCompile Include="..\..\DataTypes\lengthorpercent.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\linemode.cpp">
+    <ClCompile Include="..\..\DataTypes\letterspacing.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\linestyle.cpp">
+    <ClCompile Include="..\..\DataTypes\linebreak.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\linetype.cpp">
+    <ClCompile Include="..\..\DataTypes\linemode.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\linewidth.cpp">
+    <ClCompile Include="..\..\DataTypes\linestyle.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\markerstyle.cpp">
+    <ClCompile Include="..\..\DataTypes\linetype.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\mathvariant.cpp">
+    <ClCompile Include="..\..\DataTypes\linewidth.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\membertype.cpp">
+    <ClCompile Include="..\..\DataTypes\markerstyle.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\noteclass.cpp">
+    <ClCompile Include="..\..\DataTypes\mathvariant.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\officevaluetype.cpp">
+    <ClCompile Include="..\..\DataTypes\membertype.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\pageusage.cpp">
+    <ClCompile Include="..\..\DataTypes\messagetype.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\percent.cpp">
+    <ClCompile Include="..\..\DataTypes\noteclass.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\percentorscale.cpp">
+    <ClCompile Include="..\..\DataTypes\officevaluetype.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\presentationclass.cpp">
+    <ClCompile Include="..\..\DataTypes\pageusage.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\punctuationwrap.cpp">
+    <ClCompile Include="..\..\DataTypes\percent.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\rotationalign.cpp">
+    <ClCompile Include="..\..\DataTypes\percentorscale.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\runthrough.cpp">
+    <ClCompile Include="..\..\DataTypes\presentationclass.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\scripttype.cpp">
+    <ClCompile Include="..\..\DataTypes\punctuationwrap.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\shadowtype.cpp">
+    <ClCompile Include="..\..\DataTypes\rotationalign.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\smil_transitiontype.cpp">
+    <ClCompile Include="..\..\DataTypes\runthrough.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\style_ref.cpp">
+    <ClCompile Include="..\..\DataTypes\scripttype.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\stylefamily.cpp">
+    <ClCompile Include="..\..\DataTypes\shadowtype.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\stylehorizontalpos.cpp">
+    <ClCompile Include="..\..\DataTypes\smil_transitiontype.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\stylehorizontalrel.cpp">
+    <ClCompile Include="..\..\DataTypes\style_ref.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\styleleadercolor.cpp">
+    <ClCompile Include="..\..\DataTypes\stylecellprotect.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\stylenumformat.cpp">
+    <ClCompile Include="..\..\DataTypes\stylefamily.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\styleposition.cpp">
+    <ClCompile Include="..\..\DataTypes\stylehorizontalpos.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\styleprint.cpp">
+    <ClCompile Include="..\..\DataTypes\stylehorizontalrel.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\stylerepeat.cpp">
+    <ClCompile Include="..\..\DataTypes\styleleadercolor.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\styletype.cpp">
+    <ClCompile Include="..\..\DataTypes\stylenumformat.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\styleverticalpos.cpp">
+    <ClCompile Include="..\..\DataTypes\styleposition.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\styleverticalrel.cpp">
+    <ClCompile Include="..\..\DataTypes\styleprint.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\stylewrap.cpp">
+    <ClCompile Include="..\..\DataTypes\stylerepeat.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\stylewrapcontourmode.cpp">
+    <ClCompile Include="..\..\DataTypes\styletype.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\tablealign.cpp">
+    <ClCompile Include="..\..\DataTypes\styleverticalpos.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\tablecentering.cpp">
+    <ClCompile Include="..\..\DataTypes\styleverticalrel.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\tablefunction.cpp">
+    <ClCompile Include="..\..\DataTypes\stylewrap.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\tablemode.cpp">
+    <ClCompile Include="..\..\DataTypes\stylewrapcontourmode.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\tableorder.cpp">
+    <ClCompile Include="..\..\DataTypes\tablealign.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\tableorientation.cpp">
+    <ClCompile Include="..\..\DataTypes\tablecentering.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\tabletype.cpp">
+    <ClCompile Include="..\..\DataTypes\tablefunction.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\tablevisibility.cpp">
+    <ClCompile Include="..\..\DataTypes\tablemode.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\targetframename.cpp">
+    <ClCompile Include="..\..\DataTypes\tableorder.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\textalign.cpp">
+    <ClCompile Include="..\..\DataTypes\tableorientation.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\textalignsource.cpp">
+    <ClCompile Include="..\..\DataTypes\tabletype.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\textautospace.cpp">
+    <ClCompile Include="..\..\DataTypes\tablevisibility.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\textcombine.cpp">
+    <ClCompile Include="..\..\DataTypes\targetframename.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\textdisplay.cpp">
+    <ClCompile Include="..\..\DataTypes\textalign.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\textemphasize.cpp">
+    <ClCompile Include="..\..\DataTypes\textalignsource.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\textposition.cpp">
+    <ClCompile Include="..\..\DataTypes\textautospace.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\textrotationscale.cpp">
+    <ClCompile Include="..\..\DataTypes\textcombine.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\texttransform.cpp">
+    <ClCompile Include="..\..\DataTypes\textdisplay.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\underlinecolor.cpp">
+    <ClCompile Include="..\..\DataTypes\textemphasize.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\verticalalign.cpp">
+    <ClCompile Include="..\..\DataTypes\textposition.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\wrapoption.cpp">
+    <ClCompile Include="..\..\DataTypes\textrotationscale.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\writingmode.cpp">
+    <ClCompile Include="..\..\DataTypes\texttransform.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\xlink.cpp">
+    <ClCompile Include="..\..\DataTypes\timeperiod.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\common\CPColorUtils.cpp" />
-    <ClCompile Include="..\src\common\CPString.cpp" />
-    <ClCompile Include="..\src\common\readdocelement.cpp" />
-    <ClCompile Include="..\src\odf\datatypes\chartclass.cpp">
+    <ClCompile Include="..\..\DataTypes\underlinecolor.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\drawangle.cpp">
+    <ClCompile Include="..\..\DataTypes\verticalalign.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\messagetype.cpp">
+    <ClCompile Include="..\..\DataTypes\wrapoption.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\timeperiod.cpp">
+    <ClCompile Include="..\..\DataTypes\writingmode.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\datatypes\stylecellprotect.cpp">
+    <ClCompile Include="..\..\DataTypes\xlink.cpp">
       <Filter>datatypes odf</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Common\readdocelement.cpp" />
+    <ClCompile Include="..\..\Common\utils.cpp" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/OdfFile/Projects/Windows/cpodf.vcxproj b/OdfFile/Projects/Windows/cpodf.vcxproj
index 177b1daae4..7432ad2c3f 100644
--- a/OdfFile/Projects/Windows/cpodf.vcxproj
+++ b/OdfFile/Projects/Windows/cpodf.vcxproj
@@ -171,371 +171,319 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\conversionelement.cpp" />
-    <ClCompile Include="..\src\ConvertOO2OOX.cpp" />
-    <ClCompile Include="..\src\docx\docx_content_type.cpp" />
-    <ClCompile Include="..\src\docx\docx_conversion_context.cpp" />
-    <ClCompile Include="..\src\docx\docx_drawing.cpp" />
-    <ClCompile Include="..\src\docx\docx_package.cpp" />
-    <ClCompile Include="..\src\docx\docx_table_context.cpp" />
-    <ClCompile Include="..\src\docx\headers_footers.cpp" />
-    <ClCompile Include="..\src\docx\hyperlinks.cpp" />
-    <ClCompile Include="..\src\docx\measuredigits.cpp" />
-    <ClCompile Include="..\src\docx\mediaitems.cpp" />
-    <ClCompile Include="..\src\docx\namespaces.cpp">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\oox_chart_axis.cpp" />
-    <ClCompile Include="..\src\docx\oox_chart_context.cpp" />
-    <ClCompile Include="..\src\docx\oox_chart_legend.cpp" />
-    <ClCompile Include="..\src\docx\oox_chart_series.cpp" />
-    <ClCompile Include="..\src\docx\oox_chart_shape.cpp" />
-    <ClCompile Include="..\src\docx\oox_conversion_context.cpp" />
-    <ClCompile Include="..\src\docx\oox_data_labels.cpp" />
-    <ClCompile Include="..\src\docx\oox_drawing.cpp" />
-    <ClCompile Include="..\src\docx\oox_drawing_fills.cpp" />
-    <ClCompile Include="..\src\docx\oox_layout.cpp" />
-    <ClCompile Include="..\src\docx\oox_package.cpp" />
-    <ClCompile Include="..\src\docx\oox_plot_area.cpp" />
-    <ClCompile Include="..\src\docx\oox_rels.cpp" />
-    <ClCompile Include="..\src\docx\oox_title.cpp" />
-    <ClCompile Include="..\src\docx\oox_types_chart.cpp" />
-    <ClCompile Include="..\src\docx\pptx_comments.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\pptx_comments_context.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\pptx_conversion_context.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\pptx_drawing.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\pptx_drawings.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\pptx_output_xml.cpp" />
-    <ClCompile Include="..\src\docx\pptx_package.cpp" />
-    <ClCompile Include="..\src\docx\pptx_slide_context.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\pptx_table_context.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\pptx_text_context.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsxconversioncontext.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_alignment.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_border.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_borders.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_cell_format.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_cell_style.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_cell_styles.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_color.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_comments.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_comments_context.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_complex_number_format.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_conditionalFormatting.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_data_validation.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_defined_names.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_drawing.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_drawings.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_drawing_context.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_dxfs.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_fill.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_fills.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_font.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_fonts.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_hyperlinks.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_merge_cells.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_numFmts.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_num_format_context.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_output_xml.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_package.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_pivots_context.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_protection.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_sharedstrings.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_styles.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_tablecontext.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_table_metrics.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_table_state.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_textcontext.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_utils.cpp" />
-    <ClCompile Include="..\src\docx\xlsx_xf.cpp" />
-    <ClCompile Include="..\src\odf\abstract_xml.cpp" />
-    <ClCompile Include="..\src\odf\anim_elements.cpp" />
-    <ClCompile Include="..\src\odf\calcext_elements.cpp" />
-    <ClCompile Include="..\src\odf\calcs_styles.cpp" />
-    <ClCompile Include="..\src\odf\chart_build_oox.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\createandread.cpp" />
-    <ClCompile Include="..\src\odf\documentcontext.cpp" />
-    <ClCompile Include="..\src\odf\draw_common.cpp" />
-    <ClCompile Include="..\src\odf\draw_frame.cpp" />
-    <ClCompile Include="..\src\odf\draw_frame_docx.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\draw_frame_pptx.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\draw_frame_xlsx.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\draw_page.cpp" />
-    <ClCompile Include="..\src\odf\draw_shapes.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\draw_shapes_docx.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\draw_shapes_pptx.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\draw_shapes_xlsx.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\font_face.cpp" />
-    <ClCompile Include="..\src\odf\header_footer.cpp" />
-    <ClCompile Include="..\src\odf\list.cpp" />
-    <ClCompile Include="..\src\odf\logging.cpp" />
-    <ClCompile Include="..\src\odf\math_elementaries.cpp" />
-    <ClCompile Include="..\src\odf\math_elements.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\math_layout_elements.cpp" />
-    <ClCompile Include="..\src\odf\math_limit_elements.cpp" />
-    <ClCompile Include="..\src\odf\math_table_elements.cpp" />
-    <ClCompile Include="..\src\odf\math_token_elements.cpp" />
-    <ClCompile Include="..\src\odf\note.cpp" />
-    <ClCompile Include="..\src\odf\number_style.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\odfcontext.cpp" />
-    <ClCompile Include="..\src\odf\odf_content_xml.cpp" />
-    <ClCompile Include="..\src\odf\odf_document.cpp" />
-    <ClCompile Include="..\src\odf\odf_document_impl.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\office_annotation.cpp" />
-    <ClCompile Include="..\src\odf\office_binary_data.cpp" />
-    <ClCompile Include="..\src\odf\office_body.cpp" />
-    <ClCompile Include="..\src\odf\office_chart.cpp" />
-    <ClCompile Include="..\src\odf\office_document.cpp" />
-    <ClCompile Include="..\src\odf\office_elements_create.cpp" />
-    <ClCompile Include="..\src\odf\office_event_listeners.cpp" />
-    <ClCompile Include="..\src\odf\office_forms.cpp" />
-    <ClCompile Include="..\src\odf\office_meta.cpp" />
-    <ClCompile Include="..\src\odf\office_presentation.cpp" />
-    <ClCompile Include="..\src\odf\office_scripts.cpp" />
-    <ClCompile Include="..\src\odf\office_settings.cpp" />
-    <ClCompile Include="..\src\odf\office_spreadsheet.cpp" />
-    <ClCompile Include="..\src\odf\office_text.cpp" />
-    <ClCompile Include="..\src\odf\paragraph_elements.cpp" />
-    <ClCompile Include="..\src\odf\ruby.cpp" />
-    <ClCompile Include="..\src\odf\skipelement.cpp" />
-    <ClCompile Include="..\src\odf\styles.cpp" />
-    <ClCompile Include="..\src\odf\styles_list.cpp" />
-    <ClCompile Include="..\src\odf\styles_lite_container.cpp" />
-    <ClCompile Include="..\src\odf\style_chart_properties.cpp" />
-    <ClCompile Include="..\src\odf\style_graphic_properties.cpp" />
-    <ClCompile Include="..\src\odf\style_map.cpp" />
-    <ClCompile Include="..\src\odf\style_paragraph_properties.cpp" />
-    <ClCompile Include="..\src\odf\style_paragraph_properties_docx.cpp" />
-    <ClCompile Include="..\src\odf\style_paragraph_properties_pptx.cpp" />
-    <ClCompile Include="..\src\odf\style_presentation.cpp" />
-    <ClCompile Include="..\src\odf\style_properties.cpp" />
-    <ClCompile Include="..\src\odf\style_regions.cpp" />
-    <ClCompile Include="..\src\odf\style_table_properties.cpp" />
-    <ClCompile Include="..\src\odf\style_text_properties.cpp" />
-    <ClCompile Include="..\src\odf\svg_parser.cpp" />
-    <ClCompile Include="..\src\odf\table.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\table_calculation_settings.cpp" />
-    <ClCompile Include="..\src\odf\table_database_ranges.cpp" />
-    <ClCompile Include="..\src\odf\table_data_pilot_tables.cpp" />
-    <ClCompile Include="..\src\odf\table_docx.cpp" />
-    <ClCompile Include="..\src\odf\table_named_expressions.cpp" />
-    <ClCompile Include="..\src\odf\table_pptx.cpp" />
-    <ClCompile Include="..\src\odf\table_xlsx.cpp" />
-    <ClCompile Include="..\src\odf\templates.cpp" />
-    <ClCompile Include="..\src\odf\text_content.cpp" />
-    <ClCompile Include="..\src\odf\text_elements.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
+    <ClCompile Include="..\..\Common\readdocelement.cpp" />
+    <ClCompile Include="..\..\Common\utils.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\conversionelement.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\docx_content_type.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\docx_conversion_context.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\docx_drawing.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\docx_package.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\docx_table_context.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\headers_footers.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\hyperlinks.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\measuredigits.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\mediaitems.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\namespaces.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\oox_chart_axis.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\oox_chart_context.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\oox_chart_legend.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\oox_chart_series.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\oox_chart_shape.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\oox_conversion_context.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\oox_data_labels.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\oox_drawing.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\oox_drawing_fills.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\oox_layout.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\oox_package.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\oox_plot_area.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\oox_rels.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\oox_title.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\oox_types_chart.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\pptx_comments.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\pptx_comments_context.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\pptx_conversion_context.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\pptx_drawing.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\pptx_drawings.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\pptx_output_xml.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\pptx_package.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\pptx_slide_context.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\pptx_table_context.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\pptx_text_context.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsxconversioncontext.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_alignment.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_border.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_borders.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_cell_format.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_cell_style.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_cell_styles.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_color.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_comments.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_comments_context.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_complex_number_format.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_conditionalFormatting.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_data_validation.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_defined_names.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_drawing.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_drawings.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_drawing_context.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_dxfs.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_fill.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_fills.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_font.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_fonts.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_hyperlinks.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_merge_cells.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_numFmts.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_num_format_context.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_output_xml.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_package.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_pivots_context.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_protection.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_sharedstrings.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_styles.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_tablecontext.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_table_metrics.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_table_state.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_textcontext.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_utils.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\xlsx_xf.cpp" />
+    <ClCompile Include="..\..\Reader\Format\abstract_xml.cpp" />
+    <ClCompile Include="..\..\Reader\Format\anim_elements.cpp" />
+    <ClCompile Include="..\..\Reader\Format\calcext_elements.cpp" />
+    <ClCompile Include="..\..\Reader\Format\calcs_styles.cpp" />
+    <ClCompile Include="..\..\Reader\Format\chart_build_oox.cpp" />
+    <ClCompile Include="..\..\Reader\Format\createandread.cpp" />
+    <ClCompile Include="..\..\Reader\Format\documentcontext.cpp" />
+    <ClCompile Include="..\..\Reader\Format\draw_common.cpp" />
+    <ClCompile Include="..\..\Reader\Format\draw_frame.cpp" />
+    <ClCompile Include="..\..\Reader\Format\draw_frame_docx.cpp" />
+    <ClCompile Include="..\..\Reader\Format\draw_frame_pptx.cpp" />
+    <ClCompile Include="..\..\Reader\Format\draw_frame_xlsx.cpp" />
+    <ClCompile Include="..\..\Reader\Format\draw_page.cpp" />
+    <ClCompile Include="..\..\Reader\Format\draw_page_pptx.cpp" />
+    <ClCompile Include="..\..\Reader\Format\draw_shapes.cpp" />
+    <ClCompile Include="..\..\Reader\Format\draw_shapes_docx.cpp" />
+    <ClCompile Include="..\..\Reader\Format\draw_shapes_pptx.cpp" />
+    <ClCompile Include="..\..\Reader\Format\draw_shapes_xlsx.cpp" />
+    <ClCompile Include="..\..\Reader\Format\font_face.cpp" />
+    <ClCompile Include="..\..\Reader\Format\header_footer.cpp" />
+    <ClCompile Include="..\..\Reader\Format\list.cpp" />
+    <ClCompile Include="..\..\Reader\Format\logging.cpp" />
+    <ClCompile Include="..\..\Reader\Format\math_elementaries.cpp" />
+    <ClCompile Include="..\..\Reader\Format\math_elements.cpp" />
+    <ClCompile Include="..\..\Reader\Format\math_layout_elements.cpp" />
+    <ClCompile Include="..\..\Reader\Format\math_limit_elements.cpp" />
+    <ClCompile Include="..\..\Reader\Format\math_table_elements.cpp" />
+    <ClCompile Include="..\..\Reader\Format\math_token_elements.cpp" />
+    <ClCompile Include="..\..\Reader\Format\note.cpp" />
+    <ClCompile Include="..\..\Reader\Format\number_style.cpp" />
+    <ClCompile Include="..\..\Reader\Format\odfcontext.cpp" />
+    <ClCompile Include="..\..\Reader\Format\odf_content_xml.cpp" />
+    <ClCompile Include="..\..\Reader\Format\odf_document.cpp" />
+    <ClCompile Include="..\..\Reader\Format\odf_document_impl.cpp" />
+    <ClCompile Include="..\..\Reader\Format\office_annotation.cpp" />
+    <ClCompile Include="..\..\Reader\Format\office_binary_data.cpp" />
+    <ClCompile Include="..\..\Reader\Format\office_body.cpp" />
+    <ClCompile Include="..\..\Reader\Format\office_chart.cpp" />
+    <ClCompile Include="..\..\Reader\Format\office_document.cpp" />
+    <ClCompile Include="..\..\Reader\Format\office_elements_create.cpp" />
+    <ClCompile Include="..\..\Reader\Format\office_event_listeners.cpp" />
+    <ClCompile Include="..\..\Reader\Format\office_forms.cpp" />
+    <ClCompile Include="..\..\Reader\Format\office_meta.cpp" />
+    <ClCompile Include="..\..\Reader\Format\office_presentation.cpp" />
+    <ClCompile Include="..\..\Reader\Format\office_scripts.cpp" />
+    <ClCompile Include="..\..\Reader\Format\office_settings.cpp" />
+    <ClCompile Include="..\..\Reader\Format\office_spreadsheet.cpp" />
+    <ClCompile Include="..\..\Reader\Format\office_text.cpp" />
+    <ClCompile Include="..\..\Reader\Format\paragraph_elements.cpp" />
+    <ClCompile Include="..\..\Reader\Format\ruby.cpp" />
+    <ClCompile Include="..\..\Reader\Format\search_table_cell.cpp" />
+    <ClCompile Include="..\..\Reader\Format\skipelement.cpp" />
+    <ClCompile Include="..\..\Reader\Format\styles.cpp" />
+    <ClCompile Include="..\..\Reader\Format\styles_list.cpp" />
+    <ClCompile Include="..\..\Reader\Format\styles_lite_container.cpp" />
+    <ClCompile Include="..\..\Reader\Format\style_chart_properties.cpp" />
+    <ClCompile Include="..\..\Reader\Format\style_graphic_properties.cpp" />
+    <ClCompile Include="..\..\Reader\Format\style_map.cpp" />
+    <ClCompile Include="..\..\Reader\Format\style_paragraph_properties.cpp" />
+    <ClCompile Include="..\..\Reader\Format\style_paragraph_properties_docx.cpp" />
+    <ClCompile Include="..\..\Reader\Format\style_paragraph_properties_pptx.cpp" />
+    <ClCompile Include="..\..\Reader\Format\style_presentation.cpp" />
+    <ClCompile Include="..\..\Reader\Format\style_properties.cpp" />
+    <ClCompile Include="..\..\Reader\Format\style_regions.cpp" />
+    <ClCompile Include="..\..\Reader\Format\style_table_properties.cpp" />
+    <ClCompile Include="..\..\Reader\Format\style_text_properties.cpp" />
+    <ClCompile Include="..\..\Reader\Format\svg_parser.cpp" />
+    <ClCompile Include="..\..\Reader\Format\table.cpp" />
+    <ClCompile Include="..\..\Reader\Format\table_calculation_settings.cpp" />
+    <ClCompile Include="..\..\Reader\Format\table_database_ranges.cpp" />
+    <ClCompile Include="..\..\Reader\Format\table_data_pilot_tables.cpp" />
+    <ClCompile Include="..\..\Reader\Format\table_docx.cpp" />
+    <ClCompile Include="..\..\Reader\Format\table_named_expressions.cpp" />
+    <ClCompile Include="..\..\Reader\Format\table_pptx.cpp" />
+    <ClCompile Include="..\..\Reader\Format\table_xlsx.cpp" />
+    <ClCompile Include="..\..\Reader\Format\templates.cpp" />
+    <ClCompile Include="..\..\Reader\Format\text_content.cpp" />
+    <ClCompile Include="..\..\Reader\Format\text_elements.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\include\cpdoccore\odf\odf_document.h" />
-    <ClInclude Include="..\include\logging.h" />
-    <ClInclude Include="..\include\odf\odf_elements_type.h" />
-    <ClInclude Include="..\src\conversionelement.h" />
-    <ClInclude Include="..\src\ConvertOO2OOX.h" />
-    <ClInclude Include="..\src\docx\docx_content_type.h" />
-    <ClInclude Include="..\src\docx\docx_conversion_context.h" />
-    <ClInclude Include="..\src\docx\docx_drawing.h" />
-    <ClInclude Include="..\src\docx\docx_package.h" />
-    <ClInclude Include="..\src\docx\docx_table_context.h" />
-    <ClInclude Include="..\src\docx\drawing_object_description.h" />
-    <ClInclude Include="..\src\docx\headers_footers.h" />
-    <ClInclude Include="..\src\docx\hyperlinks.h" />
-    <ClInclude Include="..\src\docx\measuredigits.h" />
-    <ClInclude Include="..\src\docx\mediaitems.h" />
-    <ClInclude Include="..\src\docx\namespaces.h" />
-    <ClInclude Include="..\src\docx\ooxtablerowspanned.h" />
-    <ClInclude Include="..\src\docx\oox_chart_context.h" />
-    <ClInclude Include="..\src\docx\oox_chart_legend.h" />
-    <ClInclude Include="..\src\docx\oox_chart_series.h" />
-    <ClInclude Include="..\src\docx\oox_chart_shape.h" />
-    <ClInclude Include="..\src\docx\oox_chart_values.h" />
-    <ClInclude Include="..\src\docx\oox_conversion_context.h" />
-    <ClInclude Include="..\src\docx\oox_data_labels.h" />
-    <ClInclude Include="..\src\docx\oox_drawing.h" />
-    <ClInclude Include="..\src\docx\oox_drawing_fills.h" />
-    <ClInclude Include="..\src\docx\oox_layout.h" />
-    <ClInclude Include="..\src\docx\oox_package.h" />
-    <ClInclude Include="..\src\docx\oox_plot_area.h" />
-    <ClInclude Include="..\src\docx\oox_rels.h" />
-    <ClInclude Include="..\src\docx\oox_title.h" />
-    <ClInclude Include="..\src\docx\oox_types_chart.h" />
-    <ClInclude Include="..\src\docx\pptx_comments.h" />
-    <ClInclude Include="..\src\docx\pptx_comments_context.h" />
-    <ClInclude Include="..\src\docx\pptx_conversion_context.h" />
-    <ClInclude Include="..\src\docx\pptx_default_serializes.h" />
-    <ClInclude Include="..\src\docx\pptx_drawing.h" />
-    <ClInclude Include="..\src\docx\pptx_drawings.h" />
-    <ClInclude Include="..\src\docx\pptx_output_xml.h" />
-    <ClInclude Include="..\src\docx\pptx_package.h" />
-    <ClInclude Include="..\src\docx\pptx_slide_context.h" />
-    <ClInclude Include="..\src\docx\pptx_table_context.h" />
-    <ClInclude Include="..\src\docx\pptx_text_context.h" />
-    <ClInclude Include="..\src\docx\xlsxconversioncontext.h" />
-    <ClInclude Include="..\src\docx\xlsx_alignment.h" />
-    <ClInclude Include="..\src\docx\xlsx_border.h" />
-    <ClInclude Include="..\src\docx\xlsx_borders.h" />
-    <ClInclude Include="..\src\docx\xlsx_cell_format.h" />
-    <ClInclude Include="..\src\docx\xlsx_cell_style.h" />
-    <ClInclude Include="..\src\docx\xlsx_cell_styles.h" />
-    <ClInclude Include="..\src\docx\xlsx_color.h" />
-    <ClInclude Include="..\src\docx\xlsx_comments.h" />
-    <ClInclude Include="..\src\docx\xlsx_comments_context.h" />
-    <ClInclude Include="..\src\docx\xlsx_complex_number_format.h" />
-    <ClInclude Include="..\src\docx\xlsx_conditionalFormatting.h" />
-    <ClInclude Include="..\src\docx\xlsx_data_validation.h" />
-    <ClInclude Include="..\src\docx\xlsx_defined_names.h" />
-    <ClInclude Include="..\src\docx\xlsx_drawing.h" />
-    <ClInclude Include="..\src\docx\xlsx_drawings.h" />
-    <ClInclude Include="..\src\docx\xlsx_drawing_context.h" />
-    <ClInclude Include="..\src\docx\xlsx_dxfs.h" />
-    <ClInclude Include="..\src\docx\xlsx_fill.h" />
-    <ClInclude Include="..\src\docx\xlsx_fills.h" />
-    <ClInclude Include="..\src\docx\xlsx_font.h" />
-    <ClInclude Include="..\src\docx\xlsx_fonts.h" />
-    <ClInclude Include="..\src\docx\xlsx_formula.h" />
-    <ClInclude Include="..\src\docx\xlsx_hyperlinks.h" />
-    <ClInclude Include="..\src\docx\xlsx_merge_cells.h" />
-    <ClInclude Include="..\src\docx\xlsx_numFmts.h" />
-    <ClInclude Include="..\src\docx\xlsx_num_format_context.h" />
-    <ClInclude Include="..\src\docx\xlsx_output_xml.h" />
-    <ClInclude Include="..\src\docx\xlsx_package.h" />
-    <ClInclude Include="..\src\docx\xlsx_pivots_context.h" />
-    <ClInclude Include="..\src\docx\xlsx_protection.h" />
-    <ClInclude Include="..\src\docx\xlsx_row_spanned.h" />
-    <ClInclude Include="..\src\docx\xlsx_sharedstrings.h" />
-    <ClInclude Include="..\src\docx\xlsx_styles.h" />
-    <ClInclude Include="..\src\docx\xlsx_tablecontext.h" />
-    <ClInclude Include="..\src\docx\xlsx_table_metrics.h" />
-    <ClInclude Include="..\src\docx\xlsx_table_position.h" />
-    <ClInclude Include="..\src\docx\xlsx_table_state.h" />
-    <ClInclude Include="..\src\docx\xlsx_textcontext.h" />
-    <ClInclude Include="..\src\docx\xlsx_utils.h" />
-    <ClInclude Include="..\src\docx\xlsx_xf.h" />
-    <ClInclude Include="..\src\odf\abstract_xml.h" />
-    <ClInclude Include="..\src\odf\all_elements.h" />
-    <ClInclude Include="..\src\odf\anim_elements.h" />
-    <ClInclude Include="..\src\odf\calcext_elements.h" />
-    <ClInclude Include="..\src\odf\calcs_styles.h" />
-    <ClInclude Include="..\src\odf\chart_build_oox.h" />
-    <ClInclude Include="..\src\odf\chart_objects.h" />
-    <ClInclude Include="..\src\odf\datatypes\custom_shape_types_convert.h" />
-    <ClInclude Include="..\src\odf\documentcontext.h" />
-    <ClInclude Include="..\src\odf\draw_common.h" />
-    <ClInclude Include="..\src\odf\draw_frame.h" />
-    <ClInclude Include="..\src\odf\draw_page.h" />
-    <ClInclude Include="..\src\odf\draw_shapes.h" />
-    <ClInclude Include="..\src\odf\errors.h" />
-    <ClInclude Include="..\src\odf\font_face.h" />
-    <ClInclude Include="..\src\odf\header_footer.h" />
-    <ClInclude Include="..\src\odf\list.h" />
-    <ClInclude Include="..\src\odf\math_elementaries.h" />
-    <ClInclude Include="..\src\odf\math_elements.h" />
-    <ClInclude Include="..\src\odf\math_layout_elements.h" />
-    <ClInclude Include="..\src\odf\math_limit_elements.h" />
-    <ClInclude Include="..\src\odf\math_table_elements.h" />
-    <ClInclude Include="..\src\odf\math_token_elements.h" />
-    <ClInclude Include="..\src\odf\note.h" />
-    <ClInclude Include="..\src\odf\number_style.h" />
-    <ClInclude Include="..\src\odf\odfattributes.h" />
-    <ClInclude Include="..\src\odf\odfcontext.h" />
-    <ClInclude Include="..\src\odf\odf_content_xml.h" />
-    <ClInclude Include="..\src\odf\odf_document_impl.h" />
-    <ClInclude Include="..\src\odf\office_annotation.h" />
-    <ClInclude Include="..\src\odf\office_binary_data.h" />
-    <ClInclude Include="..\src\odf\office_body.h" />
-    <ClInclude Include="..\src\odf\office_chart.h" />
-    <ClInclude Include="..\src\odf\office_document.h" />
-    <ClInclude Include="..\src\odf\office_elements.h" />
-    <ClInclude Include="..\src\odf\office_elements_create.h" />
-    <ClInclude Include="..\src\odf\office_event_listeners.h" />
-    <ClInclude Include="..\src\odf\office_forms.h" />
-    <ClInclude Include="..\src\odf\office_meta.h" />
-    <ClInclude Include="..\src\odf\office_presentation.h" />
-    <ClInclude Include="..\src\odf\office_scripts.h" />
-    <ClInclude Include="..\src\odf\office_settings.h" />
-    <ClInclude Include="..\src\odf\office_spreadsheet.h" />
-    <ClInclude Include="..\src\odf\office_text.h" />
-    <ClInclude Include="..\src\odf\paragraph_elements.h" />
-    <ClInclude Include="..\src\odf\search_table_cell.h" />
-    <ClInclude Include="..\src\odf\serialize_elements.h" />
-    <ClInclude Include="..\src\odf\skipelement.h" />
-    <ClInclude Include="..\src\odf\styles.h" />
-    <ClInclude Include="..\src\odf\styles_list.h" />
-    <ClInclude Include="..\src\odf\styles_lite_container.h" />
-    <ClInclude Include="..\src\odf\style_chart_properties.h" />
-    <ClInclude Include="..\src\odf\style_graphic_properties.h" />
-    <ClInclude Include="..\src\odf\style_map.h" />
-    <ClInclude Include="..\src\odf\style_paragraph_properties.h" />
-    <ClInclude Include="..\src\odf\style_presentation.h" />
-    <ClInclude Include="..\src\odf\style_properties.h" />
-    <ClInclude Include="..\src\odf\style_ref.h" />
-    <ClInclude Include="..\src\odf\style_regions.h" />
-    <ClInclude Include="..\src\odf\style_table_properties.h" />
-    <ClInclude Include="..\src\odf\style_text_properties.h" />
-    <ClInclude Include="..\src\odf\svg_parser.h" />
-    <ClInclude Include="..\src\odf\table.h" />
-    <ClInclude Include="..\src\odf\table_calculation_settings.h" />
-    <ClInclude Include="..\src\odf\table_database_ranges.h" />
-    <ClInclude Include="..\src\odf\table_data_pilot_tables.h" />
-    <ClInclude Include="..\src\odf\table_named_expressions.h" />
-    <ClInclude Include="..\src\odf\templates.h" />
-    <ClInclude Include="..\src\odf\text_content.h" />
-    <ClInclude Include="..\src\odf\text_elements.h" />
-    <ClInclude Include="..\src\odf\visitor.h" />
+    <ClInclude Include="..\..\Common\logging.h" />
+    <ClInclude Include="..\..\Common\odfformat.h" />
+    <ClInclude Include="..\..\Common\odf_document.h" />
+    <ClInclude Include="..\..\Common\odf_elements_type.h" />
+    <ClInclude Include="..\..\Common\readdocelement.h" />
+    <ClInclude Include="..\..\Common\readstring.h" />
+    <ClInclude Include="..\..\Common\utils.h" />
+    <ClInclude Include="..\..\Common\writedocelement.h" />
+    <ClInclude Include="..\..\Reader\Converter\conversionelement.h" />
+    <ClInclude Include="..\..\Reader\Converter\docx_content_type.h" />
+    <ClInclude Include="..\..\Reader\Converter\docx_conversion_context.h" />
+    <ClInclude Include="..\..\Reader\Converter\docx_drawing.h" />
+    <ClInclude Include="..\..\Reader\Converter\docx_package.h" />
+    <ClInclude Include="..\..\Reader\Converter\docx_table_context.h" />
+    <ClInclude Include="..\..\Reader\Converter\drawing_object_description.h" />
+    <ClInclude Include="..\..\Reader\Converter\headers_footers.h" />
+    <ClInclude Include="..\..\Reader\Converter\hyperlinks.h" />
+    <ClInclude Include="..\..\Reader\Converter\measuredigits.h" />
+    <ClInclude Include="..\..\Reader\Converter\mediaitems.h" />
+    <ClInclude Include="..\..\Reader\Converter\namespaces.h" />
+    <ClInclude Include="..\..\Reader\Converter\ooxtablerowspanned.h" />
+    <ClInclude Include="..\..\Reader\Converter\oox_chart_axis.h" />
+    <ClInclude Include="..\..\Reader\Converter\oox_chart_context.h" />
+    <ClInclude Include="..\..\Reader\Converter\oox_chart_legend.h" />
+    <ClInclude Include="..\..\Reader\Converter\oox_chart_series.h" />
+    <ClInclude Include="..\..\Reader\Converter\oox_chart_shape.h" />
+    <ClInclude Include="..\..\Reader\Converter\oox_chart_values.h" />
+    <ClInclude Include="..\..\Reader\Converter\oox_conversion_context.h" />
+    <ClInclude Include="..\..\Reader\Converter\oox_data_labels.h" />
+    <ClInclude Include="..\..\Reader\Converter\oox_drawing.h" />
+    <ClInclude Include="..\..\Reader\Converter\oox_drawing_fills.h" />
+    <ClInclude Include="..\..\Reader\Converter\oox_layout.h" />
+    <ClInclude Include="..\..\Reader\Converter\oox_package.h" />
+    <ClInclude Include="..\..\Reader\Converter\oox_plot_area.h" />
+    <ClInclude Include="..\..\Reader\Converter\oox_rels.h" />
+    <ClInclude Include="..\..\Reader\Converter\oox_title.h" />
+    <ClInclude Include="..\..\Reader\Converter\oox_types_chart.h" />
+    <ClInclude Include="..\..\Reader\Converter\pptx_comments.h" />
+    <ClInclude Include="..\..\Reader\Converter\pptx_comments_context.h" />
+    <ClInclude Include="..\..\Reader\Converter\pptx_conversion_context.h" />
+    <ClInclude Include="..\..\Reader\Converter\pptx_default_serializes.h" />
+    <ClInclude Include="..\..\Reader\Converter\pptx_drawing.h" />
+    <ClInclude Include="..\..\Reader\Converter\pptx_drawings.h" />
+    <ClInclude Include="..\..\Reader\Converter\pptx_output_xml.h" />
+    <ClInclude Include="..\..\Reader\Converter\pptx_package.h" />
+    <ClInclude Include="..\..\Reader\Converter\pptx_slide_context.h" />
+    <ClInclude Include="..\..\Reader\Converter\pptx_table_context.h" />
+    <ClInclude Include="..\..\Reader\Converter\pptx_text_context.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsxconversioncontext.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_alignment.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_border.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_borders.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_cell_format.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_cell_style.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_cell_styles.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_color.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_comments.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_comments_context.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_complex_number_format.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_conditionalFormatting.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_data_validation.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_defined_names.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_drawing.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_drawings.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_drawing_context.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_dxfs.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_fill.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_fills.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_font.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_fonts.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_formula.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_hyperlinks.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_merge_cells.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_numFmts.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_num_format_context.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_output_xml.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_package.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_pivots_context.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_protection.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_row_spanned.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_sharedstrings.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_styles.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_tablecontext.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_table_metrics.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_table_position.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_table_state.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_textcontext.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_utils.h" />
+    <ClInclude Include="..\..\Reader\Converter\xlsx_xf.h" />
+    <ClInclude Include="..\..\Reader\Format\abstract_xml.h" />
+    <ClInclude Include="..\..\Reader\Format\all_elements.h" />
+    <ClInclude Include="..\..\Reader\Format\anim_elements.h" />
+    <ClInclude Include="..\..\Reader\Format\calcext_elements.h" />
+    <ClInclude Include="..\..\Reader\Format\calcs_styles.h" />
+    <ClInclude Include="..\..\Reader\Format\chart_build_oox.h" />
+    <ClInclude Include="..\..\Reader\Format\chart_objects.h" />
+    <ClInclude Include="..\..\Reader\Format\documentcontext.h" />
+    <ClInclude Include="..\..\Reader\Format\draw_common.h" />
+    <ClInclude Include="..\..\Reader\Format\draw_frame.h" />
+    <ClInclude Include="..\..\Reader\Format\draw_page.h" />
+    <ClInclude Include="..\..\Reader\Format\draw_shapes.h" />
+    <ClInclude Include="..\..\Reader\Format\font_face.h" />
+    <ClInclude Include="..\..\Reader\Format\header_footer.h" />
+    <ClInclude Include="..\..\Reader\Format\list.h" />
+    <ClInclude Include="..\..\Reader\Format\math_elementaries.h" />
+    <ClInclude Include="..\..\Reader\Format\math_elements.h" />
+    <ClInclude Include="..\..\Reader\Format\math_layout_elements.h" />
+    <ClInclude Include="..\..\Reader\Format\math_limit_elements.h" />
+    <ClInclude Include="..\..\Reader\Format\math_table_elements.h" />
+    <ClInclude Include="..\..\Reader\Format\math_token_elements.h" />
+    <ClInclude Include="..\..\Reader\Format\note.h" />
+    <ClInclude Include="..\..\Reader\Format\number_style.h" />
+    <ClInclude Include="..\..\Reader\Format\odfcontext.h" />
+    <ClInclude Include="..\..\Reader\Format\odf_content_xml.h" />
+    <ClInclude Include="..\..\Reader\Format\odf_document_impl.h" />
+    <ClInclude Include="..\..\Reader\Format\office_annotation.h" />
+    <ClInclude Include="..\..\Reader\Format\office_binary_data.h" />
+    <ClInclude Include="..\..\Reader\Format\office_body.h" />
+    <ClInclude Include="..\..\Reader\Format\office_chart.h" />
+    <ClInclude Include="..\..\Reader\Format\office_document.h" />
+    <ClInclude Include="..\..\Reader\Format\office_elements.h" />
+    <ClInclude Include="..\..\Reader\Format\office_elements_create.h" />
+    <ClInclude Include="..\..\Reader\Format\office_event_listeners.h" />
+    <ClInclude Include="..\..\Reader\Format\office_forms.h" />
+    <ClInclude Include="..\..\Reader\Format\office_meta.h" />
+    <ClInclude Include="..\..\Reader\Format\office_presentation.h" />
+    <ClInclude Include="..\..\Reader\Format\office_scripts.h" />
+    <ClInclude Include="..\..\Reader\Format\office_settings.h" />
+    <ClInclude Include="..\..\Reader\Format\office_spreadsheet.h" />
+    <ClInclude Include="..\..\Reader\Format\office_text.h" />
+    <ClInclude Include="..\..\Reader\Format\paragraph_elements.h" />
+    <ClInclude Include="..\..\Reader\Format\ruby.h" />
+    <ClInclude Include="..\..\Reader\Format\search_table_cell.h" />
+    <ClInclude Include="..\..\Reader\Format\serialize_elements.h" />
+    <ClInclude Include="..\..\Reader\Format\skipelement.h" />
+    <ClInclude Include="..\..\Reader\Format\styles.h" />
+    <ClInclude Include="..\..\Reader\Format\styles_list.h" />
+    <ClInclude Include="..\..\Reader\Format\styles_lite_container.h" />
+    <ClInclude Include="..\..\Reader\Format\style_chart_properties.h" />
+    <ClInclude Include="..\..\Reader\Format\style_graphic_properties.h" />
+    <ClInclude Include="..\..\Reader\Format\style_map.h" />
+    <ClInclude Include="..\..\Reader\Format\style_paragraph_properties.h" />
+    <ClInclude Include="..\..\Reader\Format\style_presentation.h" />
+    <ClInclude Include="..\..\Reader\Format\style_properties.h" />
+    <ClInclude Include="..\..\Reader\Format\style_regions.h" />
+    <ClInclude Include="..\..\Reader\Format\style_table_properties.h" />
+    <ClInclude Include="..\..\Reader\Format\style_text_properties.h" />
+    <ClInclude Include="..\..\Reader\Format\svg_parser.h" />
+    <ClInclude Include="..\..\Reader\Format\table.h" />
+    <ClInclude Include="..\..\Reader\Format\table_calculation_settings.h" />
+    <ClInclude Include="..\..\Reader\Format\table_database_ranges.h" />
+    <ClInclude Include="..\..\Reader\Format\table_data_pilot_tables.h" />
+    <ClInclude Include="..\..\Reader\Format\table_named_expressions.h" />
+    <ClInclude Include="..\..\Reader\Format\templates.h" />
+    <ClInclude Include="..\..\Reader\Format\text_content.h" />
+    <ClInclude Include="..\..\Reader\Format\text_elements.h" />
+    <ClInclude Include="..\..\Reader\Format\visitor.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="cpcommon.vcxproj">
diff --git a/OdfFile/Projects/Windows/cpodf.vcxproj.filters b/OdfFile/Projects/Windows/cpodf.vcxproj.filters
index 07ee3258e7..95d9b00d8e 100644
--- a/OdfFile/Projects/Windows/cpodf.vcxproj.filters
+++ b/OdfFile/Projects/Windows/cpodf.vcxproj.filters
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="utility">
-      <UniqueIdentifier>{ecbc1bb6-05af-4043-8b7f-731cde436676}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="style">
-      <UniqueIdentifier>{d2b29d16-77b4-4633-bb04-8098ca248b97}</UniqueIdentifier>
-    </Filter>
     <Filter Include="oox">
       <UniqueIdentifier>{e8d90800-7021-4032-8d17-274da4aa8e51}</UniqueIdentifier>
     </Filter>
@@ -31,923 +25,945 @@
     <Filter Include="elements">
       <UniqueIdentifier>{67b2bf43-5673-4a6f-82cb-fe4be01aee5f}</UniqueIdentifier>
     </Filter>
+    <Filter Include="common">
+      <UniqueIdentifier>{ecbc1bb6-05af-4043-8b7f-731cde436676}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\odf\abstract_xml.cpp">
-      <Filter>utility</Filter>
+    <ClCompile Include="..\..\Reader\Format\abstract_xml.cpp">
+      <Filter>elements</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\createandread.cpp">
-      <Filter>utility</Filter>
+    <ClCompile Include="..\..\Reader\Format\anim_elements.cpp">
+      <Filter>elements</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\logging.cpp">
-      <Filter>utility</Filter>
+    <ClCompile Include="..\..\Reader\Format\calcext_elements.cpp">
+      <Filter>elements</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\office_elements_create.cpp">
-      <Filter>utility</Filter>
+    <ClCompile Include="..\..\Reader\Format\calcs_styles.cpp">
+      <Filter>elements</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\svg_parser.cpp">
-      <Filter>utility</Filter>
+    <ClCompile Include="..\..\Reader\Format\chart_build_oox.cpp">
+      <Filter>elements</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\calcs_styles.cpp">
-      <Filter>style</Filter>
+    <ClCompile Include="..\..\Reader\Format\createandread.cpp">
+      <Filter>elements</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\header_footer.cpp">
-      <Filter>style</Filter>
+    <ClCompile Include="..\..\Reader\Format\documentcontext.cpp">
+      <Filter>elements</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\number_style.cpp">
-      <Filter>style</Filter>
+    <ClCompile Include="..\..\Reader\Format\draw_common.cpp">
+      <Filter>elements</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\style_chart_properties.cpp">
-      <Filter>style</Filter>
+    <ClCompile Include="..\..\Reader\Format\draw_frame.cpp">
+      <Filter>elements</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\style_graphic_properties.cpp">
-      <Filter>style</Filter>
+    <ClCompile Include="..\..\Reader\Format\draw_frame_docx.cpp">
+      <Filter>elements</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\style_map.cpp">
-      <Filter>style</Filter>
+    <ClCompile Include="..\..\Reader\Format\draw_frame_pptx.cpp">
+      <Filter>elements</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\style_paragraph_properties.cpp">
-      <Filter>style</Filter>
+    <ClCompile Include="..\..\Reader\Format\draw_frame_xlsx.cpp">
+      <Filter>elements</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\style_paragraph_properties_docx.cpp">
-      <Filter>style</Filter>
+    <ClCompile Include="..\..\Reader\Format\draw_page.cpp">
+      <Filter>elements</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\style_paragraph_properties_pptx.cpp">
-      <Filter>style</Filter>
+    <ClCompile Include="..\..\Reader\Format\draw_page_pptx.cpp">
+      <Filter>elements</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\style_presentation.cpp">
-      <Filter>style</Filter>
+    <ClCompile Include="..\..\Reader\Format\draw_shapes.cpp">
+      <Filter>elements</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\style_regions.cpp">
-      <Filter>style</Filter>
+    <ClCompile Include="..\..\Reader\Format\draw_shapes_docx.cpp">
+      <Filter>elements</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\style_table_properties.cpp">
-      <Filter>style</Filter>
+    <ClCompile Include="..\..\Reader\Format\draw_shapes_pptx.cpp">
+      <Filter>elements</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\style_text_properties.cpp">
-      <Filter>style</Filter>
+    <ClCompile Include="..\..\Reader\Format\draw_shapes_xlsx.cpp">
+      <Filter>elements</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\styles.cpp">
-      <Filter>style</Filter>
+    <ClCompile Include="..\..\Reader\Format\font_face.cpp">
+      <Filter>elements</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\styles_list.cpp">
-      <Filter>style</Filter>
+    <ClCompile Include="..\..\Reader\Format\header_footer.cpp">
+      <Filter>elements</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\styles_lite_container.cpp">
-      <Filter>style</Filter>
+    <ClCompile Include="..\..\Reader\Format\list.cpp">
+      <Filter>elements</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\templates.cpp">
-      <Filter>style</Filter>
+    <ClCompile Include="..\..\Reader\Format\logging.cpp">
+      <Filter>elements</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\docx_content_type.cpp">
+    <ClCompile Include="..\..\Reader\Format\math_elementaries.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\math_elements.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\math_layout_elements.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\math_limit_elements.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\math_table_elements.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\math_token_elements.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\note.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\number_style.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\odf_content_xml.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\odf_document.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\odf_document_impl.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\odfcontext.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\office_annotation.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\office_binary_data.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\office_body.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\office_chart.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\office_document.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\office_elements_create.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\office_event_listeners.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\office_forms.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\office_meta.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\office_presentation.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\office_scripts.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\office_settings.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\office_spreadsheet.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\office_text.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\paragraph_elements.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\ruby.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\search_table_cell.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\skipelement.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\style_chart_properties.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\style_graphic_properties.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\style_map.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\style_paragraph_properties.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\style_paragraph_properties_docx.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\style_paragraph_properties_pptx.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\style_presentation.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\style_properties.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\style_regions.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\style_table_properties.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\style_text_properties.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\styles.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\styles_list.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\styles_lite_container.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\svg_parser.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\table.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\table_calculation_settings.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\table_data_pilot_tables.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\table_database_ranges.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\table_docx.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\table_named_expressions.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\table_pptx.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\table_xlsx.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\templates.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\text_content.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Format\text_elements.cpp">
+      <Filter>elements</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Common\readdocelement.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Common\utils.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Converter\docx_content_type.cpp">
       <Filter>oox\docx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\docx_conversion_context.cpp">
+    <ClCompile Include="..\..\Reader\Converter\docx_conversion_context.cpp">
       <Filter>oox\docx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\docx_drawing.cpp">
+    <ClCompile Include="..\..\Reader\Converter\docx_drawing.cpp">
       <Filter>oox\docx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\docx_package.cpp">
+    <ClCompile Include="..\..\Reader\Converter\docx_package.cpp">
       <Filter>oox\docx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\docx_table_context.cpp">
+    <ClCompile Include="..\..\Reader\Converter\docx_table_context.cpp">
       <Filter>oox\docx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\headers_footers.cpp">
+    <ClCompile Include="..\..\Reader\Converter\headers_footers.cpp">
       <Filter>oox\docx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\hyperlinks.cpp">
+    <ClCompile Include="..\..\Reader\Converter\hyperlinks.cpp">
       <Filter>oox\docx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\namespaces.cpp">
+    <ClCompile Include="..\..\Reader\Converter\namespaces.cpp">
       <Filter>oox\docx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_cell_format.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_cell_style.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_cell_styles.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_comments.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_comments_context.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_complex_number_format.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_conditionalFormatting.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_data_validation.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_defined_names.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_drawing.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_drawing_context.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_drawings.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_hyperlinks.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_merge_cells.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_num_format_context.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_output_xml.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_package.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_pivots_context.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_sharedstrings.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_styles.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_table_metrics.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_table_state.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_tablecontext.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_textcontext.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_utils.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsxconversioncontext.cpp">
-      <Filter>oox\xlsx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_alignment.cpp">
-      <Filter>oox\xlsx\styles</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_border.cpp">
-      <Filter>oox\xlsx\styles</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_borders.cpp">
-      <Filter>oox\xlsx\styles</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_color.cpp">
-      <Filter>oox\xlsx\styles</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_dxfs.cpp">
-      <Filter>oox\xlsx\styles</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_fill.cpp">
-      <Filter>oox\xlsx\styles</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_fills.cpp">
-      <Filter>oox\xlsx\styles</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_font.cpp">
-      <Filter>oox\xlsx\styles</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_fonts.cpp">
-      <Filter>oox\xlsx\styles</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_numFmts.cpp">
-      <Filter>oox\xlsx\styles</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_protection.cpp">
-      <Filter>oox\xlsx\styles</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\xlsx_xf.cpp">
-      <Filter>oox\xlsx\styles</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\conversionelement.cpp">
+    <ClCompile Include="..\..\Reader\Converter\conversionelement.cpp">
       <Filter>oox\oox</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\measuredigits.cpp">
+    <ClCompile Include="..\..\Reader\Converter\measuredigits.cpp">
       <Filter>oox\oox</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\mediaitems.cpp">
+    <ClCompile Include="..\..\Reader\Converter\mediaitems.cpp">
       <Filter>oox\oox</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\oox_conversion_context.cpp">
+    <ClCompile Include="..\..\Reader\Converter\oox_conversion_context.cpp">
       <Filter>oox\oox</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\oox_drawing.cpp">
+    <ClCompile Include="..\..\Reader\Converter\oox_drawing.cpp">
       <Filter>oox\oox</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\oox_drawing_fills.cpp">
+    <ClCompile Include="..\..\Reader\Converter\oox_drawing_fills.cpp">
       <Filter>oox\oox</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\oox_package.cpp">
+    <ClCompile Include="..\..\Reader\Converter\oox_layout.cpp">
       <Filter>oox\oox</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\oox_rels.cpp">
+    <ClCompile Include="..\..\Reader\Converter\oox_package.cpp">
       <Filter>oox\oox</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\oox_chart_axis.cpp">
+    <ClCompile Include="..\..\Reader\Converter\oox_rels.cpp">
+      <Filter>oox\oox</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Converter\oox_chart_axis.cpp">
       <Filter>oox\oox\chart</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\oox_chart_context.cpp">
+    <ClCompile Include="..\..\Reader\Converter\oox_chart_context.cpp">
       <Filter>oox\oox\chart</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\oox_chart_legend.cpp">
+    <ClCompile Include="..\..\Reader\Converter\oox_chart_legend.cpp">
       <Filter>oox\oox\chart</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\oox_chart_series.cpp">
+    <ClCompile Include="..\..\Reader\Converter\oox_chart_series.cpp">
       <Filter>oox\oox\chart</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\oox_chart_shape.cpp">
+    <ClCompile Include="..\..\Reader\Converter\oox_chart_shape.cpp">
       <Filter>oox\oox\chart</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\oox_data_labels.cpp">
+    <ClCompile Include="..\..\Reader\Converter\oox_plot_area.cpp">
       <Filter>oox\oox\chart</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\oox_layout.cpp">
+    <ClCompile Include="..\..\Reader\Converter\oox_types_chart.cpp">
       <Filter>oox\oox\chart</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\oox_plot_area.cpp">
+    <ClCompile Include="..\..\Reader\Converter\oox_data_labels.cpp">
       <Filter>oox\oox\chart</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\oox_title.cpp">
+    <ClCompile Include="..\..\Reader\Converter\oox_title.cpp">
       <Filter>oox\oox\chart</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\oox_types_chart.cpp">
-      <Filter>oox\oox\chart</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\docx\pptx_comments.cpp">
+    <ClCompile Include="..\..\Reader\Converter\pptx_comments.cpp">
       <Filter>oox\pptx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\pptx_comments_context.cpp">
+    <ClCompile Include="..\..\Reader\Converter\pptx_comments_context.cpp">
       <Filter>oox\pptx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\pptx_conversion_context.cpp">
+    <ClCompile Include="..\..\Reader\Converter\pptx_conversion_context.cpp">
       <Filter>oox\pptx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\pptx_drawing.cpp">
+    <ClCompile Include="..\..\Reader\Converter\pptx_drawing.cpp">
       <Filter>oox\pptx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\pptx_drawings.cpp">
+    <ClCompile Include="..\..\Reader\Converter\pptx_drawings.cpp">
       <Filter>oox\pptx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\pptx_output_xml.cpp">
+    <ClCompile Include="..\..\Reader\Converter\pptx_output_xml.cpp">
       <Filter>oox\pptx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\pptx_package.cpp">
+    <ClCompile Include="..\..\Reader\Converter\pptx_package.cpp">
       <Filter>oox\pptx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\pptx_slide_context.cpp">
+    <ClCompile Include="..\..\Reader\Converter\pptx_slide_context.cpp">
       <Filter>oox\pptx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\pptx_table_context.cpp">
+    <ClCompile Include="..\..\Reader\Converter\pptx_table_context.cpp">
       <Filter>oox\pptx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\docx\pptx_text_context.cpp">
+    <ClCompile Include="..\..\Reader\Converter\pptx_text_context.cpp">
       <Filter>oox\pptx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\anim_elements.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_alignment.cpp">
+      <Filter>oox\xlsx\styles</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\calcext_elements.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_border.cpp">
+      <Filter>oox\xlsx\styles</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\chart_build_oox.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_borders.cpp">
+      <Filter>oox\xlsx\styles</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\documentcontext.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_cell_format.cpp">
+      <Filter>oox\xlsx\styles</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\draw_common.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_cell_style.cpp">
+      <Filter>oox\xlsx\styles</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\draw_frame.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_cell_styles.cpp">
+      <Filter>oox\xlsx\styles</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\draw_frame_docx.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_color.cpp">
+      <Filter>oox\xlsx\styles</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\draw_frame_pptx.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_dxfs.cpp">
+      <Filter>oox\xlsx\styles</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\draw_frame_xlsx.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_fill.cpp">
+      <Filter>oox\xlsx\styles</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\draw_page.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_fills.cpp">
+      <Filter>oox\xlsx\styles</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\draw_shapes.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_font.cpp">
+      <Filter>oox\xlsx\styles</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\draw_shapes_docx.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_fonts.cpp">
+      <Filter>oox\xlsx\styles</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\draw_shapes_pptx.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_comments.cpp">
+      <Filter>oox\xlsx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\draw_shapes_xlsx.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_comments_context.cpp">
+      <Filter>oox\xlsx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\font_face.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_complex_number_format.cpp">
+      <Filter>oox\xlsx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\list.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_conditionalFormatting.cpp">
+      <Filter>oox\xlsx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\math_elementaries.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_data_validation.cpp">
+      <Filter>oox\xlsx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\math_elements.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_defined_names.cpp">
+      <Filter>oox\xlsx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\math_layout_elements.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_drawing.cpp">
+      <Filter>oox\xlsx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\math_limit_elements.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_drawing_context.cpp">
+      <Filter>oox\xlsx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\math_table_elements.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_drawings.cpp">
+      <Filter>oox\xlsx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\math_token_elements.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_hyperlinks.cpp">
+      <Filter>oox\xlsx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\note.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_merge_cells.cpp">
+      <Filter>oox\xlsx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\odf_content_xml.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_num_format_context.cpp">
+      <Filter>oox\xlsx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\odf_document.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_output_xml.cpp">
+      <Filter>oox\xlsx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\odf_document_impl.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_package.cpp">
+      <Filter>oox\xlsx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\odfcontext.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_pivots_context.cpp">
+      <Filter>oox\xlsx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\office_annotation.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_protection.cpp">
+      <Filter>oox\xlsx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\office_binary_data.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_sharedstrings.cpp">
+      <Filter>oox\xlsx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\office_body.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_styles.cpp">
+      <Filter>oox\xlsx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\office_chart.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_table_metrics.cpp">
+      <Filter>oox\xlsx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\office_document.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_table_state.cpp">
+      <Filter>oox\xlsx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\office_event_listeners.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_tablecontext.cpp">
+      <Filter>oox\xlsx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\office_forms.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_textcontext.cpp">
+      <Filter>oox\xlsx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\office_meta.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_utils.cpp">
+      <Filter>oox\xlsx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\office_presentation.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsxconversioncontext.cpp">
+      <Filter>oox\xlsx</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\office_scripts.cpp">
-      <Filter>elements</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_xf.cpp">
+      <Filter>oox\xlsx\styles</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\odf\office_settings.cpp">
-      <Filter>elements</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\office_spreadsheet.cpp">
-      <Filter>elements</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\office_text.cpp">
-      <Filter>elements</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\paragraph_elements.cpp">
-      <Filter>elements</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\ruby.cpp">
-      <Filter>elements</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\skipelement.cpp">
-      <Filter>elements</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\table.cpp">
-      <Filter>elements</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\table_calculation_settings.cpp">
-      <Filter>elements</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\table_data_pilot_tables.cpp">
-      <Filter>elements</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\table_database_ranges.cpp">
-      <Filter>elements</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\table_docx.cpp">
-      <Filter>elements</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\table_named_expressions.cpp">
-      <Filter>elements</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\table_pptx.cpp">
-      <Filter>elements</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\table_xlsx.cpp">
-      <Filter>elements</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\text_content.cpp">
-      <Filter>elements</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\odf\text_elements.cpp">
-      <Filter>elements</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\ConvertOO2OOX.cpp" />
-    <ClCompile Include="..\src\odf\style_properties.cpp">
-      <Filter>style</Filter>
+    <ClCompile Include="..\..\Reader\Converter\xlsx_numFmts.cpp">
+      <Filter>oox\xlsx\styles</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\src\odf\abstract_xml.h">
-      <Filter>utility</Filter>
+    <ClInclude Include="..\..\Reader\Format\abstract_xml.h">
+      <Filter>elements</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\errors.h">
-      <Filter>utility</Filter>
+    <ClInclude Include="..\..\Reader\Format\all_elements.h">
+      <Filter>elements</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\logging.h">
-      <Filter>utility</Filter>
+    <ClInclude Include="..\..\Reader\Format\anim_elements.h">
+      <Filter>elements</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\odfattributes.h">
-      <Filter>utility</Filter>
+    <ClInclude Include="..\..\Reader\Format\calcext_elements.h">
+      <Filter>elements</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\office_elements_create.h">
-      <Filter>utility</Filter>
+    <ClInclude Include="..\..\Reader\Format\calcs_styles.h">
+      <Filter>elements</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\serialize_elements.h">
-      <Filter>utility</Filter>
+    <ClInclude Include="..\..\Reader\Format\chart_build_oox.h">
+      <Filter>elements</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\svg_parser.h">
-      <Filter>utility</Filter>
+    <ClInclude Include="..\..\Reader\Format\chart_objects.h">
+      <Filter>elements</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\calcs_styles.h">
-      <Filter>style</Filter>
+    <ClInclude Include="..\..\Reader\Format\documentcontext.h">
+      <Filter>elements</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\header_footer.h">
-      <Filter>style</Filter>
+    <ClInclude Include="..\..\Reader\Format\draw_common.h">
+      <Filter>elements</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\number_style.h">
-      <Filter>style</Filter>
+    <ClInclude Include="..\..\Reader\Format\draw_frame.h">
+      <Filter>elements</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\style_chart_properties.h">
-      <Filter>style</Filter>
+    <ClInclude Include="..\..\Reader\Format\draw_page.h">
+      <Filter>elements</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\style_graphic_properties.h">
-      <Filter>style</Filter>
+    <ClInclude Include="..\..\Reader\Format\draw_shapes.h">
+      <Filter>elements</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\style_map.h">
-      <Filter>style</Filter>
+    <ClInclude Include="..\..\Reader\Format\font_face.h">
+      <Filter>elements</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\style_paragraph_properties.h">
-      <Filter>style</Filter>
+    <ClInclude Include="..\..\Reader\Format\header_footer.h">
+      <Filter>elements</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\style_presentation.h">
-      <Filter>style</Filter>
+    <ClInclude Include="..\..\Reader\Format\list.h">
+      <Filter>elements</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\style_ref.h">
-      <Filter>style</Filter>
+    <ClInclude Include="..\..\Reader\Format\math_elementaries.h">
+      <Filter>elements</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\style_regions.h">
-      <Filter>style</Filter>
+    <ClInclude Include="..\..\Reader\Format\math_elements.h">
+      <Filter>elements</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\style_table_properties.h">
-      <Filter>style</Filter>
+    <ClInclude Include="..\..\Reader\Format\math_layout_elements.h">
+      <Filter>elements</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\style_text_properties.h">
-      <Filter>style</Filter>
+    <ClInclude Include="..\..\Reader\Format\math_limit_elements.h">
+      <Filter>elements</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\styles.h">
-      <Filter>style</Filter>
+    <ClInclude Include="..\..\Reader\Format\math_table_elements.h">
+      <Filter>elements</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\styles_list.h">
-      <Filter>style</Filter>
+    <ClInclude Include="..\..\Reader\Format\math_token_elements.h">
+      <Filter>elements</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\styles_lite_container.h">
-      <Filter>style</Filter>
+    <ClInclude Include="..\..\Reader\Format\note.h">
+      <Filter>elements</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\templates.h">
-      <Filter>style</Filter>
+    <ClInclude Include="..\..\Reader\Format\number_style.h">
+      <Filter>elements</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\docx_content_type.h">
+    <ClInclude Include="..\..\Reader\Format\odf_content_xml.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\odf_document_impl.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\odfcontext.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\office_annotation.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\office_binary_data.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\office_body.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\office_chart.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\office_document.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\office_elements.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\office_elements_create.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\office_event_listeners.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\office_forms.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\office_meta.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\office_presentation.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\office_scripts.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\office_settings.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\office_spreadsheet.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\office_text.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\paragraph_elements.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\ruby.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\search_table_cell.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\serialize_elements.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\skipelement.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\style_chart_properties.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\style_graphic_properties.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\style_map.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\style_paragraph_properties.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\style_presentation.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\style_properties.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\style_regions.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\style_table_properties.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\style_text_properties.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\styles.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\styles_list.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\styles_lite_container.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\svg_parser.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\table.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\table_calculation_settings.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\table_data_pilot_tables.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\table_database_ranges.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\table_named_expressions.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\templates.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\text_content.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\text_elements.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Format\visitor.h">
+      <Filter>elements</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Common\logging.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Common\odf_document.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Common\odf_elements_type.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Common\odfformat.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Common\readdocelement.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Common\readstring.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Common\utils.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Common\writedocelement.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Converter\docx_content_type.h">
       <Filter>oox\docx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\docx_conversion_context.h">
+    <ClInclude Include="..\..\Reader\Converter\docx_conversion_context.h">
       <Filter>oox\docx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\docx_drawing.h">
+    <ClInclude Include="..\..\Reader\Converter\docx_drawing.h">
       <Filter>oox\docx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\docx_package.h">
+    <ClInclude Include="..\..\Reader\Converter\docx_package.h">
       <Filter>oox\docx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\docx_table_context.h">
+    <ClInclude Include="..\..\Reader\Converter\docx_table_context.h">
       <Filter>oox\docx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\headers_footers.h">
+    <ClInclude Include="..\..\Reader\Converter\headers_footers.h">
       <Filter>oox\docx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\hyperlinks.h">
+    <ClInclude Include="..\..\Reader\Converter\hyperlinks.h">
       <Filter>oox\docx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\namespaces.h">
+    <ClInclude Include="..\..\Reader\Converter\namespaces.h">
       <Filter>oox\docx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_cell_format.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_cell_style.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_cell_styles.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_comments.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_comments_context.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_complex_number_format.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_conditionalFormatting.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_data_validation.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_defined_names.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_drawing.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_drawing_context.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_drawings.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_formula.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_hyperlinks.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_merge_cells.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_num_format_context.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_output_xml.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_package.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_pivots_context.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_row_spanned.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_sharedstrings.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_styles.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_table_metrics.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_table_position.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_table_state.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_tablecontext.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_textcontext.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_utils.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsxconversioncontext.h">
-      <Filter>oox\xlsx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_alignment.h">
-      <Filter>oox\xlsx\styles</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_border.h">
-      <Filter>oox\xlsx\styles</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_borders.h">
-      <Filter>oox\xlsx\styles</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_color.h">
-      <Filter>oox\xlsx\styles</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_dxfs.h">
-      <Filter>oox\xlsx\styles</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_fill.h">
-      <Filter>oox\xlsx\styles</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_fills.h">
-      <Filter>oox\xlsx\styles</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_font.h">
-      <Filter>oox\xlsx\styles</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_fonts.h">
-      <Filter>oox\xlsx\styles</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_numFmts.h">
-      <Filter>oox\xlsx\styles</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_protection.h">
-      <Filter>oox\xlsx\styles</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\docx\xlsx_xf.h">
-      <Filter>oox\xlsx\styles</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\conversionelement.h">
+    <ClInclude Include="..\..\Reader\Converter\conversionelement.h">
       <Filter>oox\oox</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\drawing_object_description.h">
+    <ClInclude Include="..\..\Reader\Converter\drawing_object_description.h">
       <Filter>oox\oox</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\measuredigits.h">
+    <ClInclude Include="..\..\Reader\Converter\measuredigits.h">
       <Filter>oox\oox</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\mediaitems.h">
+    <ClInclude Include="..\..\Reader\Converter\mediaitems.h">
       <Filter>oox\oox</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\oox_conversion_context.h">
+    <ClInclude Include="..\..\Reader\Converter\oox_conversion_context.h">
       <Filter>oox\oox</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\oox_drawing.h">
+    <ClInclude Include="..\..\Reader\Converter\oox_drawing.h">
       <Filter>oox\oox</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\oox_drawing_fills.h">
+    <ClInclude Include="..\..\Reader\Converter\oox_drawing_fills.h">
       <Filter>oox\oox</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\oox_package.h">
+    <ClInclude Include="..\..\Reader\Converter\oox_layout.h">
       <Filter>oox\oox</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\oox_rels.h">
+    <ClInclude Include="..\..\Reader\Converter\oox_package.h">
       <Filter>oox\oox</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\ooxtablerowspanned.h">
+    <ClInclude Include="..\..\Reader\Converter\oox_rels.h">
       <Filter>oox\oox</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\oox_chart_context.h">
+    <ClInclude Include="..\..\Reader\Converter\ooxtablerowspanned.h">
+      <Filter>oox\oox</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Converter\oox_chart_axis.h">
       <Filter>oox\oox\chart</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\oox_chart_legend.h">
+    <ClInclude Include="..\..\Reader\Converter\oox_chart_context.h">
       <Filter>oox\oox\chart</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\oox_chart_series.h">
+    <ClInclude Include="..\..\Reader\Converter\oox_chart_legend.h">
       <Filter>oox\oox\chart</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\oox_chart_shape.h">
+    <ClInclude Include="..\..\Reader\Converter\oox_chart_series.h">
       <Filter>oox\oox\chart</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\oox_chart_values.h">
+    <ClInclude Include="..\..\Reader\Converter\oox_chart_shape.h">
       <Filter>oox\oox\chart</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\oox_data_labels.h">
+    <ClInclude Include="..\..\Reader\Converter\oox_chart_values.h">
       <Filter>oox\oox\chart</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\oox_layout.h">
+    <ClInclude Include="..\..\Reader\Converter\oox_plot_area.h">
       <Filter>oox\oox\chart</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\oox_plot_area.h">
+    <ClInclude Include="..\..\Reader\Converter\oox_types_chart.h">
       <Filter>oox\oox\chart</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\oox_title.h">
+    <ClInclude Include="..\..\Reader\Converter\oox_data_labels.h">
       <Filter>oox\oox\chart</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\oox_types_chart.h">
+    <ClInclude Include="..\..\Reader\Converter\oox_title.h">
       <Filter>oox\oox\chart</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\pptx_comments.h">
+    <ClInclude Include="..\..\Reader\Converter\pptx_comments.h">
       <Filter>oox\pptx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\pptx_comments_context.h">
+    <ClInclude Include="..\..\Reader\Converter\pptx_comments_context.h">
       <Filter>oox\pptx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\pptx_conversion_context.h">
+    <ClInclude Include="..\..\Reader\Converter\pptx_conversion_context.h">
       <Filter>oox\pptx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\pptx_default_serializes.h">
+    <ClInclude Include="..\..\Reader\Converter\pptx_default_serializes.h">
       <Filter>oox\pptx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\pptx_drawing.h">
+    <ClInclude Include="..\..\Reader\Converter\pptx_drawing.h">
       <Filter>oox\pptx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\pptx_drawings.h">
+    <ClInclude Include="..\..\Reader\Converter\pptx_drawings.h">
       <Filter>oox\pptx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\pptx_output_xml.h">
+    <ClInclude Include="..\..\Reader\Converter\pptx_output_xml.h">
       <Filter>oox\pptx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\pptx_package.h">
+    <ClInclude Include="..\..\Reader\Converter\pptx_package.h">
       <Filter>oox\pptx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\pptx_slide_context.h">
+    <ClInclude Include="..\..\Reader\Converter\pptx_slide_context.h">
       <Filter>oox\pptx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\pptx_table_context.h">
+    <ClInclude Include="..\..\Reader\Converter\pptx_table_context.h">
       <Filter>oox\pptx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\docx\pptx_text_context.h">
+    <ClInclude Include="..\..\Reader\Converter\pptx_text_context.h">
       <Filter>oox\pptx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\all_elements.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_alignment.h">
+      <Filter>oox\xlsx\styles</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\anim_elements.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_border.h">
+      <Filter>oox\xlsx\styles</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\calcext_elements.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_borders.h">
+      <Filter>oox\xlsx\styles</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\chart_build_oox.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_cell_format.h">
+      <Filter>oox\xlsx\styles</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\chart_objects.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_cell_style.h">
+      <Filter>oox\xlsx\styles</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\datatypes\custom_shape_types_convert.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_cell_styles.h">
+      <Filter>oox\xlsx\styles</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\documentcontext.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_color.h">
+      <Filter>oox\xlsx\styles</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\draw_common.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_dxfs.h">
+      <Filter>oox\xlsx\styles</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\draw_frame.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_fill.h">
+      <Filter>oox\xlsx\styles</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\draw_page.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_fills.h">
+      <Filter>oox\xlsx\styles</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\draw_shapes.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_font.h">
+      <Filter>oox\xlsx\styles</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\font_face.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_fonts.h">
+      <Filter>oox\xlsx\styles</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\list.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_comments.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\math_elementaries.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_comments_context.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\math_elements.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_complex_number_format.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\math_layout_elements.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_conditionalFormatting.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\math_limit_elements.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_data_validation.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\math_table_elements.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_defined_names.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\math_token_elements.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_drawing.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\note.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_drawing_context.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\odf_content_xml.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_drawings.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\cpdoccore\odf\odf_document.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_formula.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\odf_document_impl.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_hyperlinks.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\odf\odf_elements_type.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_merge_cells.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\odfcontext.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_num_format_context.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\office_annotation.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_output_xml.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\office_binary_data.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_package.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\office_body.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_pivots_context.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\office_chart.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_protection.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\office_document.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_row_spanned.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\office_elements.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_sharedstrings.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\office_event_listeners.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_styles.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\office_forms.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_table_metrics.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\office_meta.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_table_position.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\office_presentation.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_table_state.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\office_scripts.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_tablecontext.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\office_settings.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_textcontext.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\office_spreadsheet.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_utils.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\office_text.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsxconversioncontext.h">
+      <Filter>oox\xlsx</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\paragraph_elements.h">
-      <Filter>elements</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_xf.h">
+      <Filter>oox\xlsx\styles</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\odf\search_table_cell.h">
-      <Filter>elements</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\odf\skipelement.h">
-      <Filter>elements</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\odf\table.h">
-      <Filter>elements</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\odf\table_calculation_settings.h">
-      <Filter>elements</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\odf\table_data_pilot_tables.h">
-      <Filter>elements</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\odf\table_database_ranges.h">
-      <Filter>elements</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\odf\table_named_expressions.h">
-      <Filter>elements</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\odf\text_content.h">
-      <Filter>elements</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\odf\text_elements.h">
-      <Filter>elements</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\odf\visitor.h">
-      <Filter>elements</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\ConvertOO2OOX.h" />
-    <ClInclude Include="..\src\odf\style_properties.h">
-      <Filter>style</Filter>
+    <ClInclude Include="..\..\Reader\Converter\xlsx_numFmts.h">
+      <Filter>oox\xlsx\styles</Filter>
     </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/OdfFile/Projects/Windows/cpxml.vcxproj b/OdfFile/Projects/Windows/cpxml.vcxproj
index 54a5ec7f2b..58e059bacf 100644
--- a/OdfFile/Projects/Windows/cpxml.vcxproj
+++ b/OdfFile/Projects/Windows/cpxml.vcxproj
@@ -18,6 +18,23 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Common\xml\attributes.cpp" />
+    <ClCompile Include="..\..\Common\xml\sax.cpp" />
+    <ClCompile Include="..\..\Common\xml\sax_xmllite.cpp" />
+    <ClCompile Include="..\..\Common\xml\utils.cpp" />
+    <ClCompile Include="..\..\Common\xml\xmlchar.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\Common\xml\attributes.h" />
+    <ClInclude Include="..\..\Common\xml\nodetype.h" />
+    <ClInclude Include="..\..\Common\xml\sax.h" />
+    <ClInclude Include="..\..\Common\xml\sax_xmllite.h" />
+    <ClInclude Include="..\..\Common\xml\simple_xml_writer.h" />
+    <ClInclude Include="..\..\Common\xml\utils.h" />
+    <ClInclude Include="..\..\Common\xml\xmlchar.h" />
+    <ClInclude Include="..\..\Common\xml\xmlelement.h" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>xml_wrapper</ProjectName>
     <ProjectGuid>{41BED424-4EAF-4053-8A5F-1E2A387D53D1}</ProjectGuid>
@@ -69,8 +86,8 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(Configuration)\</OutDir>
     <IntDir>$(Configuration)\</IntDir>
-    <IncludePath>..\..\Common\3dParty\boost\build\win_32\include;$(IncludePath)</IncludePath>
-    <LibraryPath>..\..\Common\3dParty\boost\build\win_32\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>..\..\..\Common\3dParty\boost\build\win_32\include;$(IncludePath)</IncludePath>
+    <LibraryPath>..\..\..\Common\3dParty\boost\build\win_32\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(Platform)\$(Configuration)\</OutDir>
diff --git a/OdfFile/Projects/Windows/cpxml.vcxproj.filters b/OdfFile/Projects/Windows/cpxml.vcxproj.filters
index 9cd8510566..d15146676e 100644
--- a/OdfFile/Projects/Windows/cpxml.vcxproj.filters
+++ b/OdfFile/Projects/Windows/cpxml.vcxproj.filters
@@ -1,2 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
\ No newline at end of file
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\..\Common\xml\attributes.cpp" />
+    <ClCompile Include="..\..\Common\xml\sax.cpp" />
+    <ClCompile Include="..\..\Common\xml\sax_xmllite.cpp" />
+    <ClCompile Include="..\..\Common\xml\utils.cpp" />
+    <ClCompile Include="..\..\Common\xml\xmlchar.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\Common\xml\attributes.h" />
+    <ClInclude Include="..\..\Common\xml\nodetype.h" />
+    <ClInclude Include="..\..\Common\xml\sax.h" />
+    <ClInclude Include="..\..\Common\xml\sax_xmllite.h" />
+    <ClInclude Include="..\..\Common\xml\simple_xml_writer.h" />
+    <ClInclude Include="..\..\Common\xml\utils.h" />
+    <ClInclude Include="..\..\Common\xml\xmlchar.h" />
+    <ClInclude Include="..\..\Common\xml\xmlelement.h" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/OdfFile/Projects/Windows/formulasconvert.vcxproj b/OdfFile/Projects/Windows/formulasconvert.vcxproj
index 0167cec313..0315d242a8 100644
--- a/OdfFile/Projects/Windows/formulasconvert.vcxproj
+++ b/OdfFile/Projects/Windows/formulasconvert.vcxproj
@@ -18,6 +18,13 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\Formulas\formulasconvert.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Formulas\formulasconvert_odf.cpp" />
+    <ClCompile Include="..\..\Formulas\formulasconvert_oox.cpp" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>OdfFormulasConvert</ProjectName>
     <ProjectGuid>{94954A67-A853-43B1-A727-6EF2774C5A6A}</ProjectGuid>
@@ -146,13 +153,6 @@
       <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\formulasconvert\formulasconvert.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\formulasconvert\formulasconvert_odf.cpp" />
-    <ClCompile Include="..\formulasconvert\formulasconvert_oox.cpp" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>