diff --git a/config.m4 b/config.m4
index ea90db7..b913a1e 100644
--- a/config.m4
+++ b/config.m4
@@ -31,5 +31,12 @@ if test "$PHP_WIKIDIFF2" != "no"; then
   PHP_SUBST(WIKIDIFF2_SHARED_LIBADD)
   AC_DEFINE(HAVE_WIKIDIFF2, 1, [ ])
   export CXXFLAGS="-Wno-write-strings -std=c++11 $CXXFLAGS"
-  PHP_NEW_EXTENSION(wikidiff2, php_wikidiff2.cpp Wikidiff2.cpp Formatter.cpp TableFormatter.cpp InlineFormatter.cpp InlineJSONFormatter.cpp TextUtil.cpp, $ext_shared)
+  PHP_NEW_EXTENSION(wikidiff2, \
+	src/php_wikidiff2.cpp \
+	src/lib/Wikidiff2.cpp \
+	src/lib/Formatter.cpp \
+	src/lib/TableFormatter.cpp \
+	src/lib/InlineFormatter.cpp \
+	src/lib/InlineJSONFormatter.cpp \
+	src/lib/TextUtil.cpp, $ext_shared)
 fi
diff --git a/DiffEngine.h b/src/lib/DiffEngine.h
similarity index 100%
rename from DiffEngine.h
rename to src/lib/DiffEngine.h
diff --git a/Formatter.cpp b/src/lib/Formatter.cpp
similarity index 100%
rename from Formatter.cpp
rename to src/lib/Formatter.cpp
diff --git a/Formatter.h b/src/lib/Formatter.h
similarity index 100%
rename from Formatter.h
rename to src/lib/Formatter.h
diff --git a/InlineFormatter.cpp b/src/lib/InlineFormatter.cpp
similarity index 100%
rename from InlineFormatter.cpp
rename to src/lib/InlineFormatter.cpp
diff --git a/InlineFormatter.h b/src/lib/InlineFormatter.h
similarity index 100%
rename from InlineFormatter.h
rename to src/lib/InlineFormatter.h
diff --git a/InlineJSONFormatter.cpp b/src/lib/InlineJSONFormatter.cpp
similarity index 100%
rename from InlineJSONFormatter.cpp
rename to src/lib/InlineJSONFormatter.cpp
diff --git a/InlineJSONFormatter.h b/src/lib/InlineJSONFormatter.h
similarity index 100%
rename from InlineJSONFormatter.h
rename to src/lib/InlineJSONFormatter.h
diff --git a/IntSet.h b/src/lib/IntSet.h
similarity index 100%
rename from IntSet.h
rename to src/lib/IntSet.h
diff --git a/TableFormatter.cpp b/src/lib/TableFormatter.cpp
similarity index 100%
rename from TableFormatter.cpp
rename to src/lib/TableFormatter.cpp
diff --git a/TableFormatter.h b/src/lib/TableFormatter.h
similarity index 100%
rename from TableFormatter.h
rename to src/lib/TableFormatter.h
diff --git a/TextUtil.cpp b/src/lib/TextUtil.cpp
similarity index 100%
rename from TextUtil.cpp
rename to src/lib/TextUtil.cpp
diff --git a/TextUtil.h b/src/lib/TextUtil.h
similarity index 100%
rename from TextUtil.h
rename to src/lib/TextUtil.h
diff --git a/Wikidiff2.cpp b/src/lib/Wikidiff2.cpp
similarity index 100%
rename from Wikidiff2.cpp
rename to src/lib/Wikidiff2.cpp
diff --git a/Wikidiff2.h b/src/lib/Wikidiff2.h
similarity index 100%
rename from Wikidiff2.h
rename to src/lib/Wikidiff2.h
diff --git a/Word.h b/src/lib/Word.h
similarity index 100%
rename from Word.h
rename to src/lib/Word.h
diff --git a/php_cpp_allocator.h b/src/lib/php_cpp_allocator.h
similarity index 100%
rename from php_cpp_allocator.h
rename to src/lib/php_cpp_allocator.h
diff --git a/wd2_allocator.h b/src/lib/wd2_allocator.h
similarity index 100%
rename from wd2_allocator.h
rename to src/lib/wd2_allocator.h
diff --git a/php_wikidiff2.cpp b/src/php_wikidiff2.cpp
similarity index 98%
rename from php_wikidiff2.cpp
rename to src/php_wikidiff2.cpp
index 99ee430..214196c 100644
--- a/php_wikidiff2.cpp
+++ b/src/php_wikidiff2.cpp
@@ -9,10 +9,10 @@
 #include "ext/standard/info.h"
 #include "zend_API.h"
 #include "php_wikidiff2.h"
-#include "Wikidiff2.h"
-#include "TableFormatter.h"
-#include "InlineFormatter.h"
-#include "InlineJSONFormatter.h"
+#include "lib/Wikidiff2.h"
+#include "lib/TableFormatter.h"
+#include "lib/InlineFormatter.h"
+#include "lib/InlineJSONFormatter.h"
 
 #define WIKIDIFF2_VERSION_STRING "1.13.0"
 
diff --git a/php_wikidiff2.h b/src/php_wikidiff2.h
similarity index 100%
rename from php_wikidiff2.h
rename to src/php_wikidiff2.h
diff --git a/wikidiff2.stub.php b/src/wikidiff2.stub.php
similarity index 100%
rename from wikidiff2.stub.php
rename to src/wikidiff2.stub.php
diff --git a/wikidiff2_arginfo.h b/src/wikidiff2_arginfo.h
similarity index 100%
rename from wikidiff2_arginfo.h
rename to src/wikidiff2_arginfo.h
diff --git a/DiffTest/Api.php b/tools/DiffTest/Api.php
similarity index 100%
rename from DiffTest/Api.php
rename to tools/DiffTest/Api.php
diff --git a/DiffTest/Change.php b/tools/DiffTest/Change.php
similarity index 100%
rename from DiffTest/Change.php
rename to tools/DiffTest/Change.php
diff --git a/DiffTest/Differ.php b/tools/DiffTest/Differ.php
similarity index 100%
rename from DiffTest/Differ.php
rename to tools/DiffTest/Differ.php
diff --git a/DiffTest/test.php b/tools/DiffTest/test.php
similarity index 100%
rename from DiffTest/test.php
rename to tools/DiffTest/test.php
diff --git a/FuzzTest/fuzz.php b/tools/FuzzTest/fuzz.php
similarity index 100%
rename from FuzzTest/fuzz.php
rename to tools/FuzzTest/fuzz.php
diff --git a/FuzzTest/random.php b/tools/FuzzTest/random.php
similarity index 100%
rename from FuzzTest/random.php
rename to tools/FuzzTest/random.php
diff --git a/benchmarks/bench.php b/tools/benchmarks/bench.php
similarity index 100%
rename from benchmarks/bench.php
rename to tools/benchmarks/bench.php
diff --git a/benchmarks/chinese-reverse-bench.php b/tools/benchmarks/chinese-reverse-bench.php
similarity index 100%
rename from benchmarks/chinese-reverse-bench.php
rename to tools/benchmarks/chinese-reverse-bench.php
diff --git a/benchmarks/chinese-reverse.zip b/tools/benchmarks/chinese-reverse.zip
similarity index 100%
rename from benchmarks/chinese-reverse.zip
rename to tools/benchmarks/chinese-reverse.zip
diff --git a/benchmarks/revs.json.gz b/tools/benchmarks/revs.json.gz
similarity index 100%
rename from benchmarks/revs.json.gz
rename to tools/benchmarks/revs.json.gz
diff --git a/demo/demo.php b/tools/demo/demo.php
similarity index 100%
rename from demo/demo.php
rename to tools/demo/demo.php
diff --git a/demo/diff.css b/tools/demo/diff.css
similarity index 100%
rename from demo/diff.css
rename to tools/demo/diff.css
diff --git a/wikidiff2.ini b/wikidiff2.ini
deleted file mode 100644
index 2e5751a..0000000
--- a/wikidiff2.ini
+++ /dev/null
@@ -1 +0,0 @@
-extension=wikidiff2.so