diff --git a/thin-provisioning/commands.cc b/thin-provisioning/commands.cc
index f4a96fd..4f2af9d 100644
--- a/thin-provisioning/commands.cc
+++ b/thin-provisioning/commands.cc
@@ -11,8 +11,6 @@ thin_provisioning::register_thin_commands(base::application &app)
 	app.add_cmd(command::ptr(new thin_check_cmd()));
 	app.add_cmd(command::ptr(new thin_delta_cmd()));
 	app.add_cmd(command::ptr(new thin_dump_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_ls_cmd()));
 	app.add_cmd(command::ptr(new thin_metadata_size_cmd()));
 	app.add_cmd(command::ptr(new thin_restore_cmd()));
@@ -20,6 +18,8 @@ thin_provisioning::register_thin_commands(base::application &app)
 	app.add_cmd(command::ptr(new thin_rmap_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_trim_cmd()));
 	app.add_cmd(command::ptr(new thin_generate_metadata_cmd()));
diff --git a/thin-provisioning/commands.h b/thin-provisioning/commands.h
index 1cff88f..52aeaf8 100644
--- a/thin-provisioning/commands.h
+++ b/thin-provisioning/commands.h
@@ -28,20 +28,6 @@ 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_ls_cmd : public base::command {
 	public:
 		thin_ls_cmd();
@@ -77,17 +63,31 @@ namespace thin_provisioning {
 		virtual int run(int argc, char **argv);
 	};
 
-#ifdef DEV_TOOLS
-	class thin_scan_cmd : public base::command {
+	class thin_trim_cmd : public base::command {
 	public:
-		thin_scan_cmd();
+		thin_trim_cmd();
 		virtual void usage(std::ostream &out) const;
 		virtual int run(int argc, char **argv);
 	};
 
-	class thin_trim_cmd : public base::command {
+#ifdef DEV_TOOLS
+	class thin_ll_dump_cmd : public base::command {
 	public:
-		thin_trim_cmd();
+		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);
 	};