diff --git a/Makefile.in b/Makefile.in
index 315b28e..792d1c1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -27,28 +27,28 @@ PROGRAMS=\
 all: $(PROGRAMS)
 
 SOURCE=\
-	checksum.cc \
-	endian_utils.cc \
-	error_set.cc \
-	hex_dump.cc \
-	human_readable_format.cc \
-	metadata.cc \
-	metadata_checker.cc \
-	metadata_dumper.cc \
-	metadata_disk_structures.cc \
-	restore_emitter.cc \
-	space_map.cc \
-	space_map_disk.cc \
-	space_map_recursive.cc \
-	space_map_transactional.cc \
-	thin_pool.cc \
-	transaction_manager.cc \
-	xml_format.cc
+	persistent-data/checksum.cc \
+	persistent-data/endian_utils.cc \
+	persistent-data/error_set.cc \
+	persistent-data/hex_dump.cc \
+	persistent-data/space_map.cc \
+	persistent-data/space_map_disk.cc \
+	persistent-data/space_map_recursive.cc \
+	persistent-data/space_map_transactional.cc \
+	persistent-data/transaction_manager.cc \
+	thin-provisioning/human_readable_format.cc \
+	thin-provisioning/metadata.cc \
+	thin-provisioning/metadata_checker.cc \
+	thin-provisioning/metadata_disk_structures.cc \
+	thin-provisioning/metadata_dumper.cc \
+	thin-provisioning/restore_emitter.cc \
+	thin-provisioning/thin_pool.cc \
+	thin-provisioning/xml_format.cc
 
 PROGRAM_SOURCE=\
-	thin_check.cc \
-	thin_dump.cc \
-	thin_restore.cc
+	thin-provisioning/thin_check.cc \
+	thin-provisioning/thin_dump.cc \
+	thin-provisioning/thin_restore.cc
 
 CXX:=@CXX@
 OBJECTS:=$(subst .cc,.o,$(SOURCE))
@@ -57,7 +57,7 @@ TOP_BUILDDIR:=@top_builddir@
 CXXFLAGS+=-Wall -fno-strict-aliasing
 CXXFLAGS+=@CXXOPTIMISE_FLAG@
 CXXFLAGS+=@CXXDEBUG_FLAG@
-INCLUDES+=-I$(TOP_BUILDDIR) -I$(TOP_DIR)
+INCLUDES+=-I$(TOP_BUILDDIR) -I$(TOP_DIR) -I$(TOP_DIR)/thin-provisioning
 LIBS:=-lstdc++
 LIBEXPAT:=-lexpat
 INSTALL:=@INSTALL@
@@ -86,40 +86,59 @@ test-programs: $(TEST_PROGRAMS)
 %.o: %.cc
 	$(CXX) -c $(INCLUDES) $(CXXFLAGS) -o $@ $<
 
+# CACHE_CHECK_SOURCE=\
+# 	persistent-data/checksum.cc \
+# 	persistent-data/endian_utils.cc \
+# 	persistent-data/error_set.cc \
+# 	persistent-data/hex_dump.cc \
+# 	cacmetadata.cc \
+# 	metadata_checker.cc \
+# 	cache_metadata_disk_structures.cc \
+# 	space_map.cc \
+# 	space_map_disk.cc \
+# 	space_map_recursive.cc \
+# 	space_map_transactional.cc \
+# 	transaction_manager.cc
+
 THIN_DEBUG_SOURCE=$(SOURCE)
 THIN_DUMP_SOURCE=$(SOURCE)
 THIN_RESTORE_SOURCE=$(SOURCE)
 THIN_CHECK_SOURCE=\
-	checksum.cc \
-	endian_utils.cc \
-	error_set.cc \
-	hex_dump.cc \
-	metadata.cc \
-	metadata_checker.cc \
-	metadata_disk_structures.cc \
-	space_map.cc \
-	space_map_disk.cc \
-	space_map_recursive.cc \
-	space_map_transactional.cc \
-	transaction_manager.cc
+	persistent-data/checksum.cc \
+	persistent-data/endian_utils.cc \
+	persistent-data/error_set.cc \
+	persistent-data/hex_dump.cc \
+	persistent-data/space_map.cc \
+	persistent-data/space_map_disk.cc \
+	persistent-data/space_map_recursive.cc \
+	persistent-data/space_map_transactional.cc \
+	persistent-data/transaction_manager.cc \
+	thin-provisioning/metadata.cc \
+	thin-provisioning/metadata_checker.cc \
+	thin-provisioning/metadata_disk_structures.cc
+
+#CACHE_CHECK_OBJECTS=$(subst .cc,.o,$(CACHE_CHECK_SOURCE))
 
 THIN_DEBUG_OBJECTS=$(subst .cc,.o,$(THIN_DEBUG_SOURCE))
 THIN_DUMP_OBJECTS=$(subst .cc,.o,$(THIN_DUMP_SOURCE))
 THIN_RESTORE_OBJECTS=$(subst .cc,.o,$(THIN_RESTORE_SOURCE))
 THIN_CHECK_OBJECTS=$(subst .cc,.o,$(THIN_CHECK_SOURCE))
 
-thin_debug: $(THIN_DEBUG_OBJECTS) thin_debug.o
+thin_debug: $(THIN_DEBUG_OBJECTS) thin-provisioning/thin_debug.o
 	$(CXX) $(CXXFLAGS) -o $@ $+ $(LIBS) $(LIBEXPAT)
 
-thin_dump: $(THIN_DUMP_OBJECTS) thin_dump.o
+thin_dump: $(THIN_DUMP_OBJECTS) thin-provisioning/thin_dump.o
 	$(CXX) $(CXXFLAGS) -o $@ $+ $(LIBS) $(LIBEXPAT)
 
-thin_restore: $(THIN_RESTORE_OBJECTS) thin_restore.o
+thin_restore: $(THIN_RESTORE_OBJECTS) thin-provisioning/thin_restore.o
 	$(CXX) $(CXXFLAGS) -o $@ $+ $(LIBS) $(LIBEXPAT)
 
-thin_check: $(THIN_CHECK_OBJECTS) thin_check.o
+thin_check: $(THIN_CHECK_OBJECTS) thin-provisioning/thin_check.o
 	$(CXX) $(CXXFLAGS) -o $@ $+ $(LIBS)
 
+#cache_check: $(CACHE_CHECK_OBJECTS) cache_check.o
+#	$(CXX) $(CXXFLAGS) -o $@ $+ $(LIBS)
+
 clean:
 	$(RM) *.o unit-tests/*.o *.d unit-tests/*.d $(TEST_PROGRAMS) $(PROGRAMS)
 distclean: clean
diff --git a/cache.h b/cache.h
deleted file mode 100644
index b13e864..0000000
--- a/cache.h
+++ /dev/null
@@ -1,270 +0,0 @@
-// Copyright (C) 2011 Red Hat, Inc. All rights reserved.
-//
-// This file is part of the thin-provisioning-tools source.
-//
-// thin-provisioning-tools is free software: you can redistribute it
-// and/or modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation, either version 3 of
-// the License, or (at your option) any later version.
-//
-// thin-provisioning-tools is distributed in the hope that it will be
-// useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with thin-provisioning-tools.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-#ifndef CACHE_H
-#define CACHE_H
-
-#include "deleter.h"
-
-#include <boost/intrusive/circular_list_algorithms.hpp>
-#include <boost/intrusive/rbtree_algorithms.hpp>
-#include <boost/optional.hpp>
-#include <list>
-#include <map>
-#include <memory>
-#include <stdexcept>
-
-//----------------------------------------------------------------
-
-namespace base {
-	// ValueTraits needs to define value_type, key_type and a get_key()
-	// static function.  Commonly you will want value_type to be a
-	// shared_ptr, with any teardown specific stuff in the destructor.
-	template <typename ValueTraits>
-	class cache {
-	public:
-		typedef typename ValueTraits::value_type value_type;
-		typedef typename ValueTraits::key_type key_type;
-
-		cache(unsigned max_entries);
-		~cache();
-
-		void insert(value_type const &v);
-
-		boost::optional<value_type> get(key_type const &k);
-		void put(value_type const &k);
-
-		template <typename T>
-		void iterate_unheld(T fn) const;
-
-	private:
-		void make_space();
-
-		struct value_entry {
-			// FIXME: this means the cached object must have a
-			// default constructor also, which is a shame.
-			// so we can construct the headers.
-			value_entry()
-				: ref_count_(1) {
-			}
-
-			explicit value_entry(value_type v)
-				: ref_count_(1),
-				  v_(v) {
-			}
-
-			struct {
-				value_entry *next_, *prev_;
-			} lru_;
-
-			struct {
-				value_entry *parent_, *left_, *right_;
-				int color_;
-			} lookup_;
-
-			unsigned ref_count_;
-			value_type v_;
-		};
-
-		struct value_ptr_cmp {
-			bool operator() (value_entry const *lhs, value_entry const *rhs) {
-				key_type k1 = ValueTraits::get_key(lhs->v_);
-				key_type k2 = ValueTraits::get_key(rhs->v_);
-
-				return k1 < k2;
-			}
-		};
-
-		struct key_value_ptr_cmp {
-			bool operator() (key_type const &k1, value_entry const *rhs) {
-				key_type k2 = ValueTraits::get_key(rhs->v_);
-				return k1 < k2;
-			}
-
-			bool operator() (value_entry const *lhs, key_type const &k2) {
-				key_type k1 = ValueTraits::get_key(lhs->v_);
-				return k1 < k2;
-			}
-
-		};
-
-		struct list_node_traits {
-			typedef value_entry node;
-			typedef value_entry *node_ptr;
-			typedef const value_entry *const_node_ptr;
-
-			static node_ptr get_next(const_node_ptr n) {
-				return n->lru_.next_;
-			}
-
-			static void set_next(node_ptr n, node_ptr next) {
-				n->lru_.next_ = next;
-			}
-
-			static node_ptr get_previous(const_node_ptr n) {
-				return n->lru_.prev_;
-			}
-
-			static void set_previous(node_ptr n, node_ptr prev) {
-				n->lru_.prev_ = prev;
-			}
-		};
-
-		struct rbtree_node_traits {
-			typedef value_entry node;
-			typedef value_entry *node_ptr;
-			typedef const value_entry * const_node_ptr;
-			typedef int color;
-
-			static node_ptr get_parent(const_node_ptr n) {
-				return n->lookup_.parent_;
-			}
-
-			static void set_parent(node_ptr n, node_ptr parent) {
-				n->lookup_.parent_ = parent;
-			}
-
-			static node_ptr get_left(const_node_ptr n) {
-				return n->lookup_.left_;
-			}
-
-			static void set_left(node_ptr n, node_ptr left) {
-				n->lookup_.left_ = left;
-			}
-
-			static node_ptr get_right(const_node_ptr n) {
-				return n->lookup_.right_;
-			}
-
-			static void set_right(node_ptr n, node_ptr right) {
-				n->lookup_.right_ = right;
-			}
-
-			static int get_color(const_node_ptr n) {
-				return n->lookup_.color_;
-			}
-
-			static void set_color(node_ptr n, color c) {
-				n->lookup_.color_ = c;
-			}
-
-			static color red() {
-				return 0;
-			}
-
-			static color black() {
-				return 1;
-			}
-		};
-
-		typedef boost::intrusive::circular_list_algorithms<list_node_traits> lru_algo;
-		typedef boost::intrusive::rbtree_algorithms<rbtree_node_traits> lookup_algo;
-
-		unsigned max_entries_;
-		unsigned current_entries_;
-
-		value_entry lru_header_;
-		value_entry lookup_header_;
-	};
-
-	template <typename ValueTraits>
-	cache<ValueTraits>::cache(unsigned max_entries)
-		: max_entries_(max_entries),
-		  current_entries_(0) {
-		lru_algo::init_header(&lru_header_);
-		lookup_algo::init_header(&lookup_header_);
-	}
-
-	template <typename ValueTraits>
-	cache<ValueTraits>::~cache() {
-		utils::deleter<value_entry> d;
-		lookup_algo::clear_and_dispose(&lookup_header_, d);
-	}
-
-	template <typename ValueTraits>
-	void
-	cache<ValueTraits>::insert(value_type const &v) {
-		make_space();
-
-		std::auto_ptr<value_entry> node(new value_entry(v));
-		value_ptr_cmp cmp;
-		lookup_algo::insert_equal(&lookup_header_, &lookup_header_, node.get(), cmp);
-		node.release();
-		current_entries_++;
-	}
-
-	template <typename ValueTraits>
-	boost::optional<typename ValueTraits::value_type>
-	cache<ValueTraits>::get(key_type const &k) {
-		key_value_ptr_cmp cmp;
-		value_entry *node = lookup_algo::find(&lookup_header_, k, cmp);
-		if (node == &lookup_header_)
-			return boost::optional<value_type>();
-
-		if (!node->ref_count_++)
-			lru_algo::unlink(node);
-		return boost::optional<value_type>(node->v_);
-	}
-
-	template <typename ValueTraits>
-	void
-	cache<ValueTraits>::put(value_type const &v) {
-		// FIXME: the lookup will go once we use a proper hook
-		key_value_ptr_cmp cmp;
-		key_type k = ValueTraits::get_key(v);
-		value_entry *node = lookup_algo::find(&lookup_header_, k, cmp);
-		if (node == &lookup_header_)
-			throw std::runtime_error("invalid put");
-
-		if (node->ref_count_ == 0)
-			throw std::runtime_error("invalid put");
-
-		if (!--node->ref_count_)
-			lru_algo::link_after(&lru_header_, node);
-	}
-
-	template <typename ValueTraits>
-	void
-	cache<ValueTraits>::make_space() {
-		if (current_entries_ == max_entries_) {
-			value_entry *node = lru_header_.lru_.prev_;
-			if (node == &lru_header_)
-				throw std::runtime_error("cache full");
-
-			lru_algo::unlink(node);
-			lookup_algo::unlink(node);
-			delete node;
-			current_entries_--;
-		}
-	}
-
-	template <typename ValueTraits>
-	template <typename T>
-	void
-	cache<ValueTraits>::iterate_unheld(T fn) const {
-		value_entry *n = lru_header_.lru_.next_;
-		while (n != &lru_header_) {
-			fn(n->v_);
-			n = n->lru_.next_;
-		}
-	}
-}
-
-//----------------------------------------------------------------
-
-#endif
diff --git a/block.h b/persistent-data/block.h
similarity index 99%
rename from block.h
rename to persistent-data/block.h
index 7af2cdd..62b9ad8 100644
--- a/block.h
+++ b/persistent-data/block.h
@@ -19,7 +19,7 @@
 #ifndef BLOCK_H
 #define BLOCK_H
 
-#include "cache.h"
+#include "persistent-data/cache.h"
 
 #include <stdint.h>
 #include <map>
diff --git a/block.tcc b/persistent-data/block.tcc
similarity index 100%
rename from block.tcc
rename to persistent-data/block.tcc
diff --git a/block_counter.h b/persistent-data/block_counter.h
similarity index 100%
rename from block_counter.h
rename to persistent-data/block_counter.h
diff --git a/btree.h b/persistent-data/btree.h
similarity index 100%
rename from btree.h
rename to persistent-data/btree.h
diff --git a/btree.tcc b/persistent-data/btree.tcc
similarity index 100%
rename from btree.tcc
rename to persistent-data/btree.tcc
diff --git a/btree_checker.h b/persistent-data/btree_checker.h
similarity index 100%
rename from btree_checker.h
rename to persistent-data/btree_checker.h
diff --git a/checksum.cc b/persistent-data/checksum.cc
similarity index 100%
rename from checksum.cc
rename to persistent-data/checksum.cc
diff --git a/checksum.h b/persistent-data/checksum.h
similarity index 100%
rename from checksum.h
rename to persistent-data/checksum.h
diff --git a/deleter.h b/persistent-data/deleter.h
similarity index 100%
rename from deleter.h
rename to persistent-data/deleter.h
diff --git a/endian_utils.cc b/persistent-data/endian_utils.cc
similarity index 100%
rename from endian_utils.cc
rename to persistent-data/endian_utils.cc
diff --git a/endian_utils.h b/persistent-data/endian_utils.h
similarity index 100%
rename from endian_utils.h
rename to persistent-data/endian_utils.h
diff --git a/error_set.cc b/persistent-data/error_set.cc
similarity index 100%
rename from error_set.cc
rename to persistent-data/error_set.cc
diff --git a/error_set.h b/persistent-data/error_set.h
similarity index 100%
rename from error_set.h
rename to persistent-data/error_set.h
diff --git a/errors.h b/persistent-data/errors.h
similarity index 100%
rename from errors.h
rename to persistent-data/errors.h
diff --git a/hex_dump.cc b/persistent-data/hex_dump.cc
similarity index 100%
rename from hex_dump.cc
rename to persistent-data/hex_dump.cc
diff --git a/hex_dump.h b/persistent-data/hex_dump.h
similarity index 100%
rename from hex_dump.h
rename to persistent-data/hex_dump.h
diff --git a/math_utils.h b/persistent-data/math_utils.h
similarity index 100%
rename from math_utils.h
rename to persistent-data/math_utils.h
diff --git a/run_list.h b/persistent-data/run_list.h
similarity index 100%
rename from run_list.h
rename to persistent-data/run_list.h
diff --git a/run_list.tcc b/persistent-data/run_list.tcc
similarity index 100%
rename from run_list.tcc
rename to persistent-data/run_list.tcc
diff --git a/space_map.cc b/persistent-data/space_map.cc
similarity index 100%
rename from space_map.cc
rename to persistent-data/space_map.cc
diff --git a/space_map.h b/persistent-data/space_map.h
similarity index 100%
rename from space_map.h
rename to persistent-data/space_map.h
diff --git a/space_map_core.h b/persistent-data/space_map_core.h
similarity index 100%
rename from space_map_core.h
rename to persistent-data/space_map_core.h
diff --git a/space_map_disk.cc b/persistent-data/space_map_disk.cc
similarity index 100%
rename from space_map_disk.cc
rename to persistent-data/space_map_disk.cc
diff --git a/space_map_disk.h b/persistent-data/space_map_disk.h
similarity index 100%
rename from space_map_disk.h
rename to persistent-data/space_map_disk.h
diff --git a/space_map_recursive.cc b/persistent-data/space_map_recursive.cc
similarity index 99%
rename from space_map_recursive.cc
rename to persistent-data/space_map_recursive.cc
index a12cbc0..d90e231 100644
--- a/space_map_recursive.cc
+++ b/persistent-data/space_map_recursive.cc
@@ -16,7 +16,7 @@
 // with thin-provisioning-tools.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-#include "space_map_recursive.h"
+#include "persistent-data/space_map_recursive.h"
 
 using namespace persistent_data;
 
diff --git a/space_map_recursive.h b/persistent-data/space_map_recursive.h
similarity index 100%
rename from space_map_recursive.h
rename to persistent-data/space_map_recursive.h
diff --git a/space_map_transactional.cc b/persistent-data/space_map_transactional.cc
similarity index 98%
rename from space_map_transactional.cc
rename to persistent-data/space_map_transactional.cc
index 04ae95c..242c600 100644
--- a/space_map_transactional.cc
+++ b/persistent-data/space_map_transactional.cc
@@ -16,7 +16,7 @@
 // with thin-provisioning-tools.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-#include "space_map_transactional.h"
+#include "persistent-data/space_map_transactional.h"
 
 //----------------------------------------------------------------
 
diff --git a/space_map_transactional.h b/persistent-data/space_map_transactional.h
similarity index 100%
rename from space_map_transactional.h
rename to persistent-data/space_map_transactional.h
diff --git a/transaction_manager.cc b/persistent-data/transaction_manager.cc
similarity index 98%
rename from transaction_manager.cc
rename to persistent-data/transaction_manager.cc
index ad9e26b..7374855 100644
--- a/transaction_manager.cc
+++ b/persistent-data/transaction_manager.cc
@@ -16,7 +16,7 @@
 // with thin-provisioning-tools.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-#include "transaction_manager.h"
+#include "persistent-data/transaction_manager.h"
 
 #include <string.h>
 
diff --git a/transaction_manager.h b/persistent-data/transaction_manager.h
similarity index 100%
rename from transaction_manager.h
rename to persistent-data/transaction_manager.h
diff --git a/emitter.h b/thin-provisioning/emitter.h
similarity index 100%
rename from emitter.h
rename to thin-provisioning/emitter.h
diff --git a/human_readable_format.cc b/thin-provisioning/human_readable_format.cc
similarity index 100%
rename from human_readable_format.cc
rename to thin-provisioning/human_readable_format.cc
diff --git a/human_readable_format.h b/thin-provisioning/human_readable_format.h
similarity index 100%
rename from human_readable_format.h
rename to thin-provisioning/human_readable_format.h
diff --git a/main.cc b/thin-provisioning/main.cc
similarity index 100%
rename from main.cc
rename to thin-provisioning/main.cc
diff --git a/metadata.cc b/thin-provisioning/metadata.cc
similarity index 97%
rename from metadata.cc
rename to thin-provisioning/metadata.cc
index 2253d8b..d3fc8c1 100644
--- a/metadata.cc
+++ b/thin-provisioning/metadata.cc
@@ -16,11 +16,11 @@
 // with thin-provisioning-tools.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-#include "metadata.h"
+#include "thin-provisioning/metadata.h"
 
-#include "math_utils.h"
-#include "space_map_core.h"
-#include "space_map_disk.h"
+#include "persistent-data/math_utils.h"
+#include "persistent-data/space_map_core.h"
+#include "persistent-data/space_map_disk.h"
 
 #include <linux/fs.h>
 #include <sys/ioctl.h>
diff --git a/metadata.h b/thin-provisioning/metadata.h
similarity index 94%
rename from metadata.h
rename to thin-provisioning/metadata.h
index 12f9f0c..edbea19 100644
--- a/metadata.h
+++ b/thin-provisioning/metadata.h
@@ -19,12 +19,12 @@
 #ifndef METADATA_LL_H
 #define METADATA_LL_H
 
-#include "block.h"
-#include "btree.h"
-#include "endian_utils.h"
-#include "metadata_disk_structures.h"
-#include "space_map_disk.h"
-#include "transaction_manager.h"
+#include "persistent-data/block.h"
+#include "persistent-data/btree.h"
+#include "persistent-data/endian_utils.h"
+#include "thin-provisioning/metadata_disk_structures.h"
+#include "persistent-data/space_map_disk.h"
+#include "persistent-data/transaction_manager.h"
 
 //----------------------------------------------------------------
 
diff --git a/metadata_checker.cc b/thin-provisioning/metadata_checker.cc
similarity index 99%
rename from metadata_checker.cc
rename to thin-provisioning/metadata_checker.cc
index 3d96e0e..5207734 100644
--- a/metadata_checker.cc
+++ b/thin-provisioning/metadata_checker.cc
@@ -16,7 +16,7 @@
 // with thin-provisioning-tools.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-#include "metadata_checker.h"
+#include "thin-provisioning/metadata_checker.h"
 
 using namespace thin_provisioning;
 
diff --git a/metadata_checker.h b/thin-provisioning/metadata_checker.h
similarity index 93%
rename from metadata_checker.h
rename to thin-provisioning/metadata_checker.h
index de18d27..724421c 100644
--- a/metadata_checker.h
+++ b/thin-provisioning/metadata_checker.h
@@ -19,8 +19,8 @@
 #ifndef METADATA_CHECKER_H
 #define METADATA_CHECKER_H
 
-#include "error_set.h"
-#include "metadata.h"
+#include "persistent-data/error_set.h"
+#include "thin-provisioning/metadata.h"
 
 //----------------------------------------------------------------
 
diff --git a/metadata_disk_structures.cc b/thin-provisioning/metadata_disk_structures.cc
similarity index 98%
rename from metadata_disk_structures.cc
rename to thin-provisioning/metadata_disk_structures.cc
index bfe3a97..e044cf1 100644
--- a/metadata_disk_structures.cc
+++ b/thin-provisioning/metadata_disk_structures.cc
@@ -16,7 +16,7 @@
 // with thin-provisioning-tools.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-#include "metadata_disk_structures.h"
+#include "thin-provisioning/metadata_disk_structures.h"
 
 #include <string.h>
 
diff --git a/metadata_disk_structures.h b/thin-provisioning/metadata_disk_structures.h
similarity index 98%
rename from metadata_disk_structures.h
rename to thin-provisioning/metadata_disk_structures.h
index e7cf130..b5ccee1 100644
--- a/metadata_disk_structures.h
+++ b/thin-provisioning/metadata_disk_structures.h
@@ -19,8 +19,8 @@
 #ifndef METADATA_DISK_STRUCTURES_H
 #define METADATA_DISK_STRUCTURES_H
 
-#include "endian_utils.h"
-#include "btree.h"
+#include "persistent-data/endian_utils.h"
+#include "persistent-data/btree.h"
 
 //----------------------------------------------------------------
 
diff --git a/metadata_dumper.cc b/thin-provisioning/metadata_dumper.cc
similarity index 100%
rename from metadata_dumper.cc
rename to thin-provisioning/metadata_dumper.cc
diff --git a/metadata_dumper.h b/thin-provisioning/metadata_dumper.h
similarity index 100%
rename from metadata_dumper.h
rename to thin-provisioning/metadata_dumper.h
diff --git a/restore_emitter.cc b/thin-provisioning/restore_emitter.cc
similarity index 100%
rename from restore_emitter.cc
rename to thin-provisioning/restore_emitter.cc
diff --git a/restore_emitter.h b/thin-provisioning/restore_emitter.h
similarity index 100%
rename from restore_emitter.h
rename to thin-provisioning/restore_emitter.h
diff --git a/space_map_disk_structures.h b/thin-provisioning/space_map_disk_structures.h
similarity index 97%
rename from space_map_disk_structures.h
rename to thin-provisioning/space_map_disk_structures.h
index bf283d5..9020c1f 100644
--- a/space_map_disk_structures.h
+++ b/thin-provisioning/space_map_disk_structures.h
@@ -19,8 +19,8 @@
 #ifndef SPACE_MAP_DISK_STRUCTURES_H
 #define SPACE_MAP_DISK_STRUCTURES_H
 
-#include "endian_utils.h"
-#include "btree.h"
+#include "persistent-data/endian_utils.h"
+#include "persistent-data/btree.h"
 
 //----------------------------------------------------------------
 
diff --git a/thin_check.cc b/thin-provisioning/thin_check.cc
similarity index 96%
rename from thin_check.cc
rename to thin-provisioning/thin_check.cc
index abf87df..a930d52 100644
--- a/thin_check.cc
+++ b/thin-provisioning/thin_check.cc
@@ -20,8 +20,8 @@
 #include <getopt.h>
 #include <libgen.h>
 
-#include "metadata.h"
-#include "metadata_checker.h"
+#include "thin-provisioning/metadata.h"
+#include "thin-provisioning/metadata_checker.h"
 #include "version.h"
 
 using namespace persistent_data;
diff --git a/thin_debug.cc b/thin-provisioning/thin_debug.cc
similarity index 98%
rename from thin_debug.cc
rename to thin-provisioning/thin_debug.cc
index 0e5abdd..4fb0f40 100644
--- a/thin_debug.cc
+++ b/thin-provisioning/thin_debug.cc
@@ -28,9 +28,9 @@
 #include <string>
 #include <vector>
 
-#include "btree.h"
-#include "metadata.h"
-#include "metadata_checker.h"
+#include "persistent-data/btree.h"
+#include "thin-provisioning/metadata.h"
+#include "thin-provisioning/metadata_checker.h"
 #include "version.h"
 
 using namespace boost;
diff --git a/thin_dump.cc b/thin-provisioning/thin_dump.cc
similarity index 100%
rename from thin_dump.cc
rename to thin-provisioning/thin_dump.cc
diff --git a/thin_pool.cc b/thin-provisioning/thin_pool.cc
similarity index 98%
rename from thin_pool.cc
rename to thin-provisioning/thin_pool.cc
index eb7f9c5..25938d7 100644
--- a/thin_pool.cc
+++ b/thin-provisioning/thin_pool.cc
@@ -16,9 +16,9 @@
 // with thin-provisioning-tools.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-#include "thin_pool.h"
+#include "thin-provisioning/thin_pool.h"
 
-#include "btree_checker.h"
+#include "persistent-data/btree_checker.h"
 
 #include <stdexcept>
 #include <sstream>
diff --git a/thin_pool.h b/thin-provisioning/thin_pool.h
similarity index 100%
rename from thin_pool.h
rename to thin-provisioning/thin_pool.h
diff --git a/thin_restore.cc b/thin-provisioning/thin_restore.cc
similarity index 100%
rename from thin_restore.cc
rename to thin-provisioning/thin_restore.cc
diff --git a/xml_format.cc b/thin-provisioning/xml_format.cc
similarity index 100%
rename from xml_format.cc
rename to thin-provisioning/xml_format.cc
diff --git a/xml_format.h b/thin-provisioning/xml_format.h
similarity index 100%
rename from xml_format.h
rename to thin-provisioning/xml_format.h