diff --git a/CMakeLists.txt b/CMakeLists.txt
index db03b67..87531dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,23 +2,29 @@ cmake_minimum_required(VERSION 3.13)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/" "${CMAKE_SOURCE_DIR}/resources")
 
+include(VersionFromGit)
+
 string(TIMESTAMP BUILD_TIME "%Y-%m-%d %H:%M")
 message(STATUS "Saving build timestamp: ${BUILD_TIME}")
 
+version_from_git(LOG ON TIMESTAMP "%Y-%m-%d-%H:%M:%S")
+
 project(
   SamplinSafari
   DESCRIPTION
     "A research tool to visualize and interactively inspect high-dimensional (quasi) Monte Carlo samplers."
-  VERSION 2.0.0
+  VERSION ${SEMVER}
   LANGUAGES C CXX
   )
 
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-  set(APP_BITS_VERSION "64 bit")
+set(VERSION_LONG "${SEMVER} (64 bit)")
 elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
-  set(APP_BITS_VERSION "32 bit")
+set(VERSION_LONG "${SEMVER} (32 bit)")
 endif()
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/common.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/src/common.cpp @ONLY)
+
 include(sanitizers)
 
 # Set ourselves as the startup project in visual studio. Not available until cmake 3.6, but doesn't break older
@@ -194,22 +200,22 @@ add_library(samplerlib OBJECT STATIC
   include/sampler/Random.h
   include/sampler/RandomPermutation.h
   include/sampler/Sobol.h
-  src/Misc.cpp
-  src/Halton.cpp
-  src/Jittered.cpp
-  src/LP.cpp
-  src/MultiJittered.cpp
-  src/NRooks.cpp
-  src/OA.cpp
-  src/OAAddelmanKempthorne.cpp
-  src/OABose.cpp
-  src/OABoseBush.cpp
-  src/OABush.cpp
-  src/OACMJND.cpp
-  src/SOA.cpp
-  src/Random.cpp
-  src/Sobol.cpp
-  src/SobolMatrices.cpp)
+  src/sampler/Misc.cpp
+  src/sampler/Halton.cpp
+  src/sampler/Jittered.cpp
+  src/sampler/LP.cpp
+  src/sampler/MultiJittered.cpp
+  src/sampler/NRooks.cpp
+  src/sampler/OA.cpp
+  src/sampler/OAAddelmanKempthorne.cpp
+  src/sampler/OABose.cpp
+  src/sampler/OABoseBush.cpp
+  src/sampler/OABush.cpp
+  src/sampler/OACMJND.cpp
+  src/sampler/SOA.cpp
+  src/sampler/Random.cpp
+  src/sampler/Sobol.cpp
+  src/sampler/SobolMatrices.cpp)
   
 # Link dependencies
 target_link_libraries(
@@ -229,14 +235,17 @@ set(HELLO_IMGUI_ICON_DISPLAY_NAME ${output_name})
 set(HELLO_IMGUI_BUNDLE_NAME ${output_name})
 set(HELLO_IMGUI_BUNDLE_COPYRIGHT "© Wojciech Jarosz, ${YEAR}")
 set(HELLO_IMGUI_BUNDLE_EXECUTABLE ${output_name})
-set(HELLO_IMGUI_BUNDLE_VERSION ${APP_BITS_VERSION})
-set(HELLO_IMGUI_BUNDLE_SHORT_VERSION ${PROJECT_VERSION})
+set(HELLO_IMGUI_BUNDLE_VERSION ${SEMVER})
+set(HELLO_IMGUI_BUNDLE_SHORT_VERSION ${SEMVER})
 set(HELLO_IMGUI_BUNDLE_ICON_FILE icon.icns)
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/shell.emscripten.html.in ${CMAKE_CURRENT_SOURCE_DIR}/shell.emscripten.html @ONLY)
+
 hello_imgui_add_app(SamplinSafari
-  gui/app.cpp
-  gui/shader.cpp
-  gui/export_to_file.cpp
+  src/app.cpp
+  ${CMAKE_CURRENT_BINARY_DIR}/src/common.cpp
+  src/shader.cpp
+  src/export_to_file.cpp
   )
 
 set_target_properties(SamplinSafari PROPERTIES
diff --git a/cmake/VersionFromGit.cmake b/cmake/VersionFromGit.cmake
index 45e6686..b09c318 100644
--- a/cmake/VersionFromGit.cmake
+++ b/cmake/VersionFromGit.cmake
@@ -62,9 +62,10 @@ function( version_from_git )
     ERROR_STRIP_TRAILING_WHITESPACE
     )
   if( NOT git_result EQUAL 0 )
-    message( FATAL_ERROR
+    message( WARNING
       "[VersionFromGit] Failed to execute Git: ${git_error}"
       )
+    set( git_describe "" )
   endif()
 
   # Get Git tag
@@ -78,9 +79,10 @@ function( version_from_git )
     ERROR_STRIP_TRAILING_WHITESPACE
     )
   if( NOT git_result EQUAL 0 )
-    message( FATAL_ERROR
+    message( WARNING
       "[VersionFromGit] Failed to execute Git: ${git_error}"
       )
+    set( git_tag "" )
   endif()
 
   if( git_tag MATCHES "^v(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)(-[.0-9A-Za-z-]+)?([+][.0-9A-Za-z-]+)?$" )
@@ -90,9 +92,14 @@ function( version_from_git )
     set( identifiers   "${CMAKE_MATCH_4}" )
     set( metadata      "${CMAKE_MATCH_5}" )
   else()
-    message( FATAL_ERROR
+    message( WARNING
       "[VersionFromGit] Git tag isn't valid semantic version: [${git_tag}]"
       )
+    set( version_major "0" )
+    set( version_minor "0" )
+    set( version_patch "0" )
+    set( identifiers   "" )
+    set( metadata      "" )
   endif()
 
   if( "${git_tag}" STREQUAL "${git_describe}" )
diff --git a/gui/app.h b/include/app.h
similarity index 97%
rename from gui/app.h
rename to include/app.h
index dc981eb..18e90e9 100644
--- a/gui/app.h
+++ b/include/app.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "common.h"
 #include "linalg.h"
 using namespace linalg::aliases;
 
@@ -34,8 +35,8 @@ using namespace linalg::aliases;
     }
 
 #include "arcball.h"
-// #include "gui_app.h"
 #include "hello_imgui/hello_imgui.h"
+#include "misc/cpp/imgui_stdlib.h"
 #include "shader.h"
 #include <galois++/array2d.h>
 #include <map>
@@ -108,6 +109,7 @@ class SampleViewer
     void update_GPU_grids();
     void set_view(CameraType view);
     void draw_editor();
+    void draw_about_dialog();
     void process_hotkeys();
     void populate_point_subset();
     void generate_grid(vector<float3> &positions, int gridRes);
@@ -155,6 +157,7 @@ class SampleViewer
 
     float                    m_time1 = 0.f, m_time2 = 0.f;
     float3                   m_point_color = {0.9f, 0.55f, 0.1f};
+    float3                   m_bg_color    = {0.0f, 0.0f, 0.0f};
     HelloImGui::RunnerParams m_params;
 
     bool m_idling_backup = false;
diff --git a/gui/arcball.h b/include/arcball.h
similarity index 100%
rename from gui/arcball.h
rename to include/arcball.h
diff --git a/include/common.h b/include/common.h
new file mode 100644
index 0000000..b89d507
--- /dev/null
+++ b/include/common.h
@@ -0,0 +1,28 @@
+//
+// Copyright (C) Wojciech Jarosz <wjarosz@gmail.com>. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can
+// be found in the LICENSE.txt file.
+//
+
+#pragma once
+
+#if defined(_MSC_VER)
+// Make MS cmath define M_PI but not the min/max macros
+#define _USE_MATH_DEFINES
+#define NOMINMAX
+#endif
+
+#include <string>
+
+std::vector<std::string> split(std::string text, const std::string &delim);
+std::string              to_lower(std::string str);
+std::string              to_upper(std::string str);
+
+int         version_major();
+int         version_minor();
+int         version_patch();
+std::string version();
+std::string git_hash();
+std::string git_describe();
+std::string build_timestamp();
+std::string backend();
\ No newline at end of file
diff --git a/gui/export_to_file.h b/include/export_to_file.h
similarity index 100%
rename from gui/export_to_file.h
rename to include/export_to_file.h
diff --git a/include/imgui_ext.h b/include/imgui_ext.h
new file mode 100644
index 0000000..5f44ca4
--- /dev/null
+++ b/include/imgui_ext.h
@@ -0,0 +1,36 @@
+#include "imgui.h"
+
+namespace ImGui
+{
+
+inline bool ToggleButton(const char *label, bool *active)
+{
+    ImGui::PushStyleColor(ImGuiCol_Button, *active ? GetColorU32(ImGuiCol_ButtonActive) : GetColorU32(ImGuiCol_Button));
+    ImGui::PushStyleColor(ImGuiCol_ButtonHovered, GetColorU32(ImGuiCol_FrameBgHovered));
+    ImGui::PushStyleColor(ImGuiCol_ButtonActive, GetColorU32(ImGuiCol_FrameBgActive));
+
+    bool ret;
+    if ((ret = ImGui::Button(label)))
+        *active = !*active;
+    ImGui::PopStyleColor(3);
+    return ret;
+}
+
+inline void Text(const string &text)
+{
+    return TextUnformatted(text.c_str());
+}
+
+// return true when activated.
+inline bool MenuItem(const string &label, const string &shortcut = "", bool selected = false, bool enabled = true)
+{
+    return MenuItem(label.c_str(), shortcut.c_str(), selected, enabled);
+}
+
+// return true when activated + toggle (*p_selected) if p_selected != NULL
+inline bool MenuItem(const string &label, const string &shortcut, bool *p_selected, bool enabled = true)
+{
+    return MenuItem(label.c_str(), shortcut.c_str(), p_selected, enabled);
+}
+
+} // namespace ImGui
\ No newline at end of file
diff --git a/gui/shader.h b/include/shader.h
similarity index 100%
rename from gui/shader.h
rename to include/shader.h
diff --git a/gui/timer.h b/include/timer.h
similarity index 100%
rename from gui/timer.h
rename to include/timer.h
diff --git a/gui/traits.h b/include/traits.h
similarity index 100%
rename from gui/traits.h
rename to include/traits.h
diff --git a/shell.emscripten.html b/shell.emscripten.html.in
similarity index 99%
rename from shell.emscripten.html
rename to shell.emscripten.html.in
index 14a78e2..998b037 100644
--- a/shell.emscripten.html
+++ b/shell.emscripten.html.in
@@ -5,7 +5,7 @@
     <meta charset="utf-8" />
     <meta content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"
         name="viewport" />
-    <title>Samplin Safari2</title>
+    <title>@HELLO_IMGUI_ICON_DISPLAY_NAME@</title>
     <style>
         body {
             margin: 0;
diff --git a/gui/app.cpp b/src/app.cpp
similarity index 96%
rename from gui/app.cpp
rename to src/app.cpp
index 56c565b..10c05b8 100644
--- a/gui/app.cpp
+++ b/src/app.cpp
@@ -2,9 +2,6 @@
     \author Wojciech Jarosz
 */
 
-#define _USE_MATH_DEFINES
-#define NOMINMAX
-
 #include "app.h"
 
 using namespace linalg::ostream_overloads;
@@ -17,7 +14,7 @@ using std::to_string;
 
 #include "hello_imgui/hello_imgui.h"
 #include "hello_imgui/hello_imgui_include_opengl.h" // cross-platform way to include OpenGL headers
-#include "imgui.h"
+#include "imgui_ext.h"
 #include "imgui_internal.h"
 #include "portable-file-dialogs.h"
 
@@ -47,24 +44,6 @@ using std::to_string;
 
 static bool g_show_modal = true;
 
-namespace ImGui
-{
-
-bool ToggleButton(const char *label, bool *active)
-{
-    ImGui::PushStyleColor(ImGuiCol_Button, *active ? GetColorU32(ImGuiCol_ButtonActive) : GetColorU32(ImGuiCol_Button));
-    ImGui::PushStyleColor(ImGuiCol_ButtonHovered, GetColorU32(ImGuiCol_FrameBgHovered));
-    ImGui::PushStyleColor(ImGuiCol_ButtonActive, GetColorU32(ImGuiCol_FrameBgActive));
-
-    bool ret;
-    if ((ret = ImGui::Button(label)))
-        *active = !*active;
-    ImGui::PopStyleColor(3);
-    return ret;
-}
-
-} // namespace ImGui
-
 static float map_slider_to_radius(float sliderValue)
 {
     return sliderValue * sliderValue * 32.0f + 2.0f;
@@ -191,7 +170,7 @@ SampleViewer::SampleViewer()
                      ImGui::GetScrollX() - 2 * ImGui::GetStyle().ItemSpacing.x);
         if (posX > ImGui::GetCursorPosX())
             ImGui::SetCursorPosX(posX);
-        if (ImGui::MenuItem(text.c_str()))
+        if (ImGui::MenuItem(text))
             g_show_modal = true;
     };
 
@@ -225,7 +204,7 @@ SampleViewer::SampleViewer()
         for (string ext : {"eps", "svg"})
         {
 #ifndef __EMSCRIPTEN__
-            if (ImGui::MenuItem(fmt::format("{}  Export as {}...", ICON_FA_SAVE, ext).c_str()))
+            if (ImGui::MenuItem(fmt::format("{}  Export as {}...", ICON_FA_SAVE, to_upper(ext))))
             {
                 try
                 {
@@ -241,16 +220,16 @@ SampleViewer::SampleViewer()
                 }
             }
 #else
-            if (ImGui::BeginMenu(fmt::format("{}  Export as {}...", ICON_FA_SAVE, ext).c_str()))
+            if (ImGui::BeginMenu(fmt::format("{}  Download as {}...", ICON_FA_SAVE, to_upper(ext)).c_str()))
             {
-                const size_t filename_max_length = 128;
-                static char buff[filename_max_length];
+                string basename;
 
-                if (ImGui::InputText("Base filename", buff, filename_max_length, ImGuiInputTextFlags_EnterReturnsTrue))
+                if (ImGui::InputText("Base filename", &basename, ImGuiInputTextFlags_EnterReturnsTrue))
                 {
                     try
                     {
-                        vector<string> saved_files = save_files(buff, ext);
+                        ImGui::CloseCurrentPopup();
+                        vector<string> saved_files = save_files(basename, ext);
                         for (auto &saved_file : saved_files)
                             emscripten_run_script(fmt::format("saveFileFromMemoryFSToDisk('{}');", saved_file).c_str());
                     }
@@ -403,22 +382,38 @@ void SampleViewer::draw_gui()
             }
     }
 
+    draw_about_dialog();
+}
+
+void SampleViewer::draw_about_dialog()
+{
     if (g_show_modal)
     {
         ImGui::OpenPopup("About");
-        g_show_modal = false;
+
+        // I think HelloGui's way of rendering the frame multiple times before it determines window sizes is
+        // closing this popup before we see the app, so we need this hack to show it at startup
+        static int count = 0;
+        if (count > 0)
+            g_show_modal = false;
+        count++;
     }
 
     // Always center this window when appearing
     ImVec2 center = ImGui::GetMainViewport()->GetCenter();
     ImGui::SetNextWindowPos(center, ImGuiCond_Appearing, ImVec2(0.5f, 0.5f));
+    ImGui::SetNextWindowFocus();
 
-    if (ImGui::BeginPopupModal("About", NULL, ImGuiWindowFlags_AlwaysAutoResize))
+    if (ImGui::BeginPopup("About", ImGuiWindowFlags_AlwaysAutoResize))
     {
+        const int col_width[2] = {11, 34};
+
+        ImGui::Spacing();
+
         if (ImGui::BeginTable("about_table1", 2))
         {
-            ImGui::TableSetupColumn("one", ImGuiTableColumnFlags_WidthFixed, HelloImGui::EmSize() * 10);
-            ImGui::TableSetupColumn("two", ImGuiTableColumnFlags_WidthFixed, HelloImGui::EmSize() * 35);
+            ImGui::TableSetupColumn("one", ImGuiTableColumnFlags_WidthFixed, HelloImGui::EmSize() * col_width[0]);
+            ImGui::TableSetupColumn("two", ImGuiTableColumnFlags_WidthFixed, HelloImGui::EmSize() * col_width[1]);
 
             ImGui::TableNextRow();
             ImGui::TableNextColumn();
@@ -432,18 +427,18 @@ void SampleViewer::draw_gui()
             HelloImGui::ImageFromAsset("icons/icon_128x128.png"); // Display a static image
 
             ImGui::TableNextColumn();
-            ImGui::PushTextWrapPos(ImGui::GetCursorPos().x + HelloImGui::EmSize() * 35);
+            ImGui::PushTextWrapPos(ImGui::GetCursorPos().x + HelloImGui::EmSize() * col_width[1]);
 
             ImGui::PushFont(m_bold[30]);
             ImGui::Text("Samplin' Safari");
             ImGui::PopFont();
 
             ImGui::PushFont(m_bold[18]);
-            ImGui::Text("version v2.0.0 (64 bit)");
+            ImGui::Text(fmt::format("version {}", version()));
+            ImGui::PopFont();
+            ImGui::PushFont(m_regular[10]);
+            ImGui::Text(fmt::format("Built using the {} backend on {}.", backend(), build_timestamp()));
             ImGui::PopFont();
-            // ImGui::PushFont(m_regular[10]);
-            // ImGui::Text("Built using the XXX backend on 2023-12-04.");
-            // ImGui::PopFont();
 
             ImGui::Spacing();
 
@@ -464,10 +459,10 @@ void SampleViewer::draw_gui()
                          ImGui::GetScrollX() - 2 * ImGui::GetStyle().ItemSpacing.x);
             if (posX > ImGui::GetCursorPosX())
                 ImGui::SetCursorPosX(posX);
-            ImGui::Text("%s", text.c_str());
+            ImGui::Text(text);
         };
 
-        auto add_library = [this, right_align](string name, string desc)
+        auto add_library = [this, right_align, col_width](string name, string desc)
         {
             ImGui::TableNextRow();
             ImGui::TableNextColumn();
@@ -477,9 +472,9 @@ void SampleViewer::draw_gui()
             ImGui::PopFont();
 
             ImGui::TableNextColumn();
-            ImGui::PushTextWrapPos(ImGui::GetCursorPos().x + HelloImGui::EmSize() * 34);
+            ImGui::PushTextWrapPos(ImGui::GetCursorPos().x + HelloImGui::EmSize() * (col_width[1] - 1));
             ImGui::PushFont(m_regular[14]);
-            ImGui::Text("%s", desc.c_str());
+            ImGui::Text(desc);
             ImGui::PopFont();
         };
 
@@ -497,7 +492,7 @@ void SampleViewer::draw_gui()
         ImGui::Text("Orthogonal Array Sampling for Monte Carlo Rendering");
         ImGui::PopFont();
         ImGui::Text("Wojciech Jarosz, Afnan Enayet, Andrew Kensler, Charlie Kilpatrick, Per Christensen.\n"
-                    "In Computer Graphics Forum(Proceedings of EGSR), 38(4), July 2019.");
+                    "In Computer Graphics Forum (Proceedings of EGSR), 38(4), July 2019.");
         ImGui::Unindent(HelloImGui::EmSize() * 1);
         ImGui::Spacing();
         ImGui::Spacing();
@@ -505,11 +500,11 @@ void SampleViewer::draw_gui()
 
         if (ImGui::BeginTable("about_table2", 2))
         {
-            ImGui::TableSetupColumn("one", ImGuiTableColumnFlags_WidthFixed, HelloImGui::EmSize() * 10);
-            ImGui::TableSetupColumn("two", ImGuiTableColumnFlags_WidthFixed, HelloImGui::EmSize() * 35);
+            ImGui::TableSetupColumn("one", ImGuiTableColumnFlags_WidthFixed, HelloImGui::EmSize() * col_width[0]);
+            ImGui::TableSetupColumn("two", ImGuiTableColumnFlags_WidthFixed, HelloImGui::EmSize() * col_width[1]);
 
-            add_library("Hello ImGui", "Pascal Thomet's cross-platform starter-kit for Dear ImGui");
             add_library("Dear ImGui", "Omar Cornut's immediate-mode graphical user interface for C++");
+            add_library("Hello ImGui", "Pascal Thomet's cross-platform starter-kit for Dear ImGui");
             add_library("GLFW", "Multi-platform OpenGL/windowing library on the desktop");
             add_library("NanoGUI", "Bits of code from Wenzel Jakob's BSD-licensed NanoGUI library (the shader "
                                    "abstraction and arcball)");
@@ -525,11 +520,14 @@ void SampleViewer::draw_gui()
             ImGui::EndTable();
         }
 
-        if (ImGui::Button("Dismiss", ImVec2(120, 0)))
+        ImGui::SetKeyboardFocusHere();
+        if (ImGui::Button("Dismiss", ImVec2(120, 0)) || ImGui::IsKeyPressed(ImGuiKey_Escape) ||
+            ImGui::IsKeyPressed(ImGuiKey_Enter) || ImGui::IsKeyPressed(ImGuiKey_Space))
             ImGui::CloseCurrentPopup();
+        ImGui::SetItemDefaultFocus();
+
+        ImGui::EndPopup();
     }
-    ImGui::SetItemDefaultFocus();
-    ImGui::EndPopup();
 }
 
 void SampleViewer::draw_editor()
@@ -694,7 +692,8 @@ void SampleViewer::draw_editor()
     if (big_header(ICON_FA_EYE "  Display/visibility"))
     // =========================================================
     {
-        ImGui::ColorEdit3("Color", (float *)&m_point_color);
+        ImGui::ColorEdit3("Bg color", (float *)&m_bg_color);
+        ImGui::ColorEdit3("Point color", (float *)&m_point_color);
         ImGui::SliderFloat("Radius", &m_radius, 0.f, 1.f, "");
         ImGui::SameLine();
         {
@@ -772,8 +771,6 @@ void SampleViewer::draw_editor()
 
         ImGui::Dummy({0, HelloImGui::EmSize(0.25f)});
     }
-
-    process_hotkeys();
 }
 
 void SampleViewer::process_hotkeys()
@@ -1046,12 +1043,13 @@ void SampleViewer::draw_scene()
 {
     auto &io = ImGui::GetIO();
 
+    process_hotkeys();
+
     try
     {
         //
         // clear the scene and set up viewports
         //
-        const float4 background_color{0.f, 0.f, 0.f, 1.f};
 
         // first clear the entire window with the background color
         // display_size is the size of the window in pixels while accounting for dpi factor on retina screens.
@@ -1059,7 +1057,7 @@ void SampleViewer::draw_scene()
         //     but we need the size in pixels. So we scale io.DisplaySize by io.DisplayFramebufferScale
         auto display_size = int2{io.DisplaySize} * int2{io.DisplayFramebufferScale};
         CHK(glViewport(0, 0, display_size.x, display_size.y));
-        CHK(glClearColor(background_color[0], background_color[1], background_color[2], background_color[3]));
+        CHK(glClearColor(m_bg_color[0], m_bg_color[1], m_bg_color[2], 1.f));
         CHK(glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT));
 
         // now set up a new viewport for the rest of the drawing
diff --git a/src/common.cpp.in b/src/common.cpp.in
new file mode 100644
index 0000000..9ace018
--- /dev/null
+++ b/src/common.cpp.in
@@ -0,0 +1,62 @@
+//
+// Copyright (C) Wojciech Jarosz <wjarosz@gmail.com>. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can
+// be found in the LICENSE.txt file.
+//
+
+#include "common.h"
+
+using namespace std;
+
+// These constants and strings are autogenerated and compiled
+// into the project by cmake
+// clang-format off
+int    version_major() { return @VERSION_MAJOR@; }
+int    version_minor() { return @VERSION_MINOR@; }
+int    version_patch() { return @VERSION_PATCH@; }
+string version() { return string("@VERSION_LONG@"); }
+string git_hash() { return string("@GIT_HASH@"); }
+string git_describe() { return string("@GIT_DESCRIBE@"); }
+string build_timestamp() { return string("@BUILD_TIME@"); }
+string backend()
+{
+#if defined(HELLOIMGUI_USE_GLFW)
+    return "GLFW";
+#elif defined(HELLOIMGUI_USE_SDL)
+    return "SDL";
+#endif
+}
+// clang-format on
+
+vector<string> split(string text, const string &delim)
+{
+    vector<string> result;
+    while (true)
+    {
+        size_t begin = text.find_last_of(delim);
+        if (begin == string::npos)
+        {
+            result.emplace_back(text);
+            return result;
+        }
+        else
+        {
+            result.emplace_back(text.substr(begin + 1));
+            text.resize(begin);
+        }
+    }
+
+    return result;
+}
+
+string to_lower(string str)
+{
+    transform(begin(str), end(str), begin(str), [](unsigned char c) { return (char)tolower(c); });
+    return str;
+}
+
+string to_upper(string str)
+{
+    transform(begin(str), end(str), begin(str), [](unsigned char c) { return (char)toupper(c); });
+    return str;
+}
diff --git a/gui/export_to_file.cpp b/src/export_to_file.cpp
similarity index 100%
rename from gui/export_to_file.cpp
rename to src/export_to_file.cpp
diff --git a/src/Halton.cpp b/src/sampler/Halton.cpp
similarity index 100%
rename from src/Halton.cpp
rename to src/sampler/Halton.cpp
diff --git a/src/Jittered.cpp b/src/sampler/Jittered.cpp
similarity index 100%
rename from src/Jittered.cpp
rename to src/sampler/Jittered.cpp
diff --git a/src/LP.cpp b/src/sampler/LP.cpp
similarity index 100%
rename from src/LP.cpp
rename to src/sampler/LP.cpp
diff --git a/src/Misc.cpp b/src/sampler/Misc.cpp
similarity index 100%
rename from src/Misc.cpp
rename to src/sampler/Misc.cpp
diff --git a/src/MultiJittered.cpp b/src/sampler/MultiJittered.cpp
similarity index 100%
rename from src/MultiJittered.cpp
rename to src/sampler/MultiJittered.cpp
diff --git a/src/NRooks.cpp b/src/sampler/NRooks.cpp
similarity index 100%
rename from src/NRooks.cpp
rename to src/sampler/NRooks.cpp
diff --git a/src/OA.cpp b/src/sampler/OA.cpp
similarity index 100%
rename from src/OA.cpp
rename to src/sampler/OA.cpp
diff --git a/src/OAAddelmanKempthorne.cpp b/src/sampler/OAAddelmanKempthorne.cpp
similarity index 100%
rename from src/OAAddelmanKempthorne.cpp
rename to src/sampler/OAAddelmanKempthorne.cpp
diff --git a/src/OABose.cpp b/src/sampler/OABose.cpp
similarity index 100%
rename from src/OABose.cpp
rename to src/sampler/OABose.cpp
diff --git a/src/OABoseBush.cpp b/src/sampler/OABoseBush.cpp
similarity index 100%
rename from src/OABoseBush.cpp
rename to src/sampler/OABoseBush.cpp
diff --git a/src/OABush.cpp b/src/sampler/OABush.cpp
similarity index 100%
rename from src/OABush.cpp
rename to src/sampler/OABush.cpp
diff --git a/src/OACMJND.cpp b/src/sampler/OACMJND.cpp
similarity index 100%
rename from src/OACMJND.cpp
rename to src/sampler/OACMJND.cpp
diff --git a/src/Random.cpp b/src/sampler/Random.cpp
similarity index 100%
rename from src/Random.cpp
rename to src/sampler/Random.cpp
diff --git a/src/SOA.cpp b/src/sampler/SOA.cpp
similarity index 100%
rename from src/SOA.cpp
rename to src/sampler/SOA.cpp
diff --git a/src/Sobol.cpp b/src/sampler/Sobol.cpp
similarity index 100%
rename from src/Sobol.cpp
rename to src/sampler/Sobol.cpp
diff --git a/src/SobolMatrices.cpp b/src/sampler/SobolMatrices.cpp
similarity index 100%
rename from src/SobolMatrices.cpp
rename to src/sampler/SobolMatrices.cpp
diff --git a/gui/shader.cpp b/src/shader.cpp
similarity index 100%
rename from gui/shader.cpp
rename to src/shader.cpp