diff --git a/OOXML/Binary/Presentation/BinaryFileReaderWriter.cpp b/OOXML/Binary/Presentation/BinaryFileReaderWriter.cpp
index 9c89d10093..d4535af440 100644
--- a/OOXML/Binary/Presentation/BinaryFileReaderWriter.cpp
+++ b/OOXML/Binary/Presentation/BinaryFileReaderWriter.cpp
@@ -32,28 +32,28 @@
 #include "BinaryFileReaderWriter.h"
 #include "BinReaderWriterDefines.h"
 
-#include "../../Common/DocxFormat/Source/Base/Nullable.h"
-#include "../../Common/DocxFormat/Source/DocxFormat/WritingElement.h"
+#include "../../Base/Nullable.h"
+#include "../../DocxFormat/WritingElement.h"
 
-#include "../../Common/DocxFormat/Source/DocxFormat/Media/OleObject.h"
-#include "../../Common/DocxFormat/Source/DocxFormat/Media/ActiveX.h"
-#include "../../Common/DocxFormat/Source/DocxFormat/Media/Video.h"
-#include "../../Common/DocxFormat/Source/DocxFormat/Media/Audio.h"
-#include "../../Common/DocxFormat/Source/DocxFormat/Media/VbaProject.h"
-#include "../../Common/DocxFormat/Source/DocxFormat/Media/JsaProject.h"
+#include "../../DocxFormat/Media/OleObject.h"
+#include "../../DocxFormat/Media/ActiveX.h"
+#include "../../DocxFormat/Media/Video.h"
+#include "../../DocxFormat/Media/Audio.h"
+#include "../../DocxFormat/Media/VbaProject.h"
+#include "../../DocxFormat/Media/JsaProject.h"
 
 #include "../../Common/Base64.h"
 
 #include "./imagemanager.h"
 #include "./XmlWriter.h"
 #include "./FontPicker.h"
-#include "../../ASCOfficeDocxFile2/DocWrapper/DocxSerializer.h"
+#include "../../Binary/Document/DocWrapper/DocxSerializer.h"
 
-#include "../../DesktopEditor/common/File.h"
-#include "../../DesktopEditor/common/Directory.h"
-#include "../../DesktopEditor/raster/ImageFileFormatChecker.h"
+#include "../../../DesktopEditor/common/File.h"
+#include "../../../DesktopEditor/common/Directory.h"
+#include "../../../DesktopEditor/raster/ImageFileFormatChecker.h"
 
-#include "../PPTXFormat/FileContainer.h"
+#include "../../PPTXFormat/FileContainer.h"
 #include <iostream>
 
 #ifndef DISABLE_FILE_DOWNLOADER
@@ -73,7 +73,7 @@
 #define DOUBLE_MAIN		10000
 
 #if defined(_WIN32) || defined (_WIN64)
-	#include "../../Common/DocxFormat/Source/Base/unicode_util.h"
+	#include "../../Base/unicode_util.h"
 #endif
 
 namespace NSBinPptxRW
diff --git a/OOXML/Binary/Presentation/WMFToImageConverter.h b/OOXML/Binary/Presentation/WMFToImageConverter.h
index bdd78184e9..f683f00090 100644
--- a/OOXML/Binary/Presentation/WMFToImageConverter.h
+++ b/OOXML/Binary/Presentation/WMFToImageConverter.h
@@ -34,7 +34,7 @@
 #if defined(_WIN32) || defined (_WIN64)
 #endif
 
-#include "../../Common/DocxFormat/Source/SystemUtility/File.h"
+#include "../../SystemUtility/File.h"
 
 #include <algorithm>
 
diff --git a/OOXML/Binary/Presentation/imagemanager.cpp b/OOXML/Binary/Presentation/imagemanager.cpp
index 45a94df136..8532c64caa 100644
--- a/OOXML/Binary/Presentation/imagemanager.cpp
+++ b/OOXML/Binary/Presentation/imagemanager.cpp
@@ -47,8 +47,8 @@
 #include "../../OfficeUtils/src/OfficeUtils.h"
 #include "../../DesktopEditor/common/Directory.h"
 
-#include "../../Common/DocxFormat/Source/SystemUtility/File.h"
-#include "../../Common/DocxFormat/Source/SystemUtility/SystemUtility.h"
+#include "../../SystemUtility/File.h"
+#include "../../SystemUtility/SystemUtility.h"
 
 
 namespace NSShapeImageGen
diff --git a/OOXML/PPTXFormat/LegacyDiagramText.h b/OOXML/PPTXFormat/LegacyDiagramText.h
index 1709e0b6c1..89e01c4b02 100644
--- a/OOXML/PPTXFormat/LegacyDiagramText.h
+++ b/OOXML/PPTXFormat/LegacyDiagramText.h
@@ -31,8 +31,8 @@
  */
 #pragma once
 
-#include "../../Common/DocxFormat/Source/DocxFormat/File.h"
-#include "../../Common/DocxFormat/Source/Base/Base.h"
+#include "../DocxFormat/File.h"
+#include "../Base/Base.h"
 
 #include "Logic/TextParagraphPr.h"
 #include "Logic/Colors/SrgbClr.h"
diff --git a/OdfFile/Reader/Converter/mediaitems.cpp b/OdfFile/Reader/Converter/mediaitems.cpp
index fcb0b3e42b..c30f269401 100644
--- a/OdfFile/Reader/Converter/mediaitems.cpp
+++ b/OdfFile/Reader/Converter/mediaitems.cpp
@@ -34,10 +34,10 @@
 
 #include <boost/regex.hpp>
 
-#include "../../include/xml/utils.h"
+#include <xml/utils.h>
 
-#include "../../../Common/DocxFormat/Source/Base/Base.h"
-#include "../../../Common/DocxFormat/Source/SystemUtility/File.h"
+#include "../../../OOXML/Base/Base.h"
+#include "../../../OOXML/SystemUtility/File.h"
 
 #include "../../../DesktopEditor/common/Directory.h"
 #include "../../../DesktopEditor/raster/ImageFileFormatChecker.h"
diff --git a/OdfFile/Reader/Format/note.cpp b/OdfFile/Reader/Format/note.cpp
index cc7dec0d14..4a432c3f60 100644
--- a/OdfFile/Reader/Format/note.cpp
+++ b/OdfFile/Reader/Format/note.cpp
@@ -33,7 +33,7 @@
 #include "note.h"
 #include "paragraph_elements.h"
 
-#include "../../include/xml/xmlchar.h"
+#include <xml/xmlchar.h>
 
 
 namespace cpdoccore { 
@@ -79,7 +79,7 @@ void note_citation::add_space(const std::wstring & Text)
 }
 void note_citation::docx_convert(oox::docx_conversion_context & Context)
 {
-	for (size_t i = 0; i < content_.size(); i++)
+ 	for (size_t i = 0; i < content_.size(); i++)
     {
         content_[i]->docx_convert(Context);            
     }
diff --git a/OdfFile/Reader/Format/odfcontext.h b/OdfFile/Reader/Format/odfcontext.h
index d227bd4441..5c8892aed2 100644
--- a/OdfFile/Reader/Format/odfcontext.h
+++ b/OdfFile/Reader/Format/odfcontext.h
@@ -36,8 +36,8 @@
 
 #include <vector>
 #include <boost/unordered_map.hpp>
-#include "datatypes/stylefamily.h"
-#include "datatypes/noteclass.h"
+#include "../../DataTypes/stylefamily.h"
+#include "../../DataTypes/noteclass.h"
 
 #include "styles_lite_container.h"
 
diff --git a/OdfFile/Reader/Format/paragraph_elements.cpp b/OdfFile/Reader/Format/paragraph_elements.cpp
index d2afe4fac4..eac69856ba 100644
--- a/OdfFile/Reader/Format/paragraph_elements.cpp
+++ b/OdfFile/Reader/Format/paragraph_elements.cpp
@@ -37,9 +37,9 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include "../../include/xml/xmlchar.h"
+#include <xml/xmlchar.h>
 
-#include "../../include/xml/utils.h"
+#include <xml/utils.h>
 #include "../../include/common/readstring.h"
 #include "../../include/odf/odf_document.h"
 
@@ -53,7 +53,7 @@
 
 #include "style_text_properties.h"
 
-#include "datatypes/targetframename.h"
+#include "../../DataTypes/targetframename.h"
 
 namespace cpdoccore { 
 
@@ -544,7 +544,7 @@ void span::docx_convert(oox::docx_conversion_context & Context)
 					std::wstring parent = styleInst->parent_name();
 
 					if (false == parent.empty())
-					{
+                {
 						text_props->content_.r_style_ = Context.styles_map_.get(parent, styleInst->type());
 					}
                     
@@ -889,7 +889,7 @@ void note::docx_convert(oox::docx_conversion_context & Context)
 	Context.get_notes_context().set_current_note(text_note_class_.get_type(), dynamic_cast<const note_citation *>(text_note_citation_.get()));
 
 	std::wstring sCustom = text_note_citation_ ? L" w:customMarkFollows=\"1\"" : L"";
-	if (text_note_class_.get_type() == noteclass::Footnote)
+    if (text_note_class_.get_type() == noteclass::Footnote)
     {
 	   Context.output_stream() << "<w:footnoteReference" << sCustom << L" w:id=\"" << Context.get_notes_context().next_id() << "\" />";
     }
diff --git a/OdfFile/Writer/Converter/DocxConverter.cpp b/OdfFile/Writer/Converter/DocxConverter.cpp
index b64e48f1e5..e35bd52310 100644
--- a/OdfFile/Writer/Converter/DocxConverter.cpp
+++ b/OdfFile/Writer/Converter/DocxConverter.cpp
@@ -30,40 +30,40 @@
  *
  */
 #include "DocxConverter.h"
-#include "../utils.h"
+#include "../../src/utils.h"
 
-#include "../../../Common/DocxFormat/Source/DocxFormat/Docx.h"
-#include "../../../Common/DocxFormat/Source/DocxFormat/DocxFlat.h"
-#include "../../../Common/DocxFormat/Source/DocxFormat/Document.h"
-#include "../../../Common/DocxFormat/Source/DocxFormat/Endnote.h"
-#include "../../../Common/DocxFormat/Source/DocxFormat/Footnote.h"
-#include "../../../Common/DocxFormat/Source/DocxFormat/FontTable.h"
-#include "../../../Common/DocxFormat/Source/DocxFormat/Numbering.h"
-#include "../../../Common/DocxFormat/Source/DocxFormat/Styles.h"
-#include "../../../Common/DocxFormat/Source/DocxFormat/Settings/WebSettings.h"
-#include "../../../Common/DocxFormat/Source/DocxFormat/Settings/Settings.h"
-#include "../../../Common/DocxFormat/Source/DocxFormat/External/HyperLink.h"
-#include "../../../Common/DocxFormat/Source/DocxFormat/HeaderFooter.h"
+#include "../../../OOXML/DocxFormat/Docx.h"
+#include "../../../OOXML/DocxFormat/DocxFlat.h"
+#include "../../../OOXML/DocxFormat/Document.h"
+#include "../../../OOXML/DocxFormat/Endnote.h"
+#include "../../../OOXML/DocxFormat/Footnote.h"
+#include "../../../OOXML/DocxFormat/FontTable.h"
+#include "../../../OOXML/DocxFormat/Numbering.h"
+#include "../../../OOXML/DocxFormat/Styles.h"
+#include "../../../OOXML/DocxFormat/Settings/WebSettings.h"
+#include "../../../OOXML/DocxFormat/Settings/Settings.h"
+#include "../../../OOXML/DocxFormat/External/HyperLink.h"
+#include "../../../OOXML/DocxFormat/HeaderFooter.h"
 
-#include "../../../Common/DocxFormat/Source/DocxFormat/External/HyperLink.h"
-#include "../../../Common/DocxFormat/Source/XlsxFormat/Chart/Chart.h"
-#include "../../../Common/DocxFormat/Source/DocxFormat/Logic/Pict.h"
+#include "../../../OOXML/DocxFormat/External/HyperLink.h"
+#include "../../../OOXML/XlsxFormat/Chart/Chart.h"
+#include "../../../OOXML/DocxFormat/Logic/Pict.h"
 
 #include "VmlShapeTypes2Oox.h"
 
-#include "../OdfFormat/odt_conversion_context.h"
+#include "../Format/odt_conversion_context.h"
 
-#include "../OdfFormat/odf_text_context.h"
-#include "../OdfFormat/odf_drawing_context.h"
+#include "../Format/odf_text_context.h"
+#include "../Format/odf_drawing_context.h"
 
-#include "../OdfFormat/styles.h"
+#include "../Format/styles.h"
 
-#include "../OdfFormat/style_page_layout_properties.h"
-#include "../OdfFormat/style_table_properties.h"
-#include "../OdfFormat/style_text_properties.h"
-#include "../OdfFormat/style_paragraph_properties.h"
-#include "../OdfFormat/style_graphic_properties.h"
-#include "../OdfFormat/styles_list.h"
+#include "../Format/style_page_layout_properties.h"
+#include "../Format/style_table_properties.h"
+#include "../Format/style_text_properties.h"
+#include "../Format/style_paragraph_properties.h"
+#include "../Format/style_graphic_properties.h"
+#include "../Format/styles_list.h"
 
 using namespace cpdoccore;
 
diff --git a/OdfFile/Writer/Converter/DocxConverter.h b/OdfFile/Writer/Converter/DocxConverter.h
index 820bf5827a..43ac0895f3 100644
--- a/OdfFile/Writer/Converter/DocxConverter.h
+++ b/OdfFile/Writer/Converter/DocxConverter.h
@@ -36,8 +36,8 @@
 #include <CPSharedPtr.h>
 #include <CPOptional.h>
 
-#include "../../../Common/DocxFormat/Source/Common/SimpleTypes_Word.h"
-#include "../../Common/DocxFormat/Source/DocxFormat/Math/oMathContent.h"
+#include "../../../OOXML/Common/SimpleTypes_Word.h"
+#include "../../../OOXML/DocxFormat/Math/oMathContent.h"
 
 namespace OOX 
 {
diff --git a/OdfFile/Writer/Converter/XlsxConverter.cpp b/OdfFile/Writer/Converter/XlsxConverter.cpp
index fcd155b736..c8d9e8558a 100644
--- a/OdfFile/Writer/Converter/XlsxConverter.cpp
+++ b/OdfFile/Writer/Converter/XlsxConverter.cpp
@@ -30,37 +30,37 @@
  *
  */
 #include "XlsxConverter.h"
-#include "../../../Common/DocxFormat/Source/XlsxFormat/Xlsx.h"
-#include "../../../Common/DocxFormat/Source/XlsxFormat/XlsxFlat.h"
-#include "../../../Common/DocxFormat/Source/XlsxFormat/Workbook/Workbook.h"
-#include "../../../Common/DocxFormat/Source/XlsxFormat/Worksheets/Worksheet.h"
-#include "../../../Common/DocxFormat/Source/XlsxFormat/Comments/Comments.h"
-#include "../../../Common/DocxFormat/Source/XlsxFormat/SharedStrings/SharedStrings.h"
-#include "../../../Common/DocxFormat/Source/XlsxFormat/Styles/Styles.h"
-#include "../../../Common/DocxFormat/Source/XlsxFormat/CalcChain/CalcChain.h"
-#include "../../../Common/DocxFormat/Source/XlsxFormat/ExternalLinks/ExternalLinks.h"
-#include "../../../Common/DocxFormat/Source/XlsxFormat/ExternalLinks/ExternalLinkPath.h"
-#include "../../../Common/DocxFormat/Source/XlsxFormat/Pivot/PivotTable.h"
-#include "../../../Common/DocxFormat/Source/XlsxFormat/Pivot/PivotCacheDefinition.h"
-#include "../../../Common/DocxFormat/Source/XlsxFormat/Pivot/PivotCacheRecords.h"
+#include "../../../OOXML/XlsxFormat/Xlsx.h"
+#include "../../../OOXML/XlsxFormat/XlsxFlat.h"
+#include "../../../OOXML/XlsxFormat/Workbook/Workbook.h"
+#include "../../../OOXML/XlsxFormat/Worksheets/Worksheet.h"
+#include "../../../OOXML/XlsxFormat/Comments/Comments.h"
+#include "../../../OOXML/XlsxFormat/SharedStrings/SharedStrings.h"
+#include "../../../OOXML/XlsxFormat/Styles/Styles.h"
+#include "../../../OOXML/XlsxFormat/CalcChain/CalcChain.h"
+#include "../../../OOXML/XlsxFormat/ExternalLinks/ExternalLinks.h"
+#include "../../../OOXML/XlsxFormat/ExternalLinks/ExternalLinkPath.h"
+#include "../../../OOXML/XlsxFormat/Pivot/PivotTable.h"
+#include "../../../OOXML/XlsxFormat/Pivot/PivotCacheDefinition.h"
+#include "../../../OOXML/XlsxFormat/Pivot/PivotCacheRecords.h"
 
-#include "../../../Common/DocxFormat/Source/DocxFormat/VmlDrawing.h"
-#include "../../../Common/DocxFormat/Source/DocxFormat/Media/ActiveX.h"
+#include "../../../OOXML/DocxFormat/VmlDrawing.h"
+#include "../../../OOXML/DocxFormat/Media/ActiveX.h"
 
-#include "../OdfFormat/ods_conversion_context.h"
+#include "../Format/ods_conversion_context.h"
 
-#include "../OdfFormat/odf_text_context.h"
-#include "../OdfFormat/odf_drawing_context.h"
+#include "../Format/odf_text_context.h"
+#include "../Format/odf_drawing_context.h"
 
-#include "../OdfFormat/styles.h"
+#include "../Format/styles.h"
 
-#include "../OdfFormat/style_table_properties.h"
-#include "../OdfFormat/style_text_properties.h"
-#include "../OdfFormat/style_paragraph_properties.h"
-#include "../OdfFormat/style_graphic_properties.h"
-#include "../OdfFormat/style_page_layout_properties.h"
+#include "../Format/style_table_properties.h"
+#include "../Format/style_text_properties.h"
+#include "../Format/style_paragraph_properties.h"
+#include "../Format/style_graphic_properties.h"
+#include "../Format/style_page_layout_properties.h"
 
-#include "../utils.h"
+#include "../../src/utils.h"
 
 using namespace cpdoccore;
 
diff --git a/RtfFile/Format/Utils.h b/RtfFile/Format/Utils.h
index 9279868eac..6694c491af 100644
--- a/RtfFile/Format/Utils.h
+++ b/RtfFile/Format/Utils.h
@@ -39,10 +39,10 @@
     #include <windows.h>
 #endif
 
-#include "../../../Common/FileWriter.h"
-#include "../../../Common/DocxFormat/Source/Base/Unit.h"
+#include "../../Common/FileWriter.h"
+#include "../../OOXML/Base/Unit.h"
 
-#include "../../../UnicodeConverter/UnicodeConverter.h"
+#include "../../UnicodeConverter/UnicodeConverter.h"
 
 #include "UniversalConverterUtils.h"
 
diff --git a/RtfFile/OOXml/Reader/OOXShapeReader.cpp b/RtfFile/OOXml/Reader/OOXShapeReader.cpp
index 822524acb3..0ac0af0c40 100644
--- a/RtfFile/OOXml/Reader/OOXShapeReader.cpp
+++ b/RtfFile/OOXml/Reader/OOXShapeReader.cpp
@@ -33,21 +33,21 @@
 #include "OOXPictureReader.h"
 #include "OOXShapeReader.h"
 #include "OOXTextItemReader.h"
-#include "../Ole1FormatReader.h"
-#include "../RtfOle.h"
+#include "../../Format/Ole1FormatReader.h"
+#include "../../Format/RtfOle.h"
 
-#include "../../../../ASCOfficePPTXFile/Editor/Drawing/Shapes/Shape.h"
-#include "../../../../ASCOfficePPTXFile/PPTXFormat/Logic/SpTree.h"
-#include "../../../../ASCOfficePPTXFile/PPTXFormat/Logic/Pic.h"
-#include "../../../../ASCOfficePPTXFile/PPTXFormat/Logic/Shape.h"
-#include "../../../../ASCOfficePPTXFile/PPTXFormat/Logic/Colors/SchemeClr.h"
+#include "../../../MsBinaryFile/PptFile/Drawing/Shapes/Shape.h"
+#include "../../../OOXML/PPTXFormat/Logic/SpTree.h"
+#include "../../../OOXML/PPTXFormat/Logic/Pic.h"
+#include "../../../OOXML/PPTXFormat/Logic/Shape.h"
+#include "../../../OOXML/PPTXFormat/Logic/Colors/SchemeClr.h"
 
-#include "../../../../ASCOfficeOdfFile/src/odf/svg_parser.h"
+#include "../../../OdfFile/Reader/Format/svg_parser.h"
 #include <boost/algorithm/string.hpp>
-#include "../../../../Common/cfcpp/compoundfile.h"
+#include "../../../Common/cfcpp/compoundfile.h"
 
-#include "../../../../ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/toVmlConvert.h"
-#include "../../../../DesktopEditor/graphics/pro/Image.h"
+#include "../../../MsBinaryFile/Common/Vml/toVmlConvert.h"
+#include "../../../DesktopEditor/graphics/pro/Image.h"
 
 #ifndef RGB
     #define RGB(r,g,b) ((_UINT32)(((BYTE)(r)|((_UINT16)((BYTE)(g))<<8))|(((_UINT32)(BYTE)(b))<<16)))