3 files changed, 40 insertions, 31 deletions
diff --git a/include/administration_reader.hpp b/include/administration_reader.hpp
index d650855..f8f8766 100644
--- a/include/administration_reader.hpp
+++ b/include/administration_reader.hpp
@@ -16,14 +16,18 @@
 
 #pragma once
 
-bool administration_reader_open_new();
-bool administration_reader_open_existing(char* file_path);
-bool administration_reader_save_new();
+namespace administration_reader {
 
-bool administration_reader_import_administration_info(char* buffer, size_t buffer_size);
-bool administration_reader_import_tax_rate(char* buffer, size_t buffer_size);
-bool administration_reader_import_cost_center(char* buffer, size_t buffer_size);
-bool administration_reader_import_project(char* buffer, size_t buffer_size);
-bool administration_reader_import_contact(char* buffer, size_t buffer_size);
-bool administration_reader_import_invoice(char* buffer, size_t buffer_size);
-bool administration_reader_read_invoice_from_xml(invoice* result, char* buffer, size_t buffer_size);
-\ No newline at end of file
+    bool open_new();
+    bool open_existing(char* file_path);
+    bool save_new();
+
+    bool import_administration_info(char* buffer, size_t buffer_size);
+    bool import_tax_rate(char* buffer, size_t buffer_size);
+    bool import_cost_center(char* buffer, size_t buffer_size);
+    bool import_project(char* buffer, size_t buffer_size);
+    bool import_contact(char* buffer, size_t buffer_size);
+    bool import_invoice(char* buffer, size_t buffer_size);
+    bool read_invoice_from_xml(invoice* result, char* buffer, size_t buffer_size);
+
+}
+\ No newline at end of file
diff --git a/include/administration_writer.hpp b/include/administration_writer.hpp
index 7ac0645..6f1d602 100644
--- a/include/administration_writer.hpp
+++ b/include/administration_writer.hpp
@@ -20,22 +20,26 @@
 
 #define ADMIN_FILE_INFO "info.xml"
 
-// Setup functions.
-bool administration_writer_create();
-void administration_writer_destroy();
-
-bool administration_writer_start_new();
-
-// Individual entity writing.
-bool administration_writer_delete_entry(char* id);
-bool administration_writer_save_project_blocking(project project);
-bool administration_writer_save_cost_center_blocking(cost_center cost);
-bool administration_writer_save_tax_rate_blocking(tax_rate rate);
-bool administration_writer_save_contact_blocking(contact c);
-bool administration_writer_save_invoice_blocking(invoice inv);
-
-// Archiving functions.
-bool administration_writer_save_all_administration_info_blocking();
-bool administration_writer_save_all_tax_rates_blocking();
-bool administration_writer_save_all_cost_centers_blocking();
-bool administration_writer_save_all_async();
-\ No newline at end of file
+namespace administration_writer {
+
+    // Setup functions.
+    bool create();
+    void destroy();
+
+    bool start_new();
+
+    // Individual entity writing.
+    bool delete_entry(char* id);
+    bool save_project_blocking(project project);
+    bool save_cost_center_blocking(cost_center cost);
+    bool save_tax_rate_blocking(tax_rate rate);
+    bool save_contact_blocking(contact c);
+    bool save_invoice_blocking(invoice inv);
+
+    // Archiving functions.
+    bool save_all_administration_info_blocking();
+    bool save_all_tax_rates_blocking();
+    bool save_all_cost_centers_blocking();
+    bool save_all_async();
+
+}
+\ No newline at end of file
diff --git a/include/strops.hpp b/include/strops.hpp
index ec3dcdd..5ecc99a 100644
--- a/include/strops.hpp
+++ b/include/strops.hpp
@@ -26,9 +26,10 @@ namespace strops {
     void    replace_int32(char *buf, size_t buf_size, const char *search, int32_t number);
     void    replace_int64(char *buf, size_t buf_size, const char *search, int64_t number);
     void    replace_float(char *buf, size_t buf_size, const char *search, float number, int decimals);
-    bool    prefix(const char *pre, const char *str);
-    char*   get_json_value(const char *json, const char *key, char *out, size_t out_size, int nth = 0);
+    bool    is_prefixed(const char *pre, const char *str);
     char*   get_filename(const char* path);
+
+    char*   get_json_value(const char *json, const char *key, char *out, size_t out_size, int nth = 0);
     char*   prep_str_for_json(const char *input, size_t buffer_size);
     char*   unprep_str_from_json(char *input);