diff --git a/Makefile.in b/Makefile.in
index 2c3c09f..ea2bdca 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,6 +22,7 @@ PROGRAMS=\
 	bin/pdata_tools
 
 ifeq ("@TESTING@", "yes")
+PROGRAMS += bin/pdata_tools_dev
 TESTLIBS=\
 	lib/libft.so
 endif
@@ -31,7 +32,7 @@ all: $(PROGRAMS) $(TESTLIBS)
 
 include contrib/Makefile
 
-SOURCE=\
+COMMON_SOURCE=\
 	base/output_file_requirements.cc \
 	base/application.cc \
 	base/base64.cc \
@@ -50,13 +51,6 @@ SOURCE=\
 	block-cache/copier.cc \
 	block-cache/io_engine.cc \
 	block-cache/mem_pool.cc \
-	caching/cache_check.cc \
-	caching/cache_dump.cc \
-	caching/cache_metadata_size.cc \
-	caching/cache_repair.cc \
-	caching/cache_restore.cc \
-	caching/cache_writeback.cc \
-	caching/commands.cc \
 	caching/hint_array.cc \
 	caching/mapping_array.cc \
 	caching/metadata.cc \
@@ -64,13 +58,8 @@ SOURCE=\
 	caching/restore_emitter.cc \
 	caching/superblock.cc \
 	caching/xml_format.cc \
-	era/commands.cc \
 	era/era_array.cc \
-	era/era_check.cc \
 	era/era_detail.cc \
-	era/era_dump.cc \
-	era/era_invalidate.cc \
-	era/era_restore.cc \
 	era/metadata.cc \
 	era/metadata_dump.cc \
 	era/restore_emitter.cc \
@@ -95,7 +84,6 @@ SOURCE=\
 	persistent-data/space_map.cc \
 	persistent-data/transaction_manager.cc \
 	persistent-data/validators.cc \
-	thin-provisioning/commands.cc \
 	thin-provisioning/cache_stream.cc \
 	thin-provisioning/chunk_stream.cc \
 	thin-provisioning/device_tree.cc \
@@ -111,37 +99,54 @@ SOURCE=\
 	thin-provisioning/restore_emitter.cc \
 	thin-provisioning/rmap_visitor.cc \
 	thin-provisioning/superblock.cc \
+	thin-provisioning/xml_format.cc
+
+TOOLS_SOURCE=\
+	caching/commands.cc \
+	caching/cache_check.cc \
+	caching/cache_dump.cc \
+	caching/cache_metadata_size.cc \
+	caching/cache_repair.cc \
+	caching/cache_restore.cc \
+	caching/cache_writeback.cc \
+	era/commands.cc \
+	era/era_check.cc \
+	era/era_dump.cc \
+	era/era_invalidate.cc \
+	era/era_restore.cc \
+	thin-provisioning/commands.cc \
 	thin-provisioning/thin_check.cc \
 	thin-provisioning/thin_delta.cc \
 	thin-provisioning/thin_dump.cc \
 	thin-provisioning/thin_ls.cc \
 	thin-provisioning/thin_metadata_size.cc \
-	thin-provisioning/thin_pool.cc \
 	thin-provisioning/thin_repair.cc \
 	thin-provisioning/thin_restore.cc \
 	thin-provisioning/thin_rmap.cc \
-	thin-provisioning/thin_trim.cc \
-	thin-provisioning/xml_format.cc
+	thin-provisioning/thin_trim.cc
 
 DEVTOOLS_SOURCE=\
+	caching/devel_commands.cc \
+	era/devel_commands.cc \
 	thin-provisioning/damage_generator.cc \
+	thin-provisioning/devel_commands.cc \
+	thin-provisioning/thin_generate_damage.cc \
+	thin-provisioning/thin_generate_mappings.cc \
+	thin-provisioning/thin_generate_metadata.cc \
 	thin-provisioning/thin_journal.cc \
 	thin-provisioning/thin_journal_check.cc \
 	thin-provisioning/thin_ll_dump.cc \
 	thin-provisioning/thin_ll_restore.cc \
-	thin-provisioning/thin_show_duplicates.cc \
-	thin-provisioning/thin_generate_damage.cc \
-	thin-provisioning/thin_generate_metadata.cc \
-	thin-provisioning/thin_generate_mappings.cc \
-	thin-provisioning/variable_chunk_stream.cc \
 	thin-provisioning/thin_patch_superblock.cc \
-	thin-provisioning/thin_show_metadata.cc \
+	thin-provisioning/thin_pool.cc \
 	thin-provisioning/thin_scan.cc \
+	thin-provisioning/thin_show_duplicates.cc \
+	thin-provisioning/thin_show_metadata.cc \
+	thin-provisioning/variable_chunk_stream.cc \
 	ui/ui.cc
 
-ifeq ("@DEVTOOLS@", "yes")
-SOURCE+=$(DEVTOOLS_SOURCE)
-endif
+SOURCE=$(COMMON_SOURCE) $(TOOLS_SOURCE)
+DEV_SOURCE=$(COMMON_SOURCE) $(DEVTOOLS_SOURCE)
 
 ifeq ("@STATIC@", "yes")
 SOURCE += thin-provisioning/static_library_emitter.cc
@@ -154,6 +159,7 @@ CXX:=@CXX@
 AR:=@AR@
 STRIP:=@STRIP@
 OBJECTS:=$(subst .cc,.o,$(SOURCE))
+DEV_OBJECTS:=$(subst .cc,.o,$(DEV_SOURCE))
 
 ifeq ("@STATIC@", "yes")
 EMITTERS += $(PLUGIN_LIBS)
@@ -165,20 +171,13 @@ CFLAGS+=-g -Wall -O3 -fPIC
 CFLAGS+=@LFS_FLAGS@
 CXXFLAGS+=-g -Wall -fPIC -fno-strict-aliasing -std=c++11
 
-ifeq ("@DEVTOOLS@", "yes")
-CXXFLAGS+=-DDEV_TOOLS
-endif
-
 CXXFLAGS+=@CXXOPTIMISE_FLAG@
 CXXFLAGS+=@CXXDEBUG_FLAG@
 CXXFLAGS+=@CXX_STRERROR_FLAG@
 CXXFLAGS+=@LFS_FLAGS@
 INCLUDES+=-I$(TOP_BUILDDIR) -I$(TOP_DIR) -I$(TOP_DIR)/thin-provisioning
 LIBS:=-laio -lexpat -lboost_iostreams -ldl
-
-ifeq ("@DEVTOOLS@", "yes")
-LIBS+=-lncurses
-endif
+DEV_LIBS:=-lncurses
 
 ifeq ("@STATIC_CXX@", "yes")
 CXXLIB+=-Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -Wl,--as-needed
@@ -246,10 +245,16 @@ bin/pdata_tools: $(OBJECTS) $(EMITTERS)
 	@mkdir -p $(dir $@)
 	$(V) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $+ $(LIBS) $(CXXLIB)
 
+bin/pdata_tools_dev: $(DEV_OBJECTS)
+	@echo "    [LD]  $@"
+	@mkdir -p $(dir $@)
+	$(V) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $+ $(LIBS) $(DEV_LIBS) $(CXXLIB)
+
 #----------------------------------------------------------------
 
 DEPEND_FILES=\
 	$(subst .cc,.d,$(SOURCE)) \
+	$(subst .cc,.d,$(DEV_SOURCE)) \
 	$(subst .cc,.d,$(TEST_SOURCE)) \
 	$(subst .cc,.d,$(CXX_PROGRAM_SOURCE)) \
 	$(subst .c,.d,$(C_PROGRAM_SOURCE))
@@ -260,7 +265,7 @@ clean:
 	find . -name \*.o -delete
 	find . -name \*.gmo -delete
 	find . -name \*.d -delete
-	$(RM) $(TEST_PROGRAMS) $(PROGRAMS) $(GMOCK_OBJECTS) lib/*.a lib/*.so
+	$(RM) $(PROGRAMS) lib/*.a lib/*.so
 
 distclean: clean
 	$(RM) config.cache config.log config.status configure.h version.h Makefile unit-tests/Makefile
@@ -331,13 +336,6 @@ install: bin/pdata_tools $(MANPAGES)
 	$(INSTALL_DATA) man8/era_restore.8 $(MANPATH)/man8
 	$(INSTALL_DATA) man8/era_invalidate.8 $(MANPATH)/man8
 	$(INSTALL_DATA) man8/thin_trim.8 $(MANPATH)/man8
-ifeq ("@DEVTOOLS@", "yes")
-	ln -s -f pdata_tools $(BINDIR)/thin_show_duplicates
-	ln -s -f pdata_tools $(BINDIR)/thin_ll_dump
-	ln -s -f pdata_tools $(BINDIR)/thin_show_duplicates
-	ln -s -f pdata_tools $(BINDIR)/thin_generate_metadata
-	ln -s -f pdata_tools $(BINDIR)/thin_scan
-endif
 
 .PHONY: install install-rust-tools rust-tools
 
@@ -368,7 +366,7 @@ lib/libft.so: $(LIBFT_OBJECTS)
 
 .PHONEY: functional-test unit-test
 
-functional-test: bin/pdata_tools lib/libft.so
+functional-test: $(PROGRAMS) $(TESTLIBS)
 	cd functional-tests && ./run-tests run
 
 test: functional-test unit-test
diff --git a/base/application.cc b/base/application.cc
index 61338ff..c0089c6 100644
--- a/base/application.cc
+++ b/base/application.cc
@@ -47,7 +47,7 @@ application::run(int argc, char **argv)
 {
 	string cmd = get_basename(argv[0]);
 
-	if (cmd == string("pdata_tools")) {
+	if (cmd.find("pdata_tools") == 0) {
 		argc--;
 		argv++;
 
diff --git a/bin/thin_generate_damage b/bin/thin_generate_damage
index 84c01e7..c51afdf 120000
--- a/bin/thin_generate_damage
+++ b/bin/thin_generate_damage
@@ -1 +1 @@
-pdata_tools
\ No newline at end of file
+pdata_tools_dev
\ No newline at end of file
diff --git a/bin/thin_generate_mappings b/bin/thin_generate_mappings
index 84c01e7..c51afdf 120000
--- a/bin/thin_generate_mappings
+++ b/bin/thin_generate_mappings
@@ -1 +1 @@
-pdata_tools
\ No newline at end of file
+pdata_tools_dev
\ No newline at end of file
diff --git a/bin/thin_generate_metadata b/bin/thin_generate_metadata
index 84c01e7..c51afdf 120000
--- a/bin/thin_generate_metadata
+++ b/bin/thin_generate_metadata
@@ -1 +1 @@
-pdata_tools
\ No newline at end of file
+pdata_tools_dev
\ No newline at end of file
diff --git a/bin/thin_journal_check b/bin/thin_journal_check
index 84c01e7..c51afdf 120000
--- a/bin/thin_journal_check
+++ b/bin/thin_journal_check
@@ -1 +1 @@
-pdata_tools
\ No newline at end of file
+pdata_tools_dev
\ No newline at end of file
diff --git a/bin/thin_ll_dump b/bin/thin_ll_dump
index 84c01e7..c51afdf 120000
--- a/bin/thin_ll_dump
+++ b/bin/thin_ll_dump
@@ -1 +1 @@
-pdata_tools
\ No newline at end of file
+pdata_tools_dev
\ No newline at end of file
diff --git a/bin/thin_ll_restore b/bin/thin_ll_restore
index 84c01e7..c51afdf 120000
--- a/bin/thin_ll_restore
+++ b/bin/thin_ll_restore
@@ -1 +1 @@
-pdata_tools
\ No newline at end of file
+pdata_tools_dev
\ No newline at end of file
diff --git a/bin/thin_scan b/bin/thin_scan
index 84c01e7..c51afdf 120000
--- a/bin/thin_scan
+++ b/bin/thin_scan
@@ -1 +1 @@
-pdata_tools
\ No newline at end of file
+pdata_tools_dev
\ No newline at end of file
diff --git a/bin/thin_show_duplicates b/bin/thin_show_duplicates
index 84c01e7..c51afdf 120000
--- a/bin/thin_show_duplicates
+++ b/bin/thin_show_duplicates
@@ -1 +1 @@
-pdata_tools
\ No newline at end of file
+pdata_tools_dev
\ No newline at end of file
diff --git a/bin/thin_show_metadata b/bin/thin_show_metadata
index 84c01e7..c51afdf 120000
--- a/bin/thin_show_metadata
+++ b/bin/thin_show_metadata
@@ -1 +1 @@
-pdata_tools
\ No newline at end of file
+pdata_tools_dev
\ No newline at end of file
diff --git a/caching/devel_commands.cc b/caching/devel_commands.cc
new file mode 100644
index 0000000..21a1188
--- /dev/null
+++ b/caching/devel_commands.cc
@@ -0,0 +1,13 @@
+#include "caching/commands.h"
+
+using namespace base;
+using namespace caching;
+
+//----------------------------------------------------------------
+
+void
+caching::register_cache_commands(application &app)
+{
+}
+
+//----------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 060118d..947ffdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -150,14 +150,6 @@ AC_ARG_ENABLE(testing,
               TESTING=$enableval, TESTING=no)
 AC_MSG_RESULT($TESTING)
 
-################################################################################
-dnl -- Enable development tools
-AC_MSG_CHECKING(whether to enable development tools)
-AC_ARG_ENABLE(dev-tools,
-	      AC_HELP_STRING(--enable-dev-tools, [enable development tools in the makefile]),
-	      DEVTOOLS=$enableval, DEVTOOLS=no)
-AC_MSG_RESULT($DEVTOOLS)
-
 ################################################################################
 dnl -- Enable static libstdc++
 AC_MSG_CHECKING(whether to statically link libstdc++)
diff --git a/era/devel_commands.cc b/era/devel_commands.cc
new file mode 100644
index 0000000..eac6827
--- /dev/null
+++ b/era/devel_commands.cc
@@ -0,0 +1,12 @@
+#include "era/commands.h"
+
+using namespace base;
+
+//----------------------------------------------------------------
+
+void
+era::register_era_commands(base::application &app)
+{
+}
+
+//----------------------------------------------------------------
diff --git a/src/bin/thin_shrink.rs b/src/bin/thin_shrink.rs
index 2e4e270..b748b30 100644
--- a/src/bin/thin_shrink.rs
+++ b/src/bin/thin_shrink.rs
@@ -1,3 +1,7 @@
+// This work is based on the implementation by Nikhil Kshirsagar which
+// can be found here:
+//    https://github.com/nkshirsagar/thinpool_shrink/blob/split_ranges/thin_shrink.py
+
 extern crate clap;
 extern crate thinp;
 
diff --git a/tests/thin_delta.rs b/tests/thin_delta.rs
index 49d92cb..2bc840c 100644
--- a/tests/thin_delta.rs
+++ b/tests/thin_delta.rs
@@ -21,7 +21,7 @@ fn accepts_version() -> Result<()> {
     Ok(())
 }
 
-const USAGE: &str = "Usage: thin_delta [options] <device or file>\nOptions:\n  {--thin1, --snap1}\n  {--thin2, --snap2}\n  {-m, --metadata-snap} [block#]\n  {--verbose}\n  {-h|--help}\n  {-V|--version}";
+const USAGE: &str = "Usage: thin_delta [options] <device or file>\nOptions:\n  {--thin1, --snap1, --root1}\n  {--thin2, --snap2, --root2}\n  {-m, --metadata-snap} [block#]\n  {--verbose}\n  {-h|--help}\n  {-V|--version}";
 
 #[test]
 fn accepts_h() -> Result<()> {
@@ -49,7 +49,7 @@ fn snap1_unspecified() -> Result<()> {
     let mut td = TestDir::new()?;
     let md = mk_valid_md(&mut td)?;
     let stderr = run_fail(thin_delta!("--snap2", "45", &md))?;
-    assert!(stderr.contains("--snap1 not specified"));
+    assert!(stderr.contains("--snap1 or --root1 not specified"));
     Ok(())
 }
 
@@ -58,7 +58,7 @@ fn snap2_unspecified() -> Result<()> {
     let mut td = TestDir::new()?;
     let md = mk_valid_md(&mut td)?;
     let stderr = run_fail(thin_delta!("--snap1", "45", &md))?;
-    assert!(stderr.contains("--snap2 not specified"));
+    assert!(stderr.contains("--snap2 or --root2 not specified"));
     Ok(())
 }
 
diff --git a/thin-provisioning/commands.cc b/thin-provisioning/commands.cc
index 262b02d..c25abce 100644
--- a/thin-provisioning/commands.cc
+++ b/thin-provisioning/commands.cc
@@ -17,19 +17,6 @@ thin_provisioning::register_thin_commands(base::application &app)
 	app.add_cmd(command::ptr(new thin_repair_cmd()));
 	app.add_cmd(command::ptr(new thin_rmap_cmd()));
 	app.add_cmd(command::ptr(new thin_trim_cmd()));
-
-#ifdef DEV_TOOLS
-	app.add_cmd(command::ptr(new thin_ll_dump_cmd()));
-	app.add_cmd(command::ptr(new thin_ll_restore_cmd()));
-	app.add_cmd(command::ptr(new thin_scan_cmd()));
-	app.add_cmd(command::ptr(new thin_generate_damage_cmd()));
-	app.add_cmd(command::ptr(new thin_generate_metadata_cmd()));
-	app.add_cmd(command::ptr(new thin_generate_mappings_cmd()));
-	app.add_cmd(command::ptr(new thin_patch_superblock_cmd()));
-	app.add_cmd(command::ptr(new thin_show_duplicates_cmd()));
-	app.add_cmd(command::ptr(new thin_show_metadata_cmd()));
-	app.add_cmd(command::ptr(new thin_journal_cmd()));
-#endif
 }
 
 //----------------------------------------------------------------
diff --git a/thin-provisioning/commands.h b/thin-provisioning/commands.h
index 88e1346..0f603ae 100644
--- a/thin-provisioning/commands.h
+++ b/thin-provisioning/commands.h
@@ -71,37 +71,7 @@ namespace thin_provisioning {
 		virtual int run(int argc, char **argv);
 	};
 
-#ifdef DEV_TOOLS
-	class thin_ll_dump_cmd : public base::command {
-	public:
-		thin_ll_dump_cmd();
-
-		virtual void usage(std::ostream &out) const;
-		virtual int run(int argc, char **argv);
-	};
-
-	class thin_ll_restore_cmd : public base::command {
-	public:
-		thin_ll_restore_cmd();
-
-		virtual void usage(std::ostream &out) const;
-		virtual int run(int argc, char **argv);
-	};
-
-	class thin_scan_cmd : public base::command {
-	public:
-		thin_scan_cmd();
-
-		virtual void usage(std::ostream &out) const;
-		virtual int run(int argc, char **argv);
-	};
-
-	class thin_show_duplicates_cmd : public base::command {
-	public:
-		thin_show_duplicates_cmd();
-		virtual void usage(std::ostream &out) const;
-		virtual int run(int argc, char **argv);
-	};
+	//------------------------------------------------------
 
 	class thin_generate_damage_cmd : public base::command {
 	public:
@@ -124,6 +94,22 @@ namespace thin_provisioning {
 		virtual int run(int argc, char **argv);
 	};
 
+	class thin_ll_dump_cmd : public base::command {
+	public:
+		thin_ll_dump_cmd();
+
+		virtual void usage(std::ostream &out) const;
+		virtual int run(int argc, char **argv);
+	};
+
+	class thin_ll_restore_cmd : public base::command {
+	public:
+		thin_ll_restore_cmd();
+
+		virtual void usage(std::ostream &out) const;
+		virtual int run(int argc, char **argv);
+	};
+
 	class thin_patch_superblock_cmd : public base::command {
 	public:
 		thin_patch_superblock_cmd();
@@ -131,6 +117,22 @@ namespace thin_provisioning {
 		virtual int run(int argc, char **argv);
 	};
 
+	class thin_scan_cmd : public base::command {
+	public:
+		thin_scan_cmd();
+
+		virtual void usage(std::ostream &out) const;
+		virtual int run(int argc, char **argv);
+	};
+
+	class thin_show_duplicates_cmd : public base::command {
+	public:
+		thin_show_duplicates_cmd();
+		virtual void usage(std::ostream &out) const;
+		virtual int run(int argc, char **argv);
+	};
+
+
 	class thin_show_metadata_cmd : public base::command {
 	public:
 		thin_show_metadata_cmd();
@@ -144,7 +146,6 @@ namespace thin_provisioning {
 		virtual void usage(std::ostream &out) const;
 		virtual int run(int argc, char **argv);
 	};
-#endif
 
 	void register_thin_commands(base::application &app);
 }
diff --git a/thin-provisioning/devel_commands.cc b/thin-provisioning/devel_commands.cc
new file mode 100644
index 0000000..7a12297
--- /dev/null
+++ b/thin-provisioning/devel_commands.cc
@@ -0,0 +1,23 @@
+#include "thin-provisioning/commands.h"
+
+using namespace base;
+using namespace thin_provisioning;
+
+//----------------------------------------------------------------
+
+void
+thin_provisioning::register_thin_commands(base::application &app)
+{
+	app.add_cmd(command::ptr(new thin_generate_damage_cmd()));
+	app.add_cmd(command::ptr(new thin_generate_mappings_cmd()));
+	app.add_cmd(command::ptr(new thin_generate_metadata_cmd()));
+	app.add_cmd(command::ptr(new thin_journal_cmd()));
+	app.add_cmd(command::ptr(new thin_ll_dump_cmd()));
+	app.add_cmd(command::ptr(new thin_ll_restore_cmd()));
+	app.add_cmd(command::ptr(new thin_patch_superblock_cmd()));
+	app.add_cmd(command::ptr(new thin_scan_cmd()));
+	app.add_cmd(command::ptr(new thin_show_duplicates_cmd()));
+	app.add_cmd(command::ptr(new thin_show_metadata_cmd()));
+}
+
+//----------------------------------------------------------------