diff --git a/build-scripts/cmake/CMakeLists.txt b/build-scripts/cmake/CMakeLists.txt
deleted file mode 100644
index 7fc0af57..00000000
--- a/build-scripts/cmake/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-cmake_minimum_required(VERSION 2.8.9)
-project(xlnt)
-
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../../../lib)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../../../bin)
-
-add_subdirectory(xlnt)
-add_subdirectory(xlnt.test)
diff --git a/build b/build/build
similarity index 100%
rename from build
rename to build/build
diff --git a/build-scripts/build-osx.sh b/build/build-osx.sh
similarity index 100%
rename from build-scripts/build-osx.sh
rename to build/build-osx.sh
diff --git a/clean b/build/clean
similarity index 100%
rename from clean
rename to build/clean
diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt
new file mode 100644
index 00000000..378e630e
--- /dev/null
+++ b/build/cmake/CMakeLists.txt
@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 3.3.2)
+
+project(xlnt)
+
+set(CMAKE_OSX_DEPLOYMENT_TARGET 10.10)
+
+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)
+endforeach(OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES)
+
+add_subdirectory(xlnt)
+add_subdirectory(xlnt.test)
diff --git a/build-scripts/cmake/build-osx.sh b/build/cmake/build-osx.sh
similarity index 100%
rename from build-scripts/cmake/build-osx.sh
rename to build/cmake/build-osx.sh
diff --git a/build-scripts/cmake/xlnt.test/CMakeLists.txt b/build/cmake/xlnt.test/CMakeLists.txt
similarity index 100%
rename from build-scripts/cmake/xlnt.test/CMakeLists.txt
rename to build/cmake/xlnt.test/CMakeLists.txt
diff --git a/build-scripts/cmake/xlnt/CMakeLists.txt b/build/cmake/xlnt/CMakeLists.txt
similarity index 98%
rename from build-scripts/cmake/xlnt/CMakeLists.txt
rename to build/cmake/xlnt/CMakeLists.txt
index 3033a082..64652a72 100644
--- a/build-scripts/cmake/xlnt/CMakeLists.txt
+++ b/build/cmake/xlnt/CMakeLists.txt
@@ -7,4 +7,5 @@ include_directories(../../../third-party/pugixml/src)
 
 FILE(GLOB SOURCES ../../../source/*.cpp)
 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)
\ No newline at end of file
+add_library(xlnt STATIC ${SOURCES} ${DETAIL_SOURCES} ../../../third-party/pugixml/src/pugixml.cpp ../../../third-party/miniz/miniz.c)
+
diff --git a/build-scripts/genie/build-osx.sh b/build/genie/build-osx.sh
similarity index 100%
rename from build-scripts/genie/build-osx.sh
rename to build/genie/build-osx.sh
diff --git a/build-scripts/genie/genie-linux b/build/genie/genie-linux
similarity index 100%
rename from build-scripts/genie/genie-linux
rename to build/genie/genie-linux
diff --git a/build-scripts/genie/genie-osx b/build/genie/genie-osx
similarity index 100%
rename from build-scripts/genie/genie-osx
rename to build/genie/genie-osx
diff --git a/build-scripts/genie/genie-win.exe b/build/genie/genie-win.exe
similarity index 100%
rename from build-scripts/genie/genie-win.exe
rename to build/genie/genie-win.exe
diff --git a/build-scripts/genie/genie.lua b/build/genie/genie.lua
similarity index 100%
rename from build-scripts/genie/genie.lua
rename to build/genie/genie.lua
diff --git a/test b/build/test
similarity index 76%
rename from test
rename to build/test
index 7e7c5433..da36d2d3 100755
--- a/test
+++ b/build/test
@@ -4,8 +4,8 @@ import os
 import subprocess
 
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
-if not os.path.isfile('bin/xlnt.test'):
-   subprocess.call('./build')
+subprocess.call('./build')
+
 if os.path.isdir('./bin') and os.path.isfile('./bin/xlnt.test'):
    os.chdir('./bin')
    subprocess.call(['./xlnt.test'])