diff --git a/bin/core/imag-store/Cargo.toml b/bin/core/imag-store/Cargo.toml
index 89b02275..a964363c 100644
--- a/bin/core/imag-store/Cargo.toml
+++ b/bin/core/imag-store/Cargo.toml
@@ -52,3 +52,10 @@ path             = "../../../lib/core/libimagrt"
 default-features = false
 features         = ["testing"]
 
+[lib]
+name = "libimagstorecmd"
+path = "src/lib.rs"
+
+[[bin]]
+name = "imag-store"
+path = "src/bin.rs"
diff --git a/bin/core/imag-store/src/bin.rs b/bin/core/imag-store/src/bin.rs
new file mode 100644
index 00000000..841df91b
--- /dev/null
+++ b/bin/core/imag-store/src/bin.rs
@@ -0,0 +1,39 @@
+//
+// imag - the personal information management suite for the commandline
+// Copyright (C) 2015-2019 Matthias Beyer <mail@beyermatthias.de> and contributors
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; version
+// 2.1 of the License.
+//
+// This library 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
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+#![forbid(unsafe_code)]
+
+#![deny(
+    non_camel_case_types,
+    non_snake_case,
+    path_statements,
+    trivial_numeric_casts,
+    unstable_features,
+    unused_allocation,
+    unused_import_braces,
+    unused_imports,
+    unused_must_use,
+    unused_mut,
+    unused_qualifications,
+    while_true,
+)]
+
+#[macro_use] extern crate libimagrt;
+
+simple_imag_application_binary!(libimagstorecmd, ImagStore);
diff --git a/bin/core/imag-store/src/main.rs b/bin/core/imag-store/src/lib.rs
similarity index 52%
rename from bin/core/imag-store/src/main.rs
rename to bin/core/imag-store/src/lib.rs
index 6ba6ad98..1936ecef 100644
--- a/bin/core/imag-store/src/main.rs
+++ b/bin/core/imag-store/src/lib.rs
@@ -40,7 +40,7 @@ extern crate toml;
 #[cfg(test)] extern crate toml_query;
 extern crate failure;
 
-#[macro_use] extern crate libimagrt;
+extern crate libimagrt;
 extern crate libimagstore;
 extern crate libimagerror;
 
@@ -51,7 +51,8 @@ extern crate libimagutil;
 #[cfg(not(test))]
 extern crate libimagutil;
 
-use libimagrt::setup::generate_runtime_setup;
+use libimagrt::application::ImagApplication;
+use libimagrt::runtime::Runtime;
 use libimagerror::trace::MapErrTrace;
 
 mod create;
@@ -65,42 +66,62 @@ mod util;
 
 use std::ops::Deref;
 
+use failure::Fallible as Result;
+use clap::App;
+
 use crate::create::create;
 use crate::delete::delete;
 use crate::get::get;
 use crate::retrieve::retrieve;
-use crate::ui::build_ui;
 use crate::update::update;
 use crate::verify::verify;
 
-fn main() {
-    let version = make_imag_version!();
-    let rt      = generate_runtime_setup("imag-store",
-                                         &version,
-                                         "Direct interface to the store. Use with great care!",
-                                         build_ui);
+/// Marker enum for implementing ImagApplication on
+///
+/// This is used by binaries crates to execute business logic
+/// or to build a CLI completion.
+pub enum ImagStore {}
+impl ImagApplication for ImagStore {
+    fn run(rt: Runtime) -> Result<()> {
+        let command = rt.cli().subcommand_name().map(String::from);
 
-    let command = rt.cli().subcommand_name().map(String::from);
+        if let Some(command) = command {
+            debug!("Call: {}", command);
+            match command.deref() {
+                "create"   => create(&rt),
+                "delete"   => delete(&rt),
+                "get"      => get(&rt),
+                "retrieve" => retrieve(&rt),
+                "update"   => update(&rt),
+                "verify"   => verify(&rt),
+                other      => {
+                    debug!("Unknown command");
+                    let _ = rt.handle_unknown_subcommand("imag-store", other, rt.cli())
+                        .map_err_trace_exit_unwrap()
+                        .code()
+                        .map(::std::process::exit);
+                },
+            };
+        } else {
+            debug!("No command");
+        }
 
-    if let Some(command) = command {
-        debug!("Call: {}", command);
-        match command.deref() {
-            "create"   => create(&rt),
-            "delete"   => delete(&rt),
-            "get"      => get(&rt),
-            "retrieve" => retrieve(&rt),
-            "update"   => update(&rt),
-            "verify"   => verify(&rt),
-            other      => {
-                debug!("Unknown command");
-                let _ = rt.handle_unknown_subcommand("imag-store", other, rt.cli())
-                    .map_err_trace_exit_unwrap()
-                    .code()
-                    .map(::std::process::exit);
-            },
-        };
-    } else {
-        debug!("No command");
+        Ok(())
+    }
+
+    fn build_cli<'a>(app: App<'a, 'a>) -> App<'a, 'a> {
+        ui::build_ui(app)
+    }
+
+    fn name() -> &'static str {
+        env!("CARGO_PKG_NAME")
+    }
+
+    fn description() -> &'static str {
+        "Direct interface to the store. Use with great care!"
+    }
+
+    fn version() -> &'static str {
+        env!("CARGO_PKG_VERSION")
     }
 }
-