diff --git a/build/build-linux.sh b/build/build-linux.sh
deleted file mode 100755
index 665187b1..00000000
--- a/build/build-linux.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-for var in "$@"; do
-    split=(${var/=/ })
-    export ${split[0]}=${split[1]}
-done
-
-if [ "$USE_CMAKE" = 1 ]; then
-    cd cmake
-else
-    cd genie
-fi
-
-./build-linux.sh $1
diff --git a/build/build-osx.sh b/build/build-osx.sh
deleted file mode 100755
index b06183a0..00000000
--- a/build/build-osx.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-for var in "$@"; do
-    split=(${var/=/ })
-    export ${split[0]}=${split[1]}
-done
-
-if [ "$USE_CMAKE" = 1 ]; then
-    cd cmake
-else
-    cd genie
-fi
-
-./build-osx.sh $1
diff --git a/build/cmake/xlnt.test/CMakeLists.txt b/build/cmake/xlnt.test/CMakeLists.txt
deleted file mode 100644
index 79358011..00000000
--- a/build/cmake/xlnt.test/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-project(xlnt.test)
-
-include_directories(../../../include)
-include_directories(../../../source)
-include_directories(../../../third-party/pugixml/src)
-include_directories(../../../third-party/cxxtest)
-
-add_executable(xlnt.test ../../../tests/runner-autogen.cpp)
-
-target_link_libraries(xlnt.test xlnt)
-
-add_custom_target (test-runner 
-    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../../generate-tests.sh
-    COMMENT "Generating test runner tests/runner-autogen.cpp"
-)
-
-add_dependencies(xlnt.test test-runner)
-
-add_custom_command(
-    TARGET xlnt.test
-    POST_BUILD
-    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/xlnt.test
-    VERBATIM
-)
diff --git a/build/cmake/xlnt/CMakeLists.txt b/build/cmake/xlnt/CMakeLists.txt
deleted file mode 100644
index 2a72bd28..00000000
--- a/build/cmake/xlnt/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-project(xlnt)
-
-include_directories(../../../include)
-include_directories(../../../source)
-include_directories(../../../third-party/miniz)
-include_directories(../../../third-party/pugixml/src)
-
-FILE(GLOB SOURCES ../../../source/*/* ../../../include/xlnt/*/*.hpp ../../../include/xlnt/*.hpp)
-FILE(GLOB DETAIL_SOURCES ../../../source/detail/*.cpp)
-
-add_library(xlnt STATIC ${SOURCES} ${DETAIL_SOURCES} ../../../third-party/pugixml/src/pugixml.cpp ../../../third-party/miniz/miniz.c)
-
diff --git a/build/genie/build-linux.sh b/build/genie/build-linux.sh
deleted file mode 100755
index 64827793..00000000
--- a/build/genie/build-linux.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-# use included genie if it isn't found in PATH
-GENIE_BIN=$(which genie)
-if [ -z "$GENIE_BIN" -o ! -x "$GENIE_BIN" ]; then
-    GENIE_BIN=$(pwd)"/genie-linux"
-fi
-
-# default
-ACTION="gmake"
-if [ ! -z "$1" ]; then
-    ACTION="$1"
-fi
-
-if [[ "$ACTION" = "clean" ]]; then
-    rm -rf gmake
-else
-    $GENIE_BIN $ACTION > /dev/null
-    if [[ "$ACTION" = "gmake" ]]; then
-	cd gmake
-	make
-    fi
-fi
diff --git a/build/genie/build-osx.sh b/build/genie/build-osx.sh
deleted file mode 100755
index d26c414a..00000000
--- a/build/genie/build-osx.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-# use included genie if it isn't found in PATH
-GENIE_BIN=$(which genie)
-if [ -z "$GENIE_BIN" -o ! -x "$GENIE_BIN" ]; then
-    GENIE_BIN=$(pwd)"/genie-osx"
-fi
-
-# default
-ACTION="xcode4"
-if [ ! -z "$1" ]; then
-    ACTION="$1"
-fi
-
-if [[ "$ACTION" = "clean" ]]; then
-    rm -rf xcode4
-    rm -rf gmake
-else
-    $GENIE_BIN $ACTION > /dev/null
-    if [[ "$ACTION" = "xcode4" ]]; then
-	cd xcode4
-	xcodebuild -workspace xlnt.xcworkspace -scheme xlnt.test
-    fi
-fi
diff --git a/build/genie/genie-linux b/build/genie/genie-linux
deleted file mode 100755
index 2e532ef9..00000000
Binary files a/build/genie/genie-linux and /dev/null differ
diff --git a/build/genie/genie-osx b/build/genie/genie-osx
deleted file mode 100755
index d689fbcf..00000000
Binary files a/build/genie/genie-osx and /dev/null differ
diff --git a/build/genie/genie-win.exe b/build/genie/genie-win.exe
deleted file mode 100644
index 5ca75020..00000000
Binary files a/build/genie/genie-win.exe and /dev/null differ
diff --git a/build/genie/genie.lua b/build/genie/genie.lua
deleted file mode 100644
index 025b4b48..00000000
--- a/build/genie/genie.lua
+++ /dev/null
@@ -1,88 +0,0 @@
-solution "xlnt"
-    configurations { "Debug", "Release" }
-    platforms { "x64" }
-    location ("./" .. _ACTION)
-    configuration "Debug"
-        flags { "Symbols" }
-
-project "xlnt.test"
-    kind "ConsoleApp"
-    language "C++"
-    targetname "xlnt.test"
-    targetdir "../../bin"
-    includedirs { 
-       "../../include",
-       "../../third-party/cxxtest",
-       "../../third-party/miniz",
-       "../../third-party/pugixml/src"
-    }
-    files { 
-       "../../tests/*.hpp",
-       "../../tests/runner-autogen.cpp"
-    }
-    links { "xlnt", "miniz" }
-    prebuildcommands { "../../generate-tests.sh" }
-    flags { "Unicode" }
-    configuration "windows"
-        defines { "WIN32" }
-	links { "Shlwapi" }
-    configuration "linux"
-        buildoptions {
-	    "-std=c++1y"
-    }	
-    configuration "macos"
-        buildoptions {
-	    "-std=c++14"
-    }	
-
-project "xlnt"
-    kind "StaticLib"
-    language "C++"
-    targetdir "../../lib/"
-    includedirs { 
-       "../../include",
-       "../../source",
-       "../../third-party/miniz",
-       "../../third-party/pugixml/src"
-    }
-    files {
-       "../../source/**.cpp",
-       "../../source/**.hpp",
-       "../../include/xlnt/**.hpp",
-       "../../third-party/pugixml/src/pugixml.cpp"
-    }
-    flags { "Unicode" }
-    configuration "Debug"
-        flags { "FatalWarnings" }
-    configuration "windows"
-        defines { 
-	   "WIN32",
-	   "_CRT_SECURE_NO_WARNINGS"
-	}
-    configuration "linux"
-        buildoptions {
-	    "-std=c++1y"
-    }	
-    configuration "macos"
-        buildoptions {
-	    "-std=c++14"
-    }	
-
-project "miniz"
-    kind "StaticLib"
-    language "C"
-    targetdir "../../lib/"
-    includedirs { 
-       "../../third-party/miniz",
-    }
-    files {
-       "../../third-party/miniz/miniz.c"
-    }
-    flags { "Unicode" }
-    configuration "Debug"
-        flags { "FatalWarnings" }
-    configuration "windows"
-        defines { 
-	   "WIN32",
-	   "_CRT_SECURE_NO_WARNINGS"
-	}
\ No newline at end of file
diff --git a/build/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
similarity index 72%
rename from build/cmake/CMakeLists.txt
rename to cmake/CMakeLists.txt
index 0e4926a2..394eec49 100644
--- a/build/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -17,16 +17,16 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
 elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 endif()
 
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../../../lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../../../lib)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../../../bin)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../lib)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin)
 
 foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
     string(TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG)
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/../../../lib)
-    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/../../../lib)
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/../../../bin)
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/../lib)
+    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/../lib)
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/../bin)
 endforeach(OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES)
 
-add_subdirectory(xlnt)
-add_subdirectory(xlnt.test)
+include(xlnt.cmake)
+include(xlnt.test.cmake)
diff --git a/build/build b/cmake/build
similarity index 65%
rename from build/build
rename to cmake/build
index 945e0961..d1aac34e 100755
--- a/build/build
+++ b/cmake/build
@@ -4,4 +4,4 @@ import os
 import subprocess
 
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
-subprocess.call(['sh', 'build-osx.sh', 'USE_CMAKE=1'])
+subprocess.call(['sh', 'build-osx.sh'])
diff --git a/build/cmake/build-linux.sh b/cmake/build-linux.sh
similarity index 100%
rename from build/cmake/build-linux.sh
rename to cmake/build-linux.sh
diff --git a/build/cmake/build-osx.sh b/cmake/build-osx.sh
similarity index 56%
rename from build/cmake/build-osx.sh
rename to cmake/build-osx.sh
index c1c565c4..b64028e3 100755
--- a/build/cmake/build-osx.sh
+++ b/cmake/build-osx.sh
@@ -5,7 +5,7 @@ if [ "$ACTION" = "clean" ]; then
     exit 0
 fi
 
-mkdir build
-cd build
-cmake -G "Unix Makefiles" ..
+mkdir ../build
+cd ../build
+cmake -G "Unix Makefiles" ../cmake
 make
diff --git a/cmake/clang-format-osx-6e0ab6e b/cmake/clang-format-osx-6e0ab6e
new file mode 100755
index 00000000..3bbee2e7
Binary files /dev/null and b/cmake/clang-format-osx-6e0ab6e differ
diff --git a/build/clean b/cmake/clean
similarity index 72%
rename from build/clean
rename to cmake/clean
index 7d89a43a..72d557ae 100755
--- a/build/clean
+++ b/cmake/clean
@@ -4,7 +4,9 @@ import os
 import shutil
 
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
-dirs = ['../bin', '../lib', './cmake/build', './genie/xcode4']
+
+dirs = ['../bin', '../lib', '../build']
+
 for dir in dirs:
     if os.path.isdir(dir): shutil.rmtree(dir)
 
diff --git a/build/generate-tests.sh b/cmake/generate-tests.sh
similarity index 100%
rename from build/generate-tests.sh
rename to cmake/generate-tests.sh
diff --git a/build/install-dependencies.sh b/cmake/install-dependencies.sh
similarity index 100%
rename from build/install-dependencies.sh
rename to cmake/install-dependencies.sh
diff --git a/build/test b/cmake/test
similarity index 100%
rename from build/test
rename to cmake/test
diff --git a/cmake/xlnt.cmake b/cmake/xlnt.cmake
new file mode 100644
index 00000000..89abb823
--- /dev/null
+++ b/cmake/xlnt.cmake
@@ -0,0 +1,49 @@
+project(xlnt)
+
+include_directories(../include)
+include_directories(../source)
+include_directories(../third-party/miniz)
+include_directories(../third-party/pugixml/src)
+
+FILE(GLOB ROOT_HEADERS ../include/xlnt/*.hpp)
+FILE(GLOB CELL_HEADERS ../include/xlnt/cell/*.hpp)
+FILE(GLOB CHARTS_HEADERS ../include/xlnt/charts/*.hpp)
+FILE(GLOB CHARTSHEET_HEADERS ../include/xlnt/chartsheet/*.hpp)
+FILE(GLOB COMMON_HEADERS ../include/xlnt/common/*.hpp)
+FILE(GLOB DRAWING_HEADERS ../include/xlnt/drawing/*.hpp)
+FILE(GLOB FORUMULA_HEADERS ../include/xlnt/formula/*.hpp)
+FILE(GLOB PACKAGING_HEADERS ../include/xlnt/packaging/*.hpp)
+FILE(GLOB SERIALIZATION_HEADERS ../include/xlnt/serialization/*.hpp)
+FILE(GLOB STYLES_HEADERS ../include/xlnt/styles/*.hpp)
+FILE(GLOB WORKBOOK_HEADERS ../include/xlnt/workbook/*.hpp)
+FILE(GLOB WORKSHEET_HEADERS ../include/xlnt/worksheet/*.hpp)
+FILE(GLOB DETAIL_HEADERS ../source/detail/*.hpp)
+
+FILE(GLOB DETAIL_SOURCES ../source/detail/*.cpp)
+FILE(GLOB CELL_SOURCES ../source/cell/*.cpp)
+FILE(GLOB CHARTS_SOURCES ../source/charts/*.cpp)
+FILE(GLOB CHARTSHEET_SOURCES ../source/chartsheet/*.cpp)
+FILE(GLOB COMMON_SOURCES ../source/common/*.cpp)
+FILE(GLOB DRAWING_SOURCES ../source/drawing/*.cpp)
+FILE(GLOB FORUMULA_SOURCES ../source/formula/*.cpp)
+FILE(GLOB PACKAGING_SOURCES ../source/packaging/*.cpp)
+FILE(GLOB SERIALIZATION_SOURCES ../source/serialization/*.cpp)
+FILE(GLOB STYLES_SOURCES ../source/styles/*.cpp)
+FILE(GLOB WORKBOOK_SOURCES ../source/workbook/*.cpp)
+FILE(GLOB WORKSHEET_SOURCES ../source/worksheet/*.cpp)
+
+add_library(xlnt STATIC ${DETAIL_HEADERS} ${CELL_HEADERS} ${CHARTS_HEADERS} ${CHARTSHEET_HEADERS} ${COMMON_HEADERS} ${DRAWING_HEADERS} ${FORMULA_HEADERS} ${PACKAGING_HEADERS} ${SERIALIZATION_HEADERS} ${STYLES_HEADERS} ${WORKBOOK_HEADERS} ${WORKSHEET_HEADERS} ${DETAIL_SOURCES} ${CELL_SOURCES} ${CHARTS_SOURCES} ${CHARTSHEET_SOURCES} ${COMMON_SOURCES} ${DRAWING_SOURCES} ${FORMULA_SOURCES} ${PACKAGING_SOURCES} ${SERIALIZATION_SOURCES} ${STYLES_SOURCES} ${WORKBOOK_SOURCES} ${WORKSHEET_SOURCES} ../third-party/pugixml/src/pugixml.cpp ../third-party/miniz/miniz.c)
+
+source_group(detail FILES ${DETAIL_HEADERS} ${DETAIL_SOURCES})
+source_group(cell FILES ${CELL_HEADERS} ${CELL_SOURCES})
+source_group(charts FILES ${CHARTS_HEADERS} ${CHARTS_SOURCES})
+source_group(chartsheet FILES ${CHARTSHEET_HEADERS} ${CHARTSHEET_SOURCES})
+source_group(common FILES ${COMMON_HEADERS} ${COMMON_SOURCES})
+source_group(drawing FILES ${DRAWING_HEADERS} ${DRAWING_SOURCES})
+source_group(formula FILES ${FORUMULA_HEADERS} ${FORUMULA_SOURCES})
+source_group(packaging FILES ${PACKAGING_HEADERS} ${PACKAGING_SOURCES})
+source_group(serialization FILES ${SERIALIZATION_HEADERS} ${SERIALIZATION_SOURCES})
+source_group(styles FILES ${STYLES_HEADERS} ${STYLES_SOURCES})
+source_group(workbook FILES ${WORKBOOK_HEADERS} ${WORKBOOK_SOURCES})
+source_group(worksheet FILES ${WORKSHEET_HEADERS} ${WORKSHEET_SOURCES})
+source_group(third-party FILES ../third-party/pugixml/src/pugixml.cpp ../third-party/miniz/miniz.c)
diff --git a/cmake/xlnt.test.cmake b/cmake/xlnt.test.cmake
new file mode 100644
index 00000000..9aa95873
--- /dev/null
+++ b/cmake/xlnt.test.cmake
@@ -0,0 +1,24 @@
+project(xlnt.test)
+
+include_directories(../include)
+include_directories(../source)
+include_directories(../third-party/pugixml/src)
+include_directories(../third-party/cxxtest)
+
+add_executable(xlnt.test ../tests/runner-autogen.cpp)
+
+target_link_libraries(xlnt.test xlnt)
+
+add_custom_target (test-runner 
+    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/generate-tests.sh
+    COMMENT "Generating test runner tests/runner-autogen.cpp"
+)
+
+add_dependencies(xlnt.test test-runner)
+
+add_custom_command(
+    TARGET xlnt.test
+    POST_BUILD
+    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../bin/xlnt.test
+    VERBATIM
+)
diff --git a/include/xlnt/s11n/comment_serializer.hpp b/include/xlnt/serialization/comment_serializer.hpp
similarity index 100%
rename from include/xlnt/s11n/comment_serializer.hpp
rename to include/xlnt/serialization/comment_serializer.hpp
diff --git a/include/xlnt/s11n/excel_serializer.hpp b/include/xlnt/serialization/excel_serializer.hpp
similarity index 100%
rename from include/xlnt/s11n/excel_serializer.hpp
rename to include/xlnt/serialization/excel_serializer.hpp
diff --git a/include/xlnt/s11n/manifest_serializer.hpp b/include/xlnt/serialization/manifest_serializer.hpp
similarity index 100%
rename from include/xlnt/s11n/manifest_serializer.hpp
rename to include/xlnt/serialization/manifest_serializer.hpp
diff --git a/include/xlnt/s11n/relationship_serializer.hpp b/include/xlnt/serialization/relationship_serializer.hpp
similarity index 100%
rename from include/xlnt/s11n/relationship_serializer.hpp
rename to include/xlnt/serialization/relationship_serializer.hpp
diff --git a/include/xlnt/s11n/shared_strings_serializer.hpp b/include/xlnt/serialization/shared_strings_serializer.hpp
similarity index 100%
rename from include/xlnt/s11n/shared_strings_serializer.hpp
rename to include/xlnt/serialization/shared_strings_serializer.hpp
diff --git a/include/xlnt/s11n/style_serializer.hpp b/include/xlnt/serialization/style_serializer.hpp
similarity index 100%
rename from include/xlnt/s11n/style_serializer.hpp
rename to include/xlnt/serialization/style_serializer.hpp
diff --git a/include/xlnt/s11n/theme_serializer.hpp b/include/xlnt/serialization/theme_serializer.hpp
similarity index 100%
rename from include/xlnt/s11n/theme_serializer.hpp
rename to include/xlnt/serialization/theme_serializer.hpp
diff --git a/include/xlnt/s11n/workbook_serializer.hpp b/include/xlnt/serialization/workbook_serializer.hpp
similarity index 100%
rename from include/xlnt/s11n/workbook_serializer.hpp
rename to include/xlnt/serialization/workbook_serializer.hpp
diff --git a/include/xlnt/s11n/worksheet_serializer.hpp b/include/xlnt/serialization/worksheet_serializer.hpp
similarity index 100%
rename from include/xlnt/s11n/worksheet_serializer.hpp
rename to include/xlnt/serialization/worksheet_serializer.hpp
diff --git a/include/xlnt/s11n/xml_document.hpp b/include/xlnt/serialization/xml_document.hpp
similarity index 100%
rename from include/xlnt/s11n/xml_document.hpp
rename to include/xlnt/serialization/xml_document.hpp
diff --git a/include/xlnt/s11n/xml_node.hpp b/include/xlnt/serialization/xml_node.hpp
similarity index 100%
rename from include/xlnt/s11n/xml_node.hpp
rename to include/xlnt/serialization/xml_node.hpp
diff --git a/include/xlnt/s11n/xml_serializer.hpp b/include/xlnt/serialization/xml_serializer.hpp
similarity index 100%
rename from include/xlnt/s11n/xml_serializer.hpp
rename to include/xlnt/serialization/xml_serializer.hpp
diff --git a/source/s11n/comment_serializer.cpp b/source/s11n/comment_serializer.cpp
deleted file mode 100644
index 8acbf765..00000000
--- a/source/s11n/comment_serializer.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <xlnt/s11n/comment_serializer.hpp>
-
-namespace {
-
-} // namespace xlnt
diff --git a/source/serialization/comment_serializer.cpp b/source/serialization/comment_serializer.cpp
new file mode 100644
index 00000000..42760cf5
--- /dev/null
+++ b/source/serialization/comment_serializer.cpp
@@ -0,0 +1,5 @@
+#include <xlnt/serialization/comment_serializer.hpp>
+
+namespace {
+
+} // namespace xlnt
diff --git a/source/s11n/excel_serializer.cpp b/source/serialization/excel_serializer.cpp
similarity index 92%
rename from source/s11n/excel_serializer.cpp
rename to source/serialization/excel_serializer.cpp
index d796c1a7..9a59720b 100644
--- a/source/s11n/excel_serializer.cpp
+++ b/source/serialization/excel_serializer.cpp
@@ -1,18 +1,18 @@
 #include <algorithm>
 #include <iterator>
 
-#include <xlnt/s11n/excel_serializer.hpp>
+#include <xlnt/serialization/excel_serializer.hpp>
 #include <xlnt/common/exceptions.hpp>
-#include <xlnt/s11n/manifest_serializer.hpp>
-#include <xlnt/s11n/relationship_serializer.hpp>
-#include <xlnt/s11n/shared_strings_serializer.hpp>
-#include <xlnt/s11n/style_serializer.hpp>
-#include <xlnt/s11n/theme_serializer.hpp>
-#include <xlnt/s11n/workbook_serializer.hpp>
-#include <xlnt/s11n/worksheet_serializer.hpp>
-#include <xlnt/s11n/xml_document.hpp>
-#include <xlnt/s11n/xml_node.hpp>
-#include <xlnt/s11n/xml_serializer.hpp>
+#include <xlnt/serialization/manifest_serializer.hpp>
+#include <xlnt/serialization/relationship_serializer.hpp>
+#include <xlnt/serialization/shared_strings_serializer.hpp>
+#include <xlnt/serialization/style_serializer.hpp>
+#include <xlnt/serialization/theme_serializer.hpp>
+#include <xlnt/serialization/workbook_serializer.hpp>
+#include <xlnt/serialization/worksheet_serializer.hpp>
+#include <xlnt/serialization/xml_document.hpp>
+#include <xlnt/serialization/xml_node.hpp>
+#include <xlnt/serialization/xml_serializer.hpp>
 #include <xlnt/workbook/document_properties.hpp>
 #include <xlnt/workbook/manifest.hpp>
 #include <xlnt/workbook/workbook.hpp>
diff --git a/source/s11n/manifest_serializer.cpp b/source/serialization/manifest_serializer.cpp
similarity index 93%
rename from source/s11n/manifest_serializer.cpp
rename to source/serialization/manifest_serializer.cpp
index d3276cf6..493a56b4 100644
--- a/source/s11n/manifest_serializer.cpp
+++ b/source/serialization/manifest_serializer.cpp
@@ -1,6 +1,6 @@
-#include <xlnt/s11n/manifest_serializer.hpp>
-#include <xlnt/s11n/xml_document.hpp>
-#include <xlnt/s11n/xml_node.hpp>
+#include <xlnt/serialization/manifest_serializer.hpp>
+#include <xlnt/serialization/xml_document.hpp>
+#include <xlnt/serialization/xml_node.hpp>
 #include <xlnt/workbook/manifest.hpp>
 
 #include "detail/constants.hpp"
diff --git a/source/s11n/relationship_serializer.cpp b/source/serialization/relationship_serializer.cpp
similarity index 93%
rename from source/s11n/relationship_serializer.cpp
rename to source/serialization/relationship_serializer.cpp
index cd381b74..7d809116 100644
--- a/source/s11n/relationship_serializer.cpp
+++ b/source/serialization/relationship_serializer.cpp
@@ -1,9 +1,9 @@
-#include <xlnt/s11n/relationship_serializer.hpp>
+#include <xlnt/serialization/relationship_serializer.hpp>
 
 #include <xlnt/common/relationship.hpp>
 #include <xlnt/common/zip_file.hpp>
-#include <xlnt/s11n/xml_document.hpp>
-#include <xlnt/s11n/xml_node.hpp>
+#include <xlnt/serialization/xml_document.hpp>
+#include <xlnt/serialization/xml_node.hpp>
 
 #include "detail/constants.hpp"
 
diff --git a/source/s11n/shared_strings_serializer.cpp b/source/serialization/shared_strings_serializer.cpp
similarity index 89%
rename from source/s11n/shared_strings_serializer.cpp
rename to source/serialization/shared_strings_serializer.cpp
index 87d45c3d..8a3c10bd 100644
--- a/source/s11n/shared_strings_serializer.cpp
+++ b/source/serialization/shared_strings_serializer.cpp
@@ -1,6 +1,6 @@
-#include <xlnt/s11n/shared_strings_serializer.hpp>
-#include <xlnt/s11n/xml_document.hpp>
-#include <xlnt/s11n/xml_node.hpp>
+#include <xlnt/serialization/shared_strings_serializer.hpp>
+#include <xlnt/serialization/xml_document.hpp>
+#include <xlnt/serialization/xml_node.hpp>
 
 namespace xlnt {
 
diff --git a/source/s11n/style_serializer.cpp b/source/serialization/style_serializer.cpp
similarity index 99%
rename from source/s11n/style_serializer.cpp
rename to source/serialization/style_serializer.cpp
index 63844d46..3068d3e5 100644
--- a/source/s11n/style_serializer.cpp
+++ b/source/serialization/style_serializer.cpp
@@ -1,6 +1,6 @@
-#include <xlnt/s11n/style_serializer.hpp>
-#include <xlnt/s11n/xml_document.hpp>
-#include <xlnt/s11n/xml_node.hpp>
+#include <xlnt/serialization/style_serializer.hpp>
+#include <xlnt/serialization/xml_document.hpp>
+#include <xlnt/serialization/xml_node.hpp>
 #include <xlnt/styles/alignment.hpp>
 #include <xlnt/styles/border.hpp>
 #include <xlnt/styles/fill.hpp>
diff --git a/source/s11n/theme_serializer.cpp b/source/serialization/theme_serializer.cpp
similarity index 99%
rename from source/s11n/theme_serializer.cpp
rename to source/serialization/theme_serializer.cpp
index 2ef78c31..e0050852 100644
--- a/source/s11n/theme_serializer.cpp
+++ b/source/serialization/theme_serializer.cpp
@@ -1,6 +1,6 @@
-#include <xlnt/s11n/theme_serializer.hpp>
-#include <xlnt/s11n/xml_document.hpp>
-#include <xlnt/s11n/xml_node.hpp>
+#include <xlnt/serialization/theme_serializer.hpp>
+#include <xlnt/serialization/xml_document.hpp>
+#include <xlnt/serialization/xml_node.hpp>
 
 #include <detail/constants.hpp>
 
diff --git a/source/s11n/workbook_serializer.cpp b/source/serialization/workbook_serializer.cpp
similarity index 98%
rename from source/s11n/workbook_serializer.cpp
rename to source/serialization/workbook_serializer.cpp
index 1e78c489..7deb0182 100644
--- a/source/s11n/workbook_serializer.cpp
+++ b/source/serialization/workbook_serializer.cpp
@@ -1,11 +1,11 @@
 #include <algorithm>
 
-#include <xlnt/s11n/workbook_serializer.hpp>
+#include <xlnt/serialization/workbook_serializer.hpp>
 #include <xlnt/common/datetime.hpp>
 #include <xlnt/common/exceptions.hpp>
 #include <xlnt/common/relationship.hpp>
-#include <xlnt/s11n/xml_document.hpp>
-#include <xlnt/s11n/xml_node.hpp>
+#include <xlnt/serialization/xml_document.hpp>
+#include <xlnt/serialization/xml_node.hpp>
 #include <xlnt/workbook/document_properties.hpp>
 #include <xlnt/workbook/manifest.hpp>
 #include <xlnt/workbook/named_range.hpp>
diff --git a/source/s11n/worksheet_serializer.cpp b/source/serialization/worksheet_serializer.cpp
similarity index 99%
rename from source/s11n/worksheet_serializer.cpp
rename to source/serialization/worksheet_serializer.cpp
index 757face5..bbd0bf43 100644
--- a/source/s11n/worksheet_serializer.cpp
+++ b/source/serialization/worksheet_serializer.cpp
@@ -1,11 +1,11 @@
 #include <cmath>
 #include <sstream>
 
-#include <xlnt/s11n/worksheet_serializer.hpp>
+#include <xlnt/serialization/worksheet_serializer.hpp>
 #include <xlnt/cell/cell.hpp>
 #include <xlnt/cell/cell_reference.hpp>
-#include <xlnt/s11n/xml_document.hpp>
-#include <xlnt/s11n/xml_node.hpp>
+#include <xlnt/serialization/xml_document.hpp>
+#include <xlnt/serialization/xml_node.hpp>
 #include <xlnt/workbook/workbook.hpp>
 #include <xlnt/worksheet/column_properties.hpp>
 #include <xlnt/worksheet/range.hpp>
diff --git a/source/s11n/xml_document.cpp b/source/serialization/xml_document.cpp
similarity index 92%
rename from source/s11n/xml_document.cpp
rename to source/serialization/xml_document.cpp
index f42fd0bc..5fc63d0d 100644
--- a/source/s11n/xml_document.cpp
+++ b/source/serialization/xml_document.cpp
@@ -1,6 +1,6 @@
-#include <xlnt/s11n/xml_document.hpp>
-#include <xlnt/s11n/xml_node.hpp>
-#include <xlnt/s11n/xml_serializer.hpp>
+#include <xlnt/serialization/xml_document.hpp>
+#include <xlnt/serialization/xml_node.hpp>
+#include <xlnt/serialization/xml_serializer.hpp>
 
 #include <detail/xml_document_impl.hpp>
 #include <detail/xml_node_impl.hpp>
diff --git a/source/s11n/xml_node.cpp b/source/serialization/xml_node.cpp
similarity index 96%
rename from source/s11n/xml_node.cpp
rename to source/serialization/xml_node.cpp
index ee0b0b03..318befe2 100644
--- a/source/s11n/xml_node.cpp
+++ b/source/serialization/xml_node.cpp
@@ -1,5 +1,5 @@
-#include <xlnt/s11n/xml_node.hpp>
-#include <xlnt/s11n/xml_serializer.hpp>
+#include <xlnt/serialization/xml_node.hpp>
+#include <xlnt/serialization/xml_serializer.hpp>
 
 #include <detail/xml_node_impl.hpp>
 
diff --git a/source/s11n/xml_serializer.cpp b/source/serialization/xml_serializer.cpp
similarity index 83%
rename from source/s11n/xml_serializer.cpp
rename to source/serialization/xml_serializer.cpp
index da3d3f8f..bc12e5a7 100644
--- a/source/s11n/xml_serializer.cpp
+++ b/source/serialization/xml_serializer.cpp
@@ -1,8 +1,8 @@
 #include <sstream>
 
-#include <xlnt/s11n/xml_serializer.hpp>
-#include <xlnt/s11n/xml_document.hpp>
-#include <xlnt/s11n/xml_node.hpp>
+#include <xlnt/serialization/xml_serializer.hpp>
+#include <xlnt/serialization/xml_document.hpp>
+#include <xlnt/serialization/xml_node.hpp>
 
 #include "detail/include_pugixml.hpp"
 #include "detail/xml_document_impl.hpp"
diff --git a/source/workbook/workbook.cpp b/source/workbook/workbook.cpp
index 348692e7..63116a39 100644
--- a/source/workbook/workbook.cpp
+++ b/source/workbook/workbook.cpp
@@ -8,7 +8,7 @@
 #include <xlnt/common/relationship.hpp>
 #include <xlnt/common/zip_file.hpp>
 #include <xlnt/drawing/drawing.hpp>
-#include <xlnt/s11n/excel_serializer.hpp>
+#include <xlnt/serialization/excel_serializer.hpp>
 #include <xlnt/styles/alignment.hpp>
 #include <xlnt/styles/border.hpp>
 #include <xlnt/styles/fill.hpp>
diff --git a/tests/helpers/helper.hpp b/tests/helpers/helper.hpp
index cab0c3ff..9f1d5440 100644
--- a/tests/helpers/helper.hpp
+++ b/tests/helpers/helper.hpp
@@ -2,9 +2,9 @@
 
 #include <sstream>
 
-#include <xlnt/s11n/xml_document.hpp>
-#include <xlnt/s11n/xml_node.hpp>
-#include <xlnt/s11n/xml_serializer.hpp>
+#include <xlnt/serialization/xml_document.hpp>
+#include <xlnt/serialization/xml_node.hpp>
+#include <xlnt/serialization/xml_serializer.hpp>
 
 #include "path_helper.hpp"
 
diff --git a/tests/test_props.hpp b/tests/test_props.hpp
index 8bb69d85..af35fd24 100644
--- a/tests/test_props.hpp
+++ b/tests/test_props.hpp
@@ -3,8 +3,8 @@
 #include <iostream>
 #include <cxxtest/TestSuite.h>
 
-#include <xlnt/s11n/workbook_serializer.hpp>
-#include <xlnt/s11n/xml_document.hpp>
+#include <xlnt/serialization/workbook_serializer.hpp>
+#include <xlnt/serialization/xml_document.hpp>
 
 #include "helpers/path_helper.hpp"
 #include "helpers/helper.hpp"
diff --git a/tests/test_read.hpp b/tests/test_read.hpp
index c8db121e..54ab0748 100644
--- a/tests/test_read.hpp
+++ b/tests/test_read.hpp
@@ -5,11 +5,11 @@
 
 #include <cxxtest/TestSuite.h>
 
-#include <xlnt/s11n/excel_serializer.hpp>
-#include <xlnt/s11n/manifest_serializer.hpp>
-#include <xlnt/s11n/relationship_serializer.hpp>
-#include <xlnt/s11n/workbook_serializer.hpp>
-#include <xlnt/s11n/xml_serializer.hpp>
+#include <xlnt/serialization/excel_serializer.hpp>
+#include <xlnt/serialization/manifest_serializer.hpp>
+#include <xlnt/serialization/relationship_serializer.hpp>
+#include <xlnt/serialization/workbook_serializer.hpp>
+#include <xlnt/serialization/xml_serializer.hpp>
 #include <xlnt/workbook/manifest.hpp>
 
 #include "helpers/path_helper.hpp"
diff --git a/tests/test_style_writer.hpp b/tests/test_style_writer.hpp
index 6e2bd0d4..5de61e99 100644
--- a/tests/test_style_writer.hpp
+++ b/tests/test_style_writer.hpp
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <cxxtest/TestSuite.h>
 
-#include <xlnt/s11n/style_serializer.hpp>
+#include <xlnt/serialization/style_serializer.hpp>
 
 class test_style_writer : public CxxTest::TestSuite
 {
diff --git a/tests/test_theme.hpp b/tests/test_theme.hpp
index 80143355..2c70127b 100644
--- a/tests/test_theme.hpp
+++ b/tests/test_theme.hpp
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <cxxtest/TestSuite.h>
 
-#include <xlnt/s11n/theme_serializer.hpp>
+#include <xlnt/serialization/theme_serializer.hpp>
 #include <xlnt/workbook/workbook.hpp>
 
 #include "helpers/path_helper.hpp"
diff --git a/tests/test_worksheet.hpp b/tests/test_worksheet.hpp
index 27d6e443..230a90c6 100644
--- a/tests/test_worksheet.hpp
+++ b/tests/test_worksheet.hpp
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <cxxtest/TestSuite.h>
 
-#include <xlnt/s11n/worksheet_serializer.hpp>
+#include <xlnt/serialization/worksheet_serializer.hpp>
 #include <xlnt/worksheet/worksheet.hpp>
 
 class test_worksheet : public CxxTest::TestSuite
diff --git a/tests/test_write.hpp b/tests/test_write.hpp
index 66b6ecec..4fd940ed 100644
--- a/tests/test_write.hpp
+++ b/tests/test_write.hpp
@@ -3,10 +3,10 @@
 #include <iostream>
 #include <cxxtest/TestSuite.h>
 
-#include <xlnt/s11n/relationship_serializer.hpp>
-#include <xlnt/s11n/shared_strings_serializer.hpp>
-#include <xlnt/s11n/workbook_serializer.hpp>
-#include <xlnt/s11n/worksheet_serializer.hpp>
+#include <xlnt/serialization/relationship_serializer.hpp>
+#include <xlnt/serialization/shared_strings_serializer.hpp>
+#include <xlnt/serialization/workbook_serializer.hpp>
+#include <xlnt/serialization/worksheet_serializer.hpp>
 #include <xlnt/workbook/workbook.hpp>
 
 #include "helpers/temporary_file.hpp"
diff --git a/tests/test_write_workbook.hpp b/tests/test_write_workbook.hpp
index 632ca01d..78949f9b 100644
--- a/tests/test_write_workbook.hpp
+++ b/tests/test_write_workbook.hpp
@@ -4,7 +4,7 @@
 #include <cxxtest/TestSuite.h>
 
 #include <xlnt/common/exceptions.hpp>
-#include <xlnt/s11n/workbook_serializer.hpp>
+#include <xlnt/serialization/workbook_serializer.hpp>
 
 #include "helpers/path_helper.hpp"