From b8ee5e1f7376443843e2c36643d3c9239de93bd0 Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Thu, 23 Nov 2017 22:15:24 -0500
Subject: [PATCH] Restructuring directory layout.  Move towards "Modern CMake"
 usage.

---
 CMakeLists.txt                                |    6 +-
 backends/CMakeLists.txt                       |    8 +
 .../barcode/Backends.cpp                      |   74 +-
 .../barcode/Backends.h                        |   26 +-
 backends/barcode/CMakeLists.txt               |   66 +
 .../barcode}/GnuBarcode.cpp                   |    2 +-
 .../barcode}/GnuBarcode.h                     |    2 +-
 .../barcode}/QrEncode.cpp                     |    2 +-
 .../barcode}/QrEncode.h                       |    2 +-
 .../barcode/Style.cpp                         |   56 +-
 .../barcode/Style.h                           |   38 +-
 .../barcode}/Zint.cpp                         |    2 +-
 .../barcode}/Zint.h                           |    2 +-
 backends/merge/CMakeLists.txt                 |   46 +
 backends/merge/Factory.cpp                    |  219 ++++
 backends/merge/Factory.h                      |  107 ++
 backends/merge/Merge.cpp                      |  210 ++++
 backends/merge/Merge.h                        |  120 ++
 backends/merge/None.cpp                       |  122 ++
 {glabels/Merge => backends/merge}/None.h      |   71 +-
 {glabels/Merge => backends/merge}/Record.cpp  |   75 +-
 {glabels/Merge => backends/merge}/Record.h    |   59 +-
 backends/merge/Text.cpp                       |  416 +++++++
 backends/merge/Text.h                         |   81 ++
 .../Merge => backends/merge}/TextColon.cpp    |   92 +-
 {glabels/Merge => backends/merge}/TextColon.h |   53 +-
 .../merge}/TextColonKeys.cpp                  |   90 +-
 .../Merge => backends/merge}/TextColonKeys.h  |   53 +-
 {glabels/Merge => backends/merge}/TextCsv.cpp |   92 +-
 {glabels/Merge => backends/merge}/TextCsv.h   |   53 +-
 .../Merge => backends/merge}/TextCsvKeys.cpp  |   92 +-
 .../Merge => backends/merge}/TextCsvKeys.h    |   53 +-
 .../merge}/TextSemicolon.cpp                  |   92 +-
 .../Merge => backends/merge}/TextSemicolon.h  |   53 +-
 .../merge}/TextSemicolonKeys.cpp              |   92 +-
 .../merge}/TextSemicolonKeys.h                |   53 +-
 {glabels/Merge => backends/merge}/TextTsv.cpp |   90 +-
 {glabels/Merge => backends/merge}/TextTsv.h   |   53 +-
 .../Merge => backends/merge}/TextTsvKeys.cpp  |   92 +-
 .../Merge => backends/merge}/TextTsvKeys.h    |   53 +-
 cmake/Modules/FindGnuBarcode.cmake            |   31 +-
 cmake/Modules/FindLibQrencode.cmake           |   30 +-
 cmake/Modules/FindLibZint.cmake               |   29 +-
 glabels-batch/CMakeLists.txt                  |   29 +
 .../main.cpp                                  |   36 +-
 glabels/AboutDialog.cpp                       |    6 +-
 glabels/BarcodeBackends/CMakeLists.txt        |   32 -
 glabels/BarcodeMenu.cpp                       |   23 +-
 glabels/BarcodeMenu.h                         |    8 +-
 glabels/BarcodeMenuButton.cpp                 |    9 +-
 glabels/BarcodeMenuButton.h                   |    9 +-
 glabels/BarcodeMenuItem.cpp                   |    4 +-
 glabels/BarcodeMenuItem.h                     |   10 +-
 glabels/CMakeLists.txt                        |  256 +---
 glabels/ColorButton.cpp                       |   12 +-
 glabels/ColorButton.h                         |   11 +-
 glabels/ColorPaletteDialog.cpp                |    6 +-
 glabels/ColorPaletteDialog.h                  |   11 +-
 glabels/Distance.h                            |  103 --
 glabels/File.cpp                              |   41 +-
 glabels/LabelEditor.cpp                       |  165 +--
 glabels/LabelEditor.h                         |   40 +-
 glabels/MainWindow.cpp                        |   11 +-
 glabels/MainWindow.h                          |    8 +-
 glabels/Merge/CMakeLists.txt                  |   50 -
 glabels/Merge/Factory.cpp                     |  224 ----
 glabels/Merge/Factory.h                       |  112 --
 glabels/Merge/Merge.cpp                       |  215 ----
 glabels/Merge/Merge.h                         |  125 --
 glabels/Merge/None.cpp                        |  127 --
 glabels/Merge/Text.cpp                        |  421 -------
 glabels/Merge/Text.h                          |   86 --
 glabels/MergeView.cpp                         |    6 +-
 glabels/MergeView.h                           |    9 +-
 glabels/MiniPreviewPixmap.cpp                 |   22 +-
 glabels/MiniPreviewPixmap.h                   |   19 +-
 glabels/ObjectEditor.cpp                      |   71 +-
 glabels/ObjectEditor.h                        |   13 +-
 glabels/PreferencesDialog.cpp                 |   22 +-
 glabels/Preview.cpp                           |   19 +-
 glabels/Preview.h                             |   20 +-
 glabels/PreviewOverlayItem.cpp                |    4 +-
 glabels/PreviewOverlayItem.h                  |   10 +-
 glabels/PrintView.cpp                         |    4 +-
 glabels/PrintView.h                           |   15 +-
 glabels/PropertiesView.cpp                    |   32 +-
 glabels/PropertiesView.h                      |   14 +-
 glabels/SelectProductDialog.cpp               |   41 +-
 glabels/SelectProductDialog.h                 |    2 +-
 glabels/SimplePreview.cpp                     |   36 +-
 glabels/SimplePreview.h                       |   14 +-
 glabels/TemplatePicker.cpp                    |    6 +-
 glabels/TemplatePicker.h                      |    6 +-
 glabels/TemplatePickerItem.cpp                |    4 +-
 glabels/TemplatePickerItem.h                  |    8 +-
 glabels/UndoRedoModel.cpp                     |    6 +-
 glabels/UndoRedoModel.h                       |   24 +-
 glabels/XmlLabelCreator.h                     |   82 --
 glabels/{glabels_main.cpp => main.cpp}        |   37 +-
 glbarcode/CMakeLists.txt                      |   38 +-
 model/CMakeLists.txt                          |  106 ++
 {glabels => model}/Category.cpp               |    4 +-
 {glabels => model}/Category.h                 |    8 +-
 {glabels => model}/ColorNode.cpp              |    6 +-
 {glabels => model}/ColorNode.h                |   10 +-
 {glabels => model}/Config.h.in                |   12 +-
 {glabels => model}/Constants.h                |    8 +-
 {glabels => model}/DataCache.cpp              |   12 +-
 {glabels => model}/DataCache.h                |   12 +-
 {glabels => model}/Db.cpp                     |    4 +-
 {glabels => model}/Db.h                       |    8 +-
 {glabels => model}/Distance.cpp               |    4 +-
 glabels/Distance.inl => model/Distance.h      |   89 +-
 {glabels => model}/FileUtil.cpp               |    4 +-
 {glabels => model}/FileUtil.h                 |    8 +-
 {glabels => model}/Frame.cpp                  |    4 +-
 {glabels => model}/Frame.h                    |    8 +-
 {glabels => model}/FrameCd.cpp                |    4 +-
 {glabels => model}/FrameCd.h                  |    8 +-
 {glabels => model}/FrameEllipse.cpp           |    4 +-
 {glabels => model}/FrameEllipse.h             |    8 +-
 {glabels => model}/FrameRect.cpp              |    4 +-
 {glabels => model}/FrameRect.h                |    8 +-
 {glabels => model}/FrameRound.cpp             |    4 +-
 {glabels => model}/FrameRound.h               |    8 +-
 {glabels => model}/Handles.cpp                |   50 +-
 {glabels => model}/Handles.h                  |   58 +-
 {glabels => model}/Layout.cpp                 |    4 +-
 {glabels => model}/Layout.h                   |    8 +-
 {glabels => model}/Markup.cpp                 |    4 +-
 {glabels => model}/Markup.h                   |    8 +-
 glabels/LabelModel.cpp => model/Model.cpp     |  312 ++---
 glabels/LabelModel.h => model/Model.h         |   50 +-
 .../ModelBarcodeObject.cpp                    |  107 +-
 .../ModelBarcodeObject.h                      |   58 +-
 .../ModelBoxObject.cpp                        |   60 +-
 .../ModelBoxObject.h                          |   48 +-
 .../ModelEllipseObject.cpp                    |   60 +-
 .../ModelEllipseObject.h                      |   48 +-
 .../ModelImageObject.cpp                      |  134 +-
 .../ModelImageObject.h                        |   92 +-
 .../ModelLineObject.cpp                       |   68 +-
 .../ModelLineObject.h                         |   46 +-
 .../ModelObject.cpp                           |  237 ++--
 .../LabelModelObject.h => model/ModelObject.h |   48 +-
 .../ModelShapeObject.cpp                      |   64 +-
 .../ModelShapeObject.h                        |   46 +-
 .../ModelTextObject.cpp                       |  136 +--
 .../ModelTextObject.h                         |   62 +-
 {glabels => model}/Outline.cpp                |   12 +-
 {glabels => model}/Outline.h                  |   18 +-
 {glabels => model}/PageRenderer.cpp           |   18 +-
 {glabels => model}/PageRenderer.h             |   22 +-
 {glabels => model}/Paper.cpp                  |    4 +-
 {glabels => model}/Paper.h                    |    8 +-
 {glabels => model}/Point.cpp                  |    4 +-
 {glabels => model}/Point.h                    |    8 +-
 {glabels => model}/RawText.cpp                |    4 +-
 {glabels => model}/RawText.h                  |    8 +-
 {glabels => model}/Region.cpp                 |    4 +-
 {glabels => model}/Region.h                   |    8 +-
 {glabels => model}/Settings.cpp               |    4 +-
 {glabels => model}/Settings.h                 |    8 +-
 {glabels => model}/Size.cpp                   |    4 +-
 {glabels => model}/Size.h                     |    8 +-
 {glabels => model}/StrUtil.cpp                |    4 +-
 {glabels => model}/StrUtil.h                  |    8 +-
 {glabels => model}/SubstitutionField.cpp      |    4 +-
 {glabels => model}/SubstitutionField.h        |   10 +-
 {glabels => model}/Template.cpp               |    4 +-
 {glabels => model}/Template.h                 |    9 +-
 {glabels => model}/TextNode.cpp               |    4 +-
 {glabels => model}/TextNode.h                 |   10 +-
 {glabels => model}/Units.cpp                  |    4 +-
 {glabels => model}/Units.h                    |    8 +-
 {glabels => model}/Vendor.cpp                 |    4 +-
 {glabels => model}/Vendor.h                   |    8 +-
 {glabels => model}/Version.h.in               |    8 +-
 {glabels => model}/XmlCategoryParser.cpp      |    4 +-
 {glabels => model}/XmlCategoryParser.h        |    8 +-
 {glabels => model}/XmlLabelCreator.cpp        |   74 +-
 model/XmlLabelCreator.h                       |   82 ++
 {glabels => model}/XmlLabelParser.cpp         |  140 +--
 {glabels => model}/XmlLabelParser.h           |   48 +-
 {glabels => model}/XmlPaperParser.cpp         |    4 +-
 {glabels => model}/XmlPaperParser.h           |    8 +-
 {glabels => model}/XmlTemplateCreator.cpp     |    4 +-
 {glabels => model}/XmlTemplateCreator.h       |    8 +-
 {glabels => model}/XmlTemplateParser.cpp      |    4 +-
 {glabels => model}/XmlTemplateParser.h        |    8 +-
 {glabels => model}/XmlUtil.cpp                |    4 +-
 {glabels => model}/XmlUtil.h                  |    8 +-
 {glabels => model}/XmlVendorParser.cpp        |    4 +-
 {glabels => model}/XmlVendorParser.h          |    8 +-
 {glabels => model}/unit_tests/CMakeLists.txt  |    4 +-
 .../unit_tests/TestSubstitutionField.cpp      |  116 +-
 .../unit_tests/TestSubstitutionField.h        |    0
 translations/glabels_C.ts                     | 1075 ++++-------------
 198 files changed, 4509 insertions(+), 5324 deletions(-)
 create mode 100644 backends/CMakeLists.txt
 rename glabels/BarcodeBackends.cpp => backends/barcode/Backends.cpp (92%)
 rename glabels/BarcodeBackends.h => backends/barcode/Backends.h (82%)
 create mode 100644 backends/barcode/CMakeLists.txt
 rename {glabels/BarcodeBackends => backends/barcode}/GnuBarcode.cpp (99%)
 rename {glabels/BarcodeBackends => backends/barcode}/GnuBarcode.h (99%)
 rename {glabels/BarcodeBackends => backends/barcode}/QrEncode.cpp (98%)
 rename {glabels/BarcodeBackends => backends/barcode}/QrEncode.h (98%)
 rename glabels/BarcodeStyle.cpp => backends/barcode/Style.cpp (66%)
 rename glabels/BarcodeStyle.h => backends/barcode/Style.h (74%)
 rename {glabels/BarcodeBackends => backends/barcode}/Zint.cpp (99%)
 rename {glabels/BarcodeBackends => backends/barcode}/Zint.h (99%)
 create mode 100644 backends/merge/CMakeLists.txt
 create mode 100644 backends/merge/Factory.cpp
 create mode 100644 backends/merge/Factory.h
 create mode 100644 backends/merge/Merge.cpp
 create mode 100644 backends/merge/Merge.h
 create mode 100644 backends/merge/None.cpp
 rename {glabels/Merge => backends/merge}/None.h (50%)
 rename {glabels/Merge => backends/merge}/Record.cpp (57%)
 rename {glabels/Merge => backends/merge}/Record.h (56%)
 create mode 100644 backends/merge/Text.cpp
 create mode 100644 backends/merge/Text.h
 rename {glabels/Merge => backends/merge}/TextColon.cpp (55%)
 rename {glabels/Merge => backends/merge}/TextColon.h (59%)
 rename {glabels/Merge => backends/merge}/TextColonKeys.cpp (53%)
 rename {glabels/Merge => backends/merge}/TextColonKeys.h (58%)
 rename {glabels/Merge => backends/merge}/TextCsv.cpp (56%)
 rename {glabels/Merge => backends/merge}/TextCsv.h (59%)
 rename {glabels/Merge => backends/merge}/TextCsvKeys.cpp (54%)
 rename {glabels/Merge => backends/merge}/TextCsvKeys.h (59%)
 rename {glabels/Merge => backends/merge}/TextSemicolon.cpp (54%)
 rename {glabels/Merge => backends/merge}/TextSemicolon.h (58%)
 rename {glabels/Merge => backends/merge}/TextSemicolonKeys.cpp (52%)
 rename {glabels/Merge => backends/merge}/TextSemicolonKeys.h (58%)
 rename {glabels/Merge => backends/merge}/TextTsv.cpp (56%)
 rename {glabels/Merge => backends/merge}/TextTsv.h (59%)
 rename {glabels/Merge => backends/merge}/TextTsvKeys.cpp (54%)
 rename {glabels/Merge => backends/merge}/TextTsvKeys.h (59%)
 create mode 100644 glabels-batch/CMakeLists.txt
 rename glabels/glabels-batch_main.cpp => glabels-batch/main.cpp (87%)
 delete mode 100644 glabels/BarcodeBackends/CMakeLists.txt
 delete mode 100644 glabels/Distance.h
 delete mode 100644 glabels/Merge/CMakeLists.txt
 delete mode 100644 glabels/Merge/Factory.cpp
 delete mode 100644 glabels/Merge/Factory.h
 delete mode 100644 glabels/Merge/Merge.cpp
 delete mode 100644 glabels/Merge/Merge.h
 delete mode 100644 glabels/Merge/None.cpp
 delete mode 100644 glabels/Merge/Text.cpp
 delete mode 100644 glabels/Merge/Text.h
 delete mode 100644 glabels/XmlLabelCreator.h
 rename glabels/{glabels_main.cpp => main.cpp} (80%)
 create mode 100644 model/CMakeLists.txt
 rename {glabels => model}/Category.cpp (94%)
 rename {glabels => model}/Category.h (90%)
 rename {glabels => model}/ColorNode.cpp (97%)
 rename {glabels => model}/ColorNode.h (94%)
 rename {glabels => model}/Config.h.in (77%)
 rename {glabels => model}/Constants.h (90%)
 rename {glabels => model}/DataCache.cpp (87%)
 rename {glabels => model}/DataCache.h (87%)
 rename {glabels => model}/Db.cpp (99%)
 rename {glabels => model}/Db.h (97%)
 rename {glabels => model}/Distance.cpp (98%)
 rename glabels/Distance.inl => model/Distance.h (60%)
 rename {glabels => model}/FileUtil.cpp (97%)
 rename {glabels => model}/FileUtil.h (90%)
 rename {glabels => model}/Frame.cpp (98%)
 rename {glabels => model}/Frame.h (95%)
 rename {glabels => model}/FrameCd.cpp (98%)
 rename {glabels => model}/FrameCd.h (94%)
 rename {glabels => model}/FrameEllipse.cpp (98%)
 rename {glabels => model}/FrameEllipse.h (93%)
 rename {glabels => model}/FrameRect.cpp (98%)
 rename {glabels => model}/FrameRect.h (94%)
 rename {glabels => model}/FrameRound.cpp (97%)
 rename {glabels => model}/FrameRound.h (93%)
 rename {glabels => model}/Handles.cpp (85%)
 rename {glabels => model}/Handles.h (81%)
 rename {glabels => model}/Layout.cpp (97%)
 rename {glabels => model}/Layout.h (93%)
 rename {glabels => model}/Markup.cpp (98%)
 rename {glabels => model}/Markup.h (96%)
 rename glabels/LabelModel.cpp => model/Model.cpp (70%)
 rename glabels/LabelModel.h => model/Model.h (85%)
 rename glabels/LabelModelBarcodeObject.cpp => model/ModelBarcodeObject.cpp (74%)
 rename glabels/LabelModelBarcodeObject.h => model/ModelBarcodeObject.h (74%)
 rename glabels/LabelModelBoxObject.cpp => model/ModelBoxObject.cpp (65%)
 rename glabels/LabelModelBoxObject.h => model/ModelBoxObject.h (58%)
 rename glabels/LabelModelEllipseObject.cpp => model/ModelEllipseObject.cpp (63%)
 rename glabels/LabelModelEllipseObject.h => model/ModelEllipseObject.h (57%)
 rename glabels/LabelModelImageObject.cpp => model/ModelImageObject.cpp (67%)
 rename glabels/LabelModelImageObject.h => model/ModelImageObject.h (56%)
 rename glabels/LabelModelLineObject.cpp => model/ModelLineObject.cpp (64%)
 rename glabels/LabelModelLineObject.h => model/ModelLineObject.h (70%)
 rename glabels/LabelModelObject.cpp => model/ModelObject.cpp (70%)
 rename glabels/LabelModelObject.h => model/ModelObject.h (90%)
 rename glabels/LabelModelShapeObject.cpp => model/ModelShapeObject.cpp (61%)
 rename glabels/LabelModelShapeObject.h => model/ModelShapeObject.h (67%)
 rename glabels/LabelModelTextObject.cpp => model/ModelTextObject.cpp (74%)
 rename glabels/LabelModelTextObject.h => model/ModelTextObject.h (75%)
 rename {glabels => model}/Outline.cpp (91%)
 rename {glabels => model}/Outline.h (83%)
 rename {glabels => model}/PageRenderer.cpp (96%)
 rename {glabels => model}/PageRenderer.h (89%)
 rename {glabels => model}/Paper.cpp (96%)
 rename {glabels => model}/Paper.h (93%)
 rename {glabels => model}/Point.cpp (95%)
 rename {glabels => model}/Point.h (91%)
 rename {glabels => model}/RawText.cpp (97%)
 rename {glabels => model}/RawText.h (94%)
 rename {glabels => model}/Region.cpp (97%)
 rename {glabels => model}/Region.h (95%)
 rename {glabels => model}/Settings.cpp (98%)
 rename {glabels => model}/Settings.h (95%)
 rename {glabels => model}/Size.cpp (96%)
 rename {glabels => model}/Size.h (94%)
 rename {glabels => model}/StrUtil.cpp (99%)
 rename {glabels => model}/StrUtil.h (90%)
 rename {glabels => model}/SubstitutionField.cpp (99%)
 rename {glabels => model}/SubstitutionField.h (93%)
 rename {glabels => model}/Template.cpp (98%)
 rename {glabels => model}/Template.h (95%)
 rename {glabels => model}/TextNode.cpp (97%)
 rename {glabels => model}/TextNode.h (93%)
 rename {glabels => model}/Units.cpp (98%)
 rename {glabels => model}/Units.h (93%)
 rename {glabels => model}/Vendor.cpp (94%)
 rename {glabels => model}/Vendor.h (91%)
 rename {glabels => model}/Version.h.in (91%)
 rename {glabels => model}/XmlCategoryParser.cpp (97%)
 rename {glabels => model}/XmlCategoryParser.h (89%)
 rename {glabels => model}/XmlLabelCreator.cpp (85%)
 create mode 100644 model/XmlLabelCreator.h
 rename {glabels => model}/XmlLabelParser.cpp (83%)
 rename {glabels => model}/XmlLabelParser.h (52%)
 rename {glabels => model}/XmlPaperParser.cpp (98%)
 rename {glabels => model}/XmlPaperParser.h (89%)
 rename {glabels => model}/XmlTemplateCreator.cpp (99%)
 rename {glabels => model}/XmlTemplateCreator.h (94%)
 rename {glabels => model}/XmlTemplateParser.cpp (99%)
 rename {glabels => model}/XmlTemplateParser.h (93%)
 rename {glabels => model}/XmlUtil.cpp (99%)
 rename {glabels => model}/XmlUtil.h (97%)
 rename {glabels => model}/XmlVendorParser.cpp (97%)
 rename {glabels => model}/XmlVendorParser.h (89%)
 rename {glabels => model}/unit_tests/CMakeLists.txt (77%)
 rename {glabels => model}/unit_tests/TestSubstitutionField.cpp (75%)
 rename {glabels => model}/unit_tests/TestSubstitutionField.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba8471c..d2cb89a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required (VERSION 2.8.12)
 ###############################################################################
 # gLabels Label Designer Project
 ###############################################################################
-project (glabels)
+project (glabels-qt)
 
 #
 # Path for locally defined cmake modules
@@ -35,6 +35,7 @@ if (MINGW)
    set (CMAKE_PREFIX_PATH ${MINGW_BASE_DIR} )
 endif ()
 
+find_package (Qt5Core 5.4 REQUIRED)
 find_package (Qt5Widgets 5.4 REQUIRED)
 find_package (Qt5PrintSupport 5.4 REQUIRED)
 find_package (Qt5Xml 5.4 REQUIRED)
@@ -71,7 +72,10 @@ endif ()
 # Subdirectories
 #=======================================
 add_subdirectory (glbarcode)
+add_subdirectory (backends)
+add_subdirectory (model)
 add_subdirectory (glabels)
+add_subdirectory (glabels-batch)
 add_subdirectory (templates)
 add_subdirectory (translations)
 add_subdirectory (data)
diff --git a/backends/CMakeLists.txt b/backends/CMakeLists.txt
new file mode 100644
index 0000000..a9b4cdd
--- /dev/null
+++ b/backends/CMakeLists.txt
@@ -0,0 +1,8 @@
+
+#=======================================
+# Subdirectories
+#=======================================
+add_subdirectory (barcode)
+add_subdirectory (merge)
+
+
diff --git a/glabels/BarcodeBackends.cpp b/backends/barcode/Backends.cpp
similarity index 92%
rename from glabels/BarcodeBackends.cpp
rename to backends/barcode/Backends.cpp
index 4ebfba8..f72f712 100644
--- a/glabels/BarcodeBackends.cpp
+++ b/backends/barcode/Backends.cpp
@@ -1,4 +1,4 @@
-/*  BarcodeBackends.cpp
+/*  Backends.cpp
  *
  *  Copyright (C) 2014  Jim Evins <evins@snaught.com>
  *
@@ -18,28 +18,28 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "BarcodeBackends.h"
+#include "Backends.h"
+
+#include "GnuBarcode.h"
+#include "QrEncode.h"
+#include "Zint.h"
 
 #include "glbarcode/Factory.h"
 
-#include "BarcodeBackends/GnuBarcode.h"
-#include "BarcodeBackends/QrEncode.h"
-#include "BarcodeBackends/Zint.h"
 
-
-namespace glabels
+namespace glabels::barcode
 {
 	
 	//
 	// Static data
 	//
-	QStringList BarcodeBackends::mBackendIdList;
-	QMap<QString,QString> BarcodeBackends::mBackendNameMap;
+	QStringList Backends::mBackendIdList;
+	QMap<QString,QString> Backends::mBackendNameMap;
 
-	QList<BarcodeStyle> BarcodeBackends::mStyleList;
+	QList<Style> Backends::mStyleList;
 	
 
-	BarcodeBackends::BarcodeBackends()
+	Backends::Backends()
 	{
 		registerStyle( "code39", "", tr("Code 39"),
 		               true, true, true, true, "1234567890", true, 10 );
@@ -449,44 +449,44 @@ namespace glabels
 	}
 
 
-	void BarcodeBackends::init()
+	void Backends::init()
 	{
-		static BarcodeBackends* singletonInstance = nullptr;
+		static Backends* singletonInstance = nullptr;
                 
 		if ( singletonInstance == nullptr )
 		{
-			singletonInstance = new BarcodeBackends();
+			singletonInstance = new Backends();
 		}
 	}
 
 
-	const QStringList& BarcodeBackends::backendList()
+	const QStringList& Backends::backendList()
 	{
 		return mBackendIdList;
 	}
 
 	
-	QString BarcodeBackends::backendName( const QString& backendId )
+	QString Backends::backendName( const QString& backendId )
 	{
 		return mBackendNameMap[ backendId ];
 	}
 
 	
-	const QList<BarcodeStyle>& BarcodeBackends::styleList()
+	const QList<Style>& Backends::styleList()
 	{
 		return mStyleList;
 	}
 
 
-	const BarcodeStyle& BarcodeBackends::defaultStyle()
+	const Style& Backends::defaultStyle()
 	{
 		return mStyleList[0];
 	}
 
 
-	const BarcodeStyle& BarcodeBackends::style( const QString& backendId, const QString& StyleId )
+	const Style& Backends::style( const QString& backendId, const QString& StyleId )
 	{
-		foreach ( const BarcodeStyle& bcStyle, mStyleList )
+		foreach ( const Style& bcStyle, mStyleList )
 		{
 			if ( (bcStyle.backendId() == backendId) && (bcStyle.id() == StyleId) )
 			{
@@ -498,31 +498,31 @@ namespace glabels
 	}
 
 
-	void BarcodeBackends::registerBackend( const QString& backendId, const QString& backendName )
+	void Backends::registerBackend( const QString& backendId, const QString& backendName )
 	{
 		mBackendIdList.append( backendId );
 		mBackendNameMap[ backendId ] = backendName;
 	}
 
 
-	void BarcodeBackends::registerStyle( const QString& id,
-	                                     const QString& backendId,
-	                                     const QString& name,
-	                                     bool           canText,
-	                                     bool           textOptional,
-	                                     bool           canChecksum,
-	                                     bool           checksumOptional,
-	                                     const QString& defaultDigits,
-	                                     bool           canFreeForm,
-	                                     int            preferedN )
+	void Backends::registerStyle( const QString& id,
+	                              const QString& backendId,
+	                              const QString& name,
+	                              bool           canText,
+	                              bool           textOptional,
+	                              bool           canChecksum,
+	                              bool           checksumOptional,
+	                              const QString& defaultDigits,
+	                              bool           canFreeForm,
+	                              int            preferedN )
 	{
-		BarcodeStyle style( id, backendId, name,
-		                    canText, textOptional,
-		                    canChecksum, checksumOptional,
-		                    defaultDigits,
-		                    canFreeForm, preferedN );
+		Style style( id, backendId, name,
+		             canText, textOptional,
+		             canChecksum, checksumOptional,
+		             defaultDigits,
+		             canFreeForm, preferedN );
 
 		mStyleList.append( style );
 	}
 
-} // namespace glabels
+} // namespace glabels::barcode
diff --git a/glabels/BarcodeBackends.h b/backends/barcode/Backends.h
similarity index 82%
rename from glabels/BarcodeBackends.h
rename to backends/barcode/Backends.h
index 0704191..46d5ca0 100644
--- a/glabels/BarcodeBackends.h
+++ b/backends/barcode/Backends.h
@@ -1,4 +1,4 @@
-/*  BarcodeBackends.h
+/*  Backends.h
  *
  *  Copyright (C) 2014  Jim Evins <evins@snaught.com>
  *
@@ -18,11 +18,11 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef BarcodeBackends_h
-#define BarcodeBackends_h
+#ifndef barcode_Backends_h
+#define barcode_Backends_h
 
 
-#include "BarcodeStyle.h"
+#include "Style.h"
 
 #include <QList>
 #include <QMap>
@@ -30,13 +30,13 @@
 #include <QString>
 
 
-namespace glabels
+namespace glabels::barcode
 {
 	
 	///
-	/// Barcode Backends Database
+	///  Backends Database
 	///
-	class BarcodeBackends : public QObject
+	class Backends : public QObject
 	{
 		Q_OBJECT
 
@@ -45,7 +45,7 @@ namespace glabels
 		// Life Cycle
 		/////////////////////////////////
 	private:
-		BarcodeBackends();
+		Backends();
 
 	public:
 		static void init();
@@ -56,9 +56,9 @@ namespace glabels
 	public:
 		static const QStringList& backendList();
 		static QString backendName( const QString& backendId );
-		static const QList<BarcodeStyle>& styleList();
-		static const BarcodeStyle& defaultStyle();
-		static const BarcodeStyle& style( const QString& backendId, const QString& StyleId );
+		static const QList<Style>& styleList();
+		static const Style& defaultStyle();
+		static const Style& style( const QString& backendId, const QString& StyleId );
 
 
 		/////////////////////////////////
@@ -85,11 +85,11 @@ namespace glabels
 		static QStringList mBackendIdList;
 		static QMap<QString,QString> mBackendNameMap;
 
-		static QList<BarcodeStyle> mStyleList;
+		static QList<Style> mStyleList;
 
 	};
 
 }
 
 
-#endif // BarcodeBackends_h
+#endif // barcode_Backends_h
diff --git a/backends/barcode/CMakeLists.txt b/backends/barcode/CMakeLists.txt
new file mode 100644
index 0000000..383b5b9
--- /dev/null
+++ b/backends/barcode/CMakeLists.txt
@@ -0,0 +1,66 @@
+project (Barcode LANGUAGES CXX)
+
+#=======================================
+# Handle optional dependencies
+#=======================================
+if (${GNUBARCODE_FOUND})
+  add_definitions (-DHAVE_GNU_BARCODE=1)
+  set (OPTIONAL_GNUBARCODE GNU::BARCODE)
+else ()
+  set (OPTIONAL_GNUBARCODE "")
+endif ()
+
+if (${LIBQRENCODE_FOUND})
+  add_definitions (-DHAVE_QRENCODE=1)
+  set (OPTIONAL_QRENCODE QRENCODE::QRENCODE)
+else ()
+  set (OPTIONAL_QRENCODE "")
+endif ()
+
+if (${LIBZINT_FOUND})
+  add_definitions (-DHAVE_ZINT=1)
+  set (OPTIONAL_ZINT ZINT::ZINT)
+else ()
+  set (OPTIONAL_ZINT "")
+endif ()
+
+#=======================================
+# Sources
+#=======================================
+set (barcode_sources
+  Backends.cpp
+  Style.cpp
+  GnuBarcode.cpp
+  QrEncode.cpp
+  Zint.cpp
+)
+
+set (barcode_qobject_headers
+  Backends.h
+)
+
+qt5_wrap_cpp (barcode_moc_sources ${barcode_qobject_headers})
+
+#=====================================
+# Target
+#=====================================
+add_library (Barcode STATIC
+  ${barcode_sources}
+  ${barcode_moc_sources}
+)
+
+target_compile_features (Barcode
+  PUBLIC cxx_std_11
+)
+
+target_include_directories (Barcode
+  PUBLIC ..
+)
+
+target_link_libraries (Barcode
+  glbarcode
+  Qt5::Core
+  ${OPTIONAL_GNUBARCODE}
+  ${OPTIONAL_ZINT}
+  ${OPTIONAL_QRENCODE}
+)
diff --git a/glabels/BarcodeBackends/GnuBarcode.cpp b/backends/barcode/GnuBarcode.cpp
similarity index 99%
rename from glabels/BarcodeBackends/GnuBarcode.cpp
rename to backends/barcode/GnuBarcode.cpp
index 94260d7..699f596 100644
--- a/glabels/BarcodeBackends/GnuBarcode.cpp
+++ b/backends/barcode/GnuBarcode.cpp
@@ -34,7 +34,7 @@ namespace
 }
 
 
-namespace glabels
+namespace glabels::barcode
 {
 	namespace GnuBarcode
 	{
diff --git a/glabels/BarcodeBackends/GnuBarcode.h b/backends/barcode/GnuBarcode.h
similarity index 99%
rename from glabels/BarcodeBackends/GnuBarcode.h
rename to backends/barcode/GnuBarcode.h
index 649a9de..25117ed 100644
--- a/glabels/BarcodeBackends/GnuBarcode.h
+++ b/backends/barcode/GnuBarcode.h
@@ -26,7 +26,7 @@
 #include "glbarcode/Barcode1dBase.h"
 
 
-namespace glabels
+namespace glabels::barcode
 {
 	namespace GnuBarcode
 	{
diff --git a/glabels/BarcodeBackends/QrEncode.cpp b/backends/barcode/QrEncode.cpp
similarity index 98%
rename from glabels/BarcodeBackends/QrEncode.cpp
rename to backends/barcode/QrEncode.cpp
index 1949068..af59601 100644
--- a/glabels/BarcodeBackends/QrEncode.cpp
+++ b/backends/barcode/QrEncode.cpp
@@ -25,7 +25,7 @@
 #include <qrencode.h>
 
 
-namespace glabels
+namespace glabels::barcode
 {
 	namespace QrEncode
 	{
diff --git a/glabels/BarcodeBackends/QrEncode.h b/backends/barcode/QrEncode.h
similarity index 98%
rename from glabels/BarcodeBackends/QrEncode.h
rename to backends/barcode/QrEncode.h
index 641e41e..da58a8c 100644
--- a/glabels/BarcodeBackends/QrEncode.h
+++ b/backends/barcode/QrEncode.h
@@ -26,7 +26,7 @@
 #include "glbarcode/Barcode2dBase.h"
 
 
-namespace glabels
+namespace glabels::barcode
 {
 	namespace QrEncode
 	{
diff --git a/glabels/BarcodeStyle.cpp b/backends/barcode/Style.cpp
similarity index 66%
rename from glabels/BarcodeStyle.cpp
rename to backends/barcode/Style.cpp
index 9c510eb..27c1269 100644
--- a/glabels/BarcodeStyle.cpp
+++ b/backends/barcode/Style.cpp
@@ -1,4 +1,4 @@
-/*  BarcodeStyle.cpp
+/*  Style.cpp
  *
  *  Copyright (C) 2013  Jim Evins <evins@snaught.com>
  *
@@ -18,16 +18,16 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "BarcodeStyle.h"
+#include "Style.h"
 
 
-namespace glabels
+namespace glabels::barcode
 {
 	
 	///
 	/// Default Constructor
 	///
-	BarcodeStyle::BarcodeStyle ()
+	Style::Style ()
 		: mId( "" ),
 		  mBackendId( "" ),
 		  mName( "" ),
@@ -46,16 +46,16 @@ namespace glabels
 	///
 	/// Constructor From Data
 	///
-	BarcodeStyle::BarcodeStyle ( const QString& id,
-	                             const QString& backendId,
-	                             const QString& name,
-	                             bool           canText,
-	                             bool           textOptional,
-	                             bool           canChecksum,
-	                             bool           checksumOptional,
-	                             const QString& defaultDigits,
-	                             bool           canFreeform,
-	                             int            preferedN )
+	Style::Style ( const QString& id,
+	               const QString& backendId,
+	               const QString& name,
+	               bool           canText,
+	               bool           textOptional,
+	               bool           canChecksum,
+	               bool           checksumOptional,
+	               const QString& defaultDigits,
+	               bool           canFreeform,
+	               int            preferedN )
 	: mId( id ),
 	  mBackendId( backendId ),
 	  mName( name ),
@@ -74,7 +74,7 @@ namespace glabels
 	///
 	/// ID Property Getter
 	///
-	const QString& BarcodeStyle::id() const
+	const QString& Style::id() const
 	{
 		return mId;
 	}
@@ -83,7 +83,7 @@ namespace glabels
 	///
 	/// Full ID Property Getter
 	///
-	QString BarcodeStyle::fullId() const
+	QString Style::fullId() const
 	{
 		if ( mBackendId == "" )
 		{
@@ -99,7 +99,7 @@ namespace glabels
 	///
 	/// Backend ID Property Getter
 	///
-	const QString& BarcodeStyle::backendId() const
+	const QString& Style::backendId() const
 	{
 		return mBackendId;
 	}
@@ -108,7 +108,7 @@ namespace glabels
 	///
 	/// Name Property Getter
 	///
-	const QString& BarcodeStyle::name() const
+	const QString& Style::name() const
 	{
 		return mName;
 	}
@@ -117,7 +117,7 @@ namespace glabels
 	///
 	/// Can Text Property Getter
 	///
-	bool BarcodeStyle::canText() const
+	bool Style::canText() const
 	{
 		return mCanText;
 	}
@@ -126,7 +126,7 @@ namespace glabels
 	///
 	/// Text Optional Property Getter
 	///
-	bool BarcodeStyle::textOptional() const
+	bool Style::textOptional() const
 	{
 		return mTextOptional;
 	}
@@ -135,7 +135,7 @@ namespace glabels
 	///
 	/// Can Checksum Property Getter
 	///
-	bool BarcodeStyle::canChecksum() const
+	bool Style::canChecksum() const
 	{
 		return mCanChecksum;
 	}
@@ -144,7 +144,7 @@ namespace glabels
 	///
 	/// Checksum Optional Property Getter
 	///
-	bool BarcodeStyle::checksumOptional() const
+	bool Style::checksumOptional() const
 	{
 		return mChecksumOptional;
 	}
@@ -153,7 +153,7 @@ namespace glabels
 	///
 	/// Default Digits Property Getter
 	///
-	const QString& BarcodeStyle::defaultDigits() const
+	const QString& Style::defaultDigits() const
 	{
 		return mDefaultDigits;
 	}
@@ -162,7 +162,7 @@ namespace glabels
 	///
 	/// Can Freeform Property Getter
 	///
-	bool BarcodeStyle::canFreeform() const
+	bool Style::canFreeform() const
 	{
 		return mCanFreeform;
 	}
@@ -171,7 +171,7 @@ namespace glabels
 	///
 	/// Prefered N Property Getter
 	///
-	int BarcodeStyle::preferedN() const
+	int Style::preferedN() const
 	{
 		return mPreferedN;
 	}
@@ -180,7 +180,7 @@ namespace glabels
 	///
 	/// Generate Example Digits
 	///
-	QString BarcodeStyle::exampleDigits( int n ) const
+	QString Style::exampleDigits( int n ) const
 	{
 		if ( mCanFreeform )
 		{
@@ -196,9 +196,9 @@ namespace glabels
 	///
 	/// "Not equals" operator
 	///
-	bool BarcodeStyle::operator!=( const BarcodeStyle& other ) const
+	bool Style::operator!=( const Style& other ) const
 	{
 		return mId != other.mId;
 	}
 	
-} // namespace glabels
+} // namespace glabels::barcode
diff --git a/glabels/BarcodeStyle.h b/backends/barcode/Style.h
similarity index 74%
rename from glabels/BarcodeStyle.h
rename to backends/barcode/Style.h
index 8512853..8d92808 100644
--- a/glabels/BarcodeStyle.h
+++ b/backends/barcode/Style.h
@@ -1,4 +1,4 @@
-/*  BarcodeStyle.h
+/*  Style.h
  *
  *  Copyright (C) 2013  Jim Evins <evins@snaught.com>
  *
@@ -18,38 +18,38 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef BarcodeStyle_h
-#define BarcodeStyle_h
+#ifndef barcode_Style_h
+#define barcode_Style_h
 
 
 #include <QString>
 
 
-namespace glabels
+namespace glabels::barcode
 {
 	
 	///
-	/// Barcode Style Type
+	///  Style Type
 	///
-	class BarcodeStyle
+	class Style
 	{
 
 		/////////////////////////////////
 		// Life Cycle
 		/////////////////////////////////
 	public:
-		BarcodeStyle ();
+		Style ();
 
-		BarcodeStyle ( const QString& id,
-		               const QString& backendId,
-		               const QString& name,
-		               bool           canText,
-		               bool           textOptional,
-		               bool           canChecksum,
-		               bool           checksumOptional,
-		               const QString& defaultDigits,
-		               bool           canFreeform,
-		               int            preferedN );
+		Style ( const QString& id,
+		        const QString& backendId,
+		        const QString& name,
+		        bool           canText,
+		        bool           textOptional,
+		        bool           canChecksum,
+		        bool           checksumOptional,
+		        const QString& defaultDigits,
+		        bool           canFreeform,
+		        int            preferedN );
 
 
 		/////////////////////////////////
@@ -89,7 +89,7 @@ namespace glabels
 		// Operators
 		/////////////////////////////////
 	public:
-		bool operator!=( const BarcodeStyle& other ) const;
+		bool operator!=( const Style& other ) const;
 
 
 		/////////////////////////////////
@@ -112,4 +112,4 @@ namespace glabels
 }
 
 
-#endif // BarcodeStyle_h
+#endif // barcode_Style_h
diff --git a/glabels/BarcodeBackends/Zint.cpp b/backends/barcode/Zint.cpp
similarity index 99%
rename from glabels/BarcodeBackends/Zint.cpp
rename to backends/barcode/Zint.cpp
index 24cd47b..f4d374b 100644
--- a/glabels/BarcodeBackends/Zint.cpp
+++ b/backends/barcode/Zint.cpp
@@ -34,7 +34,7 @@ namespace
 }
 
 
-namespace glabels
+namespace glabels::barcode
 {
 	namespace Zint
 	{
diff --git a/glabels/BarcodeBackends/Zint.h b/backends/barcode/Zint.h
similarity index 99%
rename from glabels/BarcodeBackends/Zint.h
rename to backends/barcode/Zint.h
index 9381212..3c0d08e 100644
--- a/glabels/BarcodeBackends/Zint.h
+++ b/backends/barcode/Zint.h
@@ -26,7 +26,7 @@
 #include "glbarcode/Barcode1dBase.h"
 
 
-namespace glabels
+namespace glabels::barcode
 {
 	namespace Zint
 	{
diff --git a/backends/merge/CMakeLists.txt b/backends/merge/CMakeLists.txt
new file mode 100644
index 0000000..613eabc
--- /dev/null
+++ b/backends/merge/CMakeLists.txt
@@ -0,0 +1,46 @@
+project (Merge LANGUAGES CXX)
+
+#=====================================
+# Sources
+#=====================================
+set (merge_sources
+  Factory.cpp
+  Record.cpp
+  Merge.cpp
+  None.cpp
+  Text.cpp
+  TextCsv.cpp
+  TextCsvKeys.cpp
+  TextTsv.cpp
+  TextTsvKeys.cpp
+  TextColon.cpp
+  TextColonKeys.cpp
+  TextSemicolon.cpp
+  TextSemicolonKeys.cpp
+)
+
+set (merge_qobject_headers
+  Merge.h
+)
+
+qt5_wrap_cpp (merge_moc_sources ${merge_qobject_headers})
+
+#=====================================
+# Target
+#=====================================
+add_library (Merge STATIC
+  ${merge_sources}
+  ${merge_moc_sources}
+)
+
+target_compile_features (Merge
+  PUBLIC cxx_std_11
+)
+
+target_include_directories (Merge
+  PUBLIC ..
+)
+
+target_link_libraries (Merge
+  Qt5::Core
+)
diff --git a/backends/merge/Factory.cpp b/backends/merge/Factory.cpp
new file mode 100644
index 0000000..41101bb
--- /dev/null
+++ b/backends/merge/Factory.cpp
@@ -0,0 +1,219 @@
+/*  Merge/Factory.cpp
+ *
+ *  Copyright (C) 2016  Jim Evins <evins@snaught.com>
+ *
+ *  This file is part of gLabels-qt.
+ *
+ *  gLabels-qt is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  gLabels-qt 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "Factory.h"
+
+#include "None.h"
+#include "TextCsv.h"
+#include "TextCsvKeys.h"
+#include "TextTsv.h"
+#include "TextTsvKeys.h"
+#include "TextColon.h"
+#include "TextColonKeys.h"
+#include "TextSemicolon.h"
+#include "TextSemicolonKeys.h"
+
+
+namespace glabels::merge
+{
+
+	//
+	// Static data
+	//
+	QMap<QString,Factory::BackendEntry> Factory::mBackendIdMap;
+	QMap<QString,Factory::BackendEntry> Factory::mBackendNameMap;
+	QStringList Factory::mNameList;
+
+
+	///
+	/// Constructor
+	///
+	Factory::Factory()
+	{
+		registerBackend( None::id(),
+		                 tr("None"),
+		                 NONE,
+		                 &None::create );
+	
+		registerBackend( TextCsv::id(),
+		                 tr("Text: Comma Separated Values (CSV)"),
+		                 FILE,
+		                 &TextCsv::create );
+
+		registerBackend( TextCsvKeys::id(),
+		                 tr("Text: Comma Separated Values (CSV), keys on line 1"),
+		                 FILE,
+		                 &TextCsvKeys::create );
+
+		registerBackend( TextTsv::id(),
+		                 tr("Text: Tab Separated Values (TSV)"),
+		                 FILE,
+		                 &TextTsv::create );
+
+		registerBackend( TextTsvKeys::id(),
+		                 tr("Text: Tab Separated Values (TSV), keys on line 1"),
+		                 FILE,
+		                 &TextTsvKeys::create );
+
+		registerBackend( TextColon::id(),
+		                 tr("Text: Colon Separated Values"),
+		                 FILE,
+		                 &TextColon::create );
+
+		registerBackend( TextColonKeys::id(),
+		                 tr("Text: Colon Separated Values, keys on line 1"),
+		                 FILE,
+		                 &TextColonKeys::create );
+
+		registerBackend( TextSemicolon::id(),
+		                 tr("Text: Semicolon Separated Values"),
+		                 FILE,
+		                 &TextSemicolon::create );
+
+		registerBackend( TextSemicolonKeys::id(),
+		                 tr("Text: Semicolon Separated Values, keys on line 1"),
+		                 FILE,
+		                 &TextSemicolonKeys::create );
+	}
+
+
+	///
+	/// Initialize
+	///
+	void Factory::init()
+	{
+		static Factory* singletonInstance = nullptr;
+		if ( !singletonInstance )
+		{
+			singletonInstance = new Factory();
+		}
+	}
+
+
+	///
+	/// Create Merge object
+	///
+	Merge* Factory::createMerge( const QString& id )
+	{
+		QMap<QString,BackendEntry>::iterator iBackend = mBackendIdMap.find( id );
+		if ( iBackend != mBackendIdMap.end() )
+		{
+			return iBackend->create();
+		}
+	
+		return None::create();
+	}
+
+
+	///
+	/// Get name list
+	///
+	QStringList Factory::nameList()
+	{
+		return mNameList;
+	}
+
+
+	///
+	/// Convert ID to name
+	///
+	QString Factory::idToName( const QString& id )
+	{
+		if ( mBackendIdMap.contains( id ) )
+		{
+			return mBackendIdMap[id].name;
+		}
+		else
+		{
+			return tr("None");
+		}
+	}
+
+
+	///
+	/// Convert name to ID
+	///
+	QString Factory::nameToId( const QString& name )
+	{
+		if ( mBackendNameMap.contains( name ) )
+		{
+			return mBackendNameMap[name].id;
+		}
+		else
+		{
+			return "None";
+		}
+	}
+
+
+	///
+	/// Convert ID to type
+	///
+	Factory::SourceType Factory::idToType( const QString& id )
+	{
+		if ( mBackendIdMap.contains( id ) )
+		{
+			return mBackendIdMap[id].type;
+		}
+		else
+		{
+			return NONE;
+		}
+	}
+
+
+	///
+	/// Lookup ID from index
+	///
+	QString Factory::indexToId( int index )
+	{
+		if ( (index > 0) && (index < mNameList.size()) )
+		{
+			QString name = mNameList[index];
+			
+			return mBackendNameMap[ name ].id;
+		}
+
+		return "None";
+	}
+
+
+	///
+	/// Register backend
+	///
+	void Factory::registerBackend( const QString& id,
+	                               const QString& name,
+	                               SourceType     type,
+	                               CreateFct      create )
+	{
+		BackendEntry backend;
+
+		backend.id     = id;
+		backend.name   = name;
+		backend.type   = type;
+		backend.create = create;
+	
+		mBackendIdMap[ id ]     = backend;
+		mBackendNameMap[ name ] = backend;
+
+		mNameList << name;
+	}
+
+} // namespace glabels::merge
diff --git a/backends/merge/Factory.h b/backends/merge/Factory.h
new file mode 100644
index 0000000..6275b22
--- /dev/null
+++ b/backends/merge/Factory.h
@@ -0,0 +1,107 @@
+/*  Merge/Factory.h
+ *
+ *  Copyright (C) 2016  Jim Evins <evins@snaught.com>
+ *
+ *  This file is part of gLabels-qt.
+ *
+ *  gLabels-qt is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  gLabels-qt 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef merge_Factory_h
+#define merge_Factory_h
+
+
+#include <QCoreApplication>
+#include <QStringList>
+#include <QMap>
+
+
+namespace glabels::merge
+{
+
+	// Forward references
+	class Merge;
+	
+
+	///
+	/// Factory
+	///
+	class Factory
+	{
+		Q_DECLARE_TR_FUNCTIONS(Factory)
+	
+
+		/////////////////////////////////
+		// Source Type
+		/////////////////////////////////
+	public:
+		enum SourceType { NONE, FIXED, FILE };
+		
+		
+		/////////////////////////////////
+		// Life Cycle
+		/////////////////////////////////
+	protected:
+		Factory();
+
+
+		/////////////////////////////////
+		// Static methods
+		/////////////////////////////////
+	public:
+		static void init();
+	
+		static Merge* createMerge( const QString& id );
+
+		static QStringList nameList();
+		static QString idToName( const QString& id );
+		static QString nameToId( const QString& name );
+		static SourceType idToType( const QString& id );
+		static QString indexToId( int index );
+
+
+		/////////////////////////////////
+		// private methods
+		/////////////////////////////////
+	private:
+		typedef Merge* (*CreateFct)();
+	
+		static void registerBackend( const QString& id,
+		                             const QString& name,
+		                             SourceType     type,
+		                             CreateFct      create );
+
+
+		/////////////////////////////////
+		// private data
+		/////////////////////////////////
+		class BackendEntry
+		{
+		public:
+			QString    id;
+			QString    name;
+			SourceType type;
+			CreateFct  create;
+		};
+	
+		static QMap<QString,BackendEntry> mBackendIdMap;
+		static QMap<QString,BackendEntry> mBackendNameMap;
+		
+		static QStringList mNameList;
+	};
+
+}
+
+
+#endif // merge_Factory_h
diff --git a/backends/merge/Merge.cpp b/backends/merge/Merge.cpp
new file mode 100644
index 0000000..3051141
--- /dev/null
+++ b/backends/merge/Merge.cpp
@@ -0,0 +1,210 @@
+/*  Merge/Merge.cpp
+ *
+ *  Copyright (C) 2015-2016  Jim Evins <evins@snaught.com>
+ *
+ *  This file is part of gLabels-qt.
+ *
+ *  gLabels-qt is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  gLabels-qt 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "Merge.h"
+
+#include "Record.h"
+
+
+namespace glabels::merge
+{
+	
+	///
+	/// Constructor
+	///
+	Merge::Merge()
+	{
+	}
+
+
+	///
+	/// Constructor
+	///
+	Merge::Merge( const Merge* merge ) : mSource(merge->mSource)
+	{
+		foreach ( Record* record, merge->mRecordList )
+		{
+			mRecordList << record->clone();
+		}
+	}
+
+
+	///
+	/// Destructor
+	///
+	Merge::~Merge()
+	{
+		foreach ( Record* record, mRecordList )
+		{
+			delete record;
+		}
+		mRecordList.clear();
+	}
+
+
+	///
+	/// Get id
+	///
+	QString Merge::id() const
+	{
+		return mId;
+	}
+
+
+	///
+	/// Get source
+	///
+	QString Merge::source() const
+	{
+		return mSource;
+	}
+
+
+	///
+	/// Set source
+	///
+	void Merge::setSource( const QString& source )
+	{
+		mSource = source;
+
+		// Clear out any old records
+		foreach ( Record* record, mRecordList )
+		{
+			delete record;
+		}
+		mRecordList.clear();
+
+		open();
+		for ( Record* record = readNextRecord(); record != nullptr; record = readNextRecord() )
+		{
+			mRecordList.append( record );
+		}
+		close();
+		
+		emit sourceChanged();
+	}
+
+
+	///
+	/// Get record list
+	///
+	const QList<Record*>& Merge::recordList( ) const
+	{
+		return mRecordList;
+	}
+
+
+	///
+	/// Select matching record
+	///
+	void Merge::select( Record* record )
+	{
+		record->setSelected( true );
+		emit selectionChanged();
+	}
+	
+
+	///
+	/// Unselect matching record
+	///
+	void Merge::unselect( Record* record )
+	{
+		record->setSelected( false );
+		emit selectionChanged();
+	}
+
+	
+	///
+	/// Select/unselect i'th record
+	///
+	void Merge::setSelected( int i, bool state )
+	{
+		if ( (i >= 0) && (i < mRecordList.size()) )
+		{
+			mRecordList[i]->setSelected( state );
+			emit selectionChanged();
+		}
+	}
+
+
+	///
+	/// Select all records
+	///
+	void Merge::selectAll()
+	{
+		foreach ( Record* record, mRecordList )
+		{
+			record->setSelected( true );
+		}
+		emit selectionChanged();
+	}
+
+	
+	///
+	/// Unselect all records
+	///
+	void Merge::unselectAll()
+	{
+		foreach ( Record* record, mRecordList )
+		{
+			record->setSelected( false );
+		}
+		emit selectionChanged();
+	}
+
+	
+	///
+	/// Return count of selected records
+	///
+	int Merge::nSelectedRecords() const
+	{
+		int count = 0;
+
+		foreach ( Record* record, mRecordList )
+		{
+			if ( record->isSelected() )
+			{
+				count++;
+			}
+		}
+
+		return count;
+	}
+
+
+	///
+	/// Return list of selected records
+	///
+	const QList<Record*> Merge::selectedRecords() const
+	{
+		QList<Record*> list;
+
+		foreach ( Record* record, mRecordList )
+		{
+			if ( record->isSelected() )
+			{
+				list.append( record );
+			}
+		}
+
+		return list;
+	}
+
+} // namespace glabels::merge
diff --git a/backends/merge/Merge.h b/backends/merge/Merge.h
new file mode 100644
index 0000000..673ad4b
--- /dev/null
+++ b/backends/merge/Merge.h
@@ -0,0 +1,120 @@
+/*  Merge/Merge.h
+ *
+ *  Copyright (C) 2015-2016  Jim Evins <evins@snaught.com>
+ *
+ *  This file is part of gLabels-qt.
+ *
+ *  gLabels-qt is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  gLabels-qt 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef merge_Merge_h
+#define merge_Merge_h
+
+
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <QList>
+
+
+namespace glabels::merge
+{
+
+	// Forward references
+	class Record;
+		
+	
+	///
+	/// Merge Object
+	///
+	struct Merge : QObject
+	{
+		Q_OBJECT
+
+
+		/////////////////////////////////
+		// Life Cycle
+		/////////////////////////////////
+	protected:
+		Merge();
+		Merge( const Merge* merge );
+	public:
+		~Merge() override;
+
+
+		/////////////////////////////////
+		// Object duplication
+		/////////////////////////////////
+		virtual Merge* clone() const = 0;
+
+
+		/////////////////////////////////
+		// Properties
+		/////////////////////////////////
+	public:
+		QString id() const;
+		QString source() const;
+		void setSource( const QString& source );
+
+		const QList<Record*>& recordList( void ) const;
+
+
+		/////////////////////////////////
+		// Selection methods
+		/////////////////////////////////
+	public:
+		void select( Record* record );
+		void unselect( Record* record );
+		void setSelected( int i, bool state = true );
+		void selectAll();
+		void unselectAll();
+	
+		int nSelectedRecords() const;
+		const QList<Record*> selectedRecords() const;
+
+
+		/////////////////////////////////
+		// Virtual methods
+		/////////////////////////////////
+	public:
+		virtual QStringList keys() const = 0;
+		virtual QString primaryKey() const = 0;
+	protected:
+		virtual void open() = 0;
+		virtual void close() = 0;
+		virtual Record* readNextRecord() = 0;
+		
+
+		/////////////////////////////////
+		// Signals
+		/////////////////////////////////
+	signals:
+		void sourceChanged();
+		void selectionChanged();
+		
+
+		/////////////////////////////////
+		// Private data
+		/////////////////////////////////
+	protected:
+		QString             mId;
+	private:
+		QString             mSource;
+		QList<Record*>      mRecordList;
+	};
+
+}
+
+
+#endif // merge_Merge_h
diff --git a/backends/merge/None.cpp b/backends/merge/None.cpp
new file mode 100644
index 0000000..62af9a4
--- /dev/null
+++ b/backends/merge/None.cpp
@@ -0,0 +1,122 @@
+/*  Merge/None.cpp
+ *
+ *  Copyright (C) 2015-2016  Jim Evins <evins@snaught.com>
+ *
+ *  This file is part of gLabels-qt.
+ *
+ *  gLabels-qt is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  gLabels-qt 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "None.h"
+
+
+namespace glabels::merge
+{
+
+	///
+	/// Constructor
+	///
+	None::None() : Merge()
+	{
+		mId = "None";
+	}
+
+
+	///
+	/// Constructor
+	///
+	None::None( const None* merge ) : Merge( merge )
+	{
+	}
+
+
+	///
+	/// Destructor
+	///
+	None::~None()
+	{
+	}
+
+
+	///
+	/// Clone
+	///
+	None* None::clone() const
+	{
+		return new None( this );
+	}
+
+
+	///
+	/// Get ID
+	///
+	QString None::id()
+	{
+		return "None";
+	}
+
+
+	///
+	/// Create
+	///
+	Merge* None::create()
+	{
+		return new None();
+	}
+
+
+	///
+	/// Get key list
+	///
+	QStringList None::keys() const
+	{
+		QStringList emptyList;
+		return emptyList;
+	}
+
+
+	///
+	/// Get primary key
+	///
+	QString None::primaryKey() const
+	{
+		return "";
+	}
+
+
+	///
+	/// Open source
+	///
+	void None::open()
+	{
+	}
+
+
+	///
+	/// Close source
+	///
+	void None::close()
+	{
+	}
+
+
+	///
+	/// Read next record
+	///
+	Record* None::readNextRecord()
+	{
+		return nullptr;
+	}
+
+} // namespace glabels::merge
diff --git a/glabels/Merge/None.h b/backends/merge/None.h
similarity index 50%
rename from glabels/Merge/None.h
rename to backends/merge/None.h
index b82d493..990a74f 100644
--- a/glabels/Merge/None.h
+++ b/backends/merge/None.h
@@ -24,55 +24,50 @@
 #include "Merge.h"
 
 
-namespace glabels
+namespace glabels::merge
 {
 
-	namespace merge
+	///
+	/// None Merge Backend
+	///
+	struct None : public Merge
 	{
-	
-		///
-		/// None Merge Backend
-		///
-		struct None : public Merge
-		{
 
-			/////////////////////////////////
-			// Life Cycle
-			/////////////////////////////////
-		public:
-			None();
-			None( const None* merge );
-			~None() override;
+		/////////////////////////////////
+		// Life Cycle
+		/////////////////////////////////
+	public:
+		None();
+		None( const None* merge );
+		~None() override;
 
 
-			/////////////////////////////////
-			// Object duplication
-			/////////////////////////////////
-			None* clone() const override;
+		/////////////////////////////////
+		// Object duplication
+		/////////////////////////////////
+		None* clone() const override;
 
 
-			/////////////////////////////////
-			// Static methods
-			/////////////////////////////////
-		public:
-			static QString id();
-			static Merge* create();
+		/////////////////////////////////
+		// Static methods
+		/////////////////////////////////
+	public:
+		static QString id();
+		static Merge* create();
 
 
-			/////////////////////////////////
-			// Implementation of virtual methods
-			/////////////////////////////////
-		public:
-			QStringList keys() const override;
-			QString primaryKey() const override;
-		protected:
-			void open() override;
-			void close() override;
-			Record* readNextRecord() override;
+		/////////////////////////////////
+		// Implementation of virtual methods
+		/////////////////////////////////
+	public:
+		QStringList keys() const override;
+		QString primaryKey() const override;
+	protected:
+		void open() override;
+		void close() override;
+		Record* readNextRecord() override;
 		
-		};
-
-	}
+	};
 
 }
 
diff --git a/glabels/Merge/Record.cpp b/backends/merge/Record.cpp
similarity index 57%
rename from glabels/Merge/Record.cpp
rename to backends/merge/Record.cpp
index d628c3c..8d8ef33 100644
--- a/glabels/Merge/Record.cpp
+++ b/backends/merge/Record.cpp
@@ -21,55 +21,50 @@
 #include "Record.h"
 
 
-namespace glabels
+namespace glabels::merge
 {
 
-	namespace merge
+	///
+	/// Constructor
+	///
+	Record::Record() : mSelected( true )
 	{
-
-		///
-		/// Constructor
-		///
-		Record::Record() : mSelected( true )
-		{
-		}
+	}
 
 
-		///
-		/// Constructor
-		///
-		Record::Record( const Record* record )
-			: QMap<QString,QString>(*record), mSelected(record->mSelected)
-		{
-		}
+	///
+	/// Constructor
+	///
+	Record::Record( const Record* record )
+		: QMap<QString,QString>(*record), mSelected(record->mSelected)
+	{
+	}
 
 
-		///
-		/// Clone
-		///
-		Record* Record::clone() const
-		{
-			return new Record( this );
-		}
+	///
+	/// Clone
+	///
+	Record* Record::clone() const
+	{
+		return new Record( this );
+	}
 
 
-		///
-		/// Is record selected?
-		///
-		bool Record::isSelected() const
-		{
-			return mSelected;
-		}
+	///
+	/// Is record selected?
+	///
+	bool Record::isSelected() const
+	{
+		return mSelected;
+	}
 
 
-		///
-		/// Set selected on not selected
-		///
-		void Record::setSelected( bool value )
-		{
-			mSelected = value;
-		}
+	///
+	/// Set selected on not selected
+	///
+	void Record::setSelected( bool value )
+	{
+		mSelected = value;
+	}
 
-	} // namespace merge
-
-} // namespace glabels
+} // namespace glabels::merge
diff --git a/glabels/Merge/Record.h b/backends/merge/Record.h
similarity index 56%
rename from glabels/Merge/Record.h
rename to backends/merge/Record.h
index 6c17aaa..8364743 100644
--- a/glabels/Merge/Record.h
+++ b/backends/merge/Record.h
@@ -26,49 +26,44 @@
 #include <QMap>
 
 
-namespace glabels
+namespace glabels::merge
 {
 
-	namespace merge
+	///
+	/// Merge Record
+	///
+	struct Record : public QMap<QString,QString>
 	{
-	
-		///
-		/// Merge Record
-		///
-		struct Record : public QMap<QString,QString>
-		{
 
-			/////////////////////////////////
-			// Life Cycle
-			/////////////////////////////////
-		public:
-			Record();
-			Record( const Record* record );
+		/////////////////////////////////
+		// Life Cycle
+		/////////////////////////////////
+	public:
+		Record();
+		Record( const Record* record );
 
 
-			/////////////////////////////////
-			// Object duplication
-			/////////////////////////////////
-			Record* clone() const;
+		/////////////////////////////////
+		// Object duplication
+		/////////////////////////////////
+		Record* clone() const;
 
 
-			/////////////////////////////////
-			// Properties
-			/////////////////////////////////
-		public:
-			bool isSelected() const;
-			void setSelected( bool value );
+		/////////////////////////////////
+		// Properties
+		/////////////////////////////////
+	public:
+		bool isSelected() const;
+		void setSelected( bool value );
 
 
-			/////////////////////////////////
-			// Private data
-			/////////////////////////////////
-		private:
-			bool                  mSelected;
+		/////////////////////////////////
+		// Private data
+		/////////////////////////////////
+	private:
+		bool                  mSelected;
 
-		};
-
-	}
+	};
 
 }
 
diff --git a/backends/merge/Text.cpp b/backends/merge/Text.cpp
new file mode 100644
index 0000000..3a8611d
--- /dev/null
+++ b/backends/merge/Text.cpp
@@ -0,0 +1,416 @@
+/*  Merge/Text.cpp
+ *
+ *  Copyright (C) 2016  Jim Evins <evins@snaught.com>
+ *
+ *  This file is part of gLabels-qt.
+ *
+ *  gLabels-qt is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  gLabels-qt 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "Text.h"
+
+#include "Record.h"
+
+#include <QtDebug>
+
+
+namespace glabels::merge
+{
+
+	///
+	/// Constructor
+	///
+	Text::Text( QChar delimiter, bool line1HasKeys )
+		: mDelimeter(delimiter), mLine1HasKeys(line1HasKeys), mNFieldsMax(0)
+	{
+	}
+
+
+	///
+	/// Constructor
+	///
+	Text::Text( const Text* merge )
+		: Merge( merge ),
+		  mDelimeter(merge->mDelimeter), mLine1HasKeys(merge->mLine1HasKeys),
+		  mNFieldsMax(merge->mNFieldsMax)
+	{
+	}
+
+
+	///
+	/// Destructor
+	///
+	Text::~Text()
+	{
+	}
+
+
+	///
+	/// Get key list
+	///
+	QStringList Text::keys() const
+	{
+		QStringList keys;
+		for ( int iField = 0; iField < mNFieldsMax; iField++ )
+		{
+			keys << keyFromIndex(iField);
+		}
+		return keys;
+	}
+
+
+	///
+	/// Get primary key
+	///
+	QString Text::primaryKey() const
+	{
+		return keyFromIndex(0);
+	}
+
+
+	///
+	/// Open source
+	///
+	void Text::open()
+	{
+		mFile.setFileName( source() );
+		mFile.open( QIODevice::ReadOnly|QIODevice::Text );
+
+		mKeys.clear();
+		mNFieldsMax = 0;
+
+		if ( mLine1HasKeys && mFile.isOpen() )
+		{
+			mKeys = parseLine();
+			if ( (mKeys.size() == 1) && (mKeys[0] == "") )
+			{
+				mKeys.clear();
+			}
+			else
+			{
+				mNFieldsMax = mKeys.size();
+			}
+		}
+	}
+
+
+	///
+	/// Close source
+	///
+	void Text::close()
+	{
+		if ( mFile.isOpen() )
+		{
+			mFile.close();
+		}
+	}
+
+
+	///
+	/// Read next record
+	///
+	Record* Text::readNextRecord()
+	{
+		QStringList values = parseLine();
+		if ( !values.isEmpty() )
+		{
+			Record* record = new Record();
+
+			int iField = 0;
+			foreach ( QString value, values )
+			{
+				(*record)[ keyFromIndex(iField) ] = value;
+				iField++;
+			}
+			mNFieldsMax = std::max( mNFieldsMax, iField );
+
+			return record;
+		}
+		return nullptr;
+	}
+
+
+	///
+	/// Key from field index
+	///
+	QString Text::keyFromIndex( int iField ) const
+	{
+		if ( mLine1HasKeys && ( iField < mKeys.size() ) )
+		{
+			return mKeys[iField];
+		}
+		else
+		{
+			return QString::number( iField+1 );
+		}
+	}
+
+
+	///
+	/// Parse line.                                                     
+	///                                                                           
+	/// Attempt to be a robust parser of various CSV (and similar) formats.       
+	///                                                                           
+	/// Based on CSV format described in RFC 4180 section 2.                      
+	///                                                                           
+	/// Additions to RFC 4180 rules:                                              
+	///   - delimeters and other special characters may be "escaped" by a leading 
+	///     backslash (\)                                                         
+	///   - C escape sequences for newline (\n) and tab (\t) are also translated. 
+	///   - if quoted text is not followed by a delimeter, any additional text is 
+	///     concatenated with quoted portion.                                     
+	///                                                                           
+	/// Returns a list of fields.  A blank line is considered a line with one     
+	/// empty field.  Returns an empty list when done.                             
+	///
+	QStringList Text::parseLine()
+	{
+		QStringList fields;
+	
+		enum State
+		{
+			DELIM, QUOTED, QUOTED_QUOTE1, QUOTED_ESCAPED, SIMPLE, SIMPLE_ESCAPED, DONE
+		} state = DELIM;
+
+		QByteArray field;
+	
+		while ( state != DONE )
+		{
+			char c;
+			if ( mFile.getChar( &c ) )
+			{
+				switch (state)
+				{
+
+				case DELIM:
+					switch (c)
+					{
+					case '\n':
+						/* last field is empty. */
+						fields << "";
+						state = DONE;
+						break;
+					case '\r':
+						/* ignore */
+						state = DELIM;
+						break;
+					case '"':
+						/* start a quoted field. */
+						state = QUOTED;
+						break;
+					case '\\':
+						/* simple field, but 1st character is an escape. */
+						state = SIMPLE_ESCAPED;
+						break;
+					default:
+						if ( c == mDelimeter )
+						{
+							/* field is empty. */
+							fields << "";
+							state = DELIM;
+						}
+						else
+						{
+							/* begining of a simple field. */
+							field.append( c );
+							state = SIMPLE;
+						}
+						break;
+					}
+					break;
+
+				case QUOTED:
+					switch (c)
+					{
+					case '"':
+						/* Possible end of field, but could be 1st of a pair. */
+						state = QUOTED_QUOTE1;
+						break;
+					case '\\':
+						/* Escape next character, or special escape, e.g. \n. */
+						state = QUOTED_ESCAPED;
+						break;
+					default:
+						/* Use character literally. */
+						field.append( c );
+						break;
+					}
+					break;
+
+				case QUOTED_QUOTE1:
+					switch (c)
+					{
+					case '\n':
+						/* line ended after quoted item */
+						fields << QString( field );
+						state = DONE;
+						break;
+					case '"':
+						/* second quote, insert and stay quoted. */
+						field.append( c );
+						state = QUOTED;
+						break;
+					case '\r':
+						/* ignore and go to fallback */
+						state = SIMPLE;
+						break;
+					default:
+						if ( c == mDelimeter )
+						{
+							/* end of field. */
+							fields << QString( field );
+							field.clear();
+							state = DELIM;
+						}
+						else
+						{
+							/* fallback if not a delim or another quote. */
+							field.append( c );
+							state = SIMPLE;
+						}
+						break;
+					}
+					break;
+
+				case QUOTED_ESCAPED:
+					switch (c)
+					{
+					case 'n':
+						/* Decode "\n" as newline. */
+						field.append( '\n' );
+						state = QUOTED;
+						break;
+					case 't':
+						/* Decode "\t" as tab. */
+						field.append( '\t' );
+						state = QUOTED;
+						break;
+					default:
+						/* Use character literally. */
+						field.append( c );
+						state = QUOTED;
+						break;
+					}
+					break;
+
+				case SIMPLE:
+					switch (c)
+					{
+					case '\n':
+						/* line ended */
+						fields << QString( field );
+						state = DONE;
+						break;
+					case '\r':
+						/* ignore */
+						state = SIMPLE;
+						break;
+					case '\\':
+						/* Escape next character, or special escape, e.g. \n. */
+						state = SIMPLE_ESCAPED;
+						break;
+					default:
+						if ( c == mDelimeter )
+						{
+							/* end of field. */
+							fields << QString( field );
+							field.clear();
+							state = DELIM;
+						}
+						else
+						{
+							/* Use character literally. */
+							field.append( c );
+							state = SIMPLE;
+						}
+						break;
+					}
+					break;
+
+				case SIMPLE_ESCAPED:
+					switch (c)
+					{
+					case 'n':
+						/* Decode "\n" as newline. */
+						field.append( '\n' );
+						state = SIMPLE;
+						break;
+					case 't':
+						/* Decode "\t" as tab. */
+						field.append( '\t' );
+						state = SIMPLE;
+						break;
+					default:
+						/* Use character literally. */
+						field.append( (char)c );
+						state = SIMPLE;
+						break;
+					}
+					break;
+
+				default:
+					qWarning( "merge::Text::parseLine()::Should not be reached! #1" );
+					break;
+				}
+
+			}
+			else
+			{
+				/* Handle EOF (could also be an error while reading). */
+				switch (state)
+				{
+
+				case DELIM:
+					/* EOF, no more lines. */
+					break;
+
+				case QUOTED:
+					/* File ended midway through quoted item. Truncate field. */
+					fields << QString( field );
+					break;
+
+				case QUOTED_QUOTE1:
+					/* File ended after quoted item. */
+					fields << QString( field );
+					break;
+
+				case QUOTED_ESCAPED:
+					/* File ended midway through quoted item. Truncate field. */
+					fields << QString( field );
+					break;
+
+				case SIMPLE:
+					/* File ended after simple item. */
+					fields << QString( field );
+					break;
+
+				case SIMPLE_ESCAPED:
+					/* File ended midway through escaped item. */
+					fields << QString( field );
+					break;
+
+				default:
+					qWarning( "merge::Text::parseLine()::Should not be reached! #2" );
+					break;
+				}
+			
+				state = DONE;
+			}
+		}
+	
+
+		return fields;
+	}
+
+} // namespace glabels::merge
diff --git a/backends/merge/Text.h b/backends/merge/Text.h
new file mode 100644
index 0000000..e37dfa8
--- /dev/null
+++ b/backends/merge/Text.h
@@ -0,0 +1,81 @@
+/*  Merge/Text.h
+ *
+ *  Copyright (C) 2016  Jim Evins <evins@snaught.com>
+ *
+ *  This file is part of gLabels-qt.
+ *
+ *  gLabels-qt is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  gLabels-qt 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef merge_Text_h
+#define merge_Text_h
+
+#include "Merge.h"
+
+#include <QFile>
+
+
+namespace glabels::merge
+{
+
+	///
+	/// Text Merge Backend
+	///
+	struct Text : public Merge
+	{
+
+		/////////////////////////////////
+		// Life Cycle
+		/////////////////////////////////
+	protected:
+		Text( QChar delimiter, bool line1HasKeys );
+		Text( const Text* merge );
+		~Text() override;
+
+
+		/////////////////////////////////
+		// Implementation of virtual methods
+		/////////////////////////////////
+	public:
+		QStringList keys() const override;
+		QString primaryKey() const override;
+	protected:
+		void open() override;
+		void close() override;
+		Record* readNextRecord() override;
+
+
+		/////////////////////////////////
+		// Private methods
+		/////////////////////////////////
+		QString keyFromIndex( int iField ) const;
+		QStringList parseLine();
+	
+
+		/////////////////////////////////
+		// Private data
+		/////////////////////////////////
+	private:
+		QChar mDelimeter;
+		bool  mLine1HasKeys;
+
+		QFile          mFile;
+		QStringList    mKeys;
+		int            mNFieldsMax;
+	};
+
+}
+
+
+#endif // merge_Text_h
diff --git a/glabels/Merge/TextColon.cpp b/backends/merge/TextColon.cpp
similarity index 55%
rename from glabels/Merge/TextColon.cpp
rename to backends/merge/TextColon.cpp
index 8c4ee1d..96f4e59 100644
--- a/glabels/Merge/TextColon.cpp
+++ b/backends/merge/TextColon.cpp
@@ -21,65 +21,61 @@
 #include "TextColon.h"
 
 
-namespace glabels
+namespace glabels::merge
 {
 
-	namespace merge
+	static const QString ID = "Text/Colon";
+
+
+	///
+	/// Constructor
+	///
+	TextColon::TextColon() : Text(':',false)
 	{
-		static const QString ID = "Text/Colon";
+		mId = ID;
+	}
 
 
-		///
-		/// Constructor
-		///
-		TextColon::TextColon() : Text(':',false)
-		{
-			mId = ID;
-		}
+	///
+	/// Constructor
+	///
+	TextColon::TextColon( const TextColon* merge ) : Text( merge )
+	{
+	}
 
 
-		///
-		/// Constructor
-		///
-		TextColon::TextColon( const TextColon* merge ) : Text( merge )
-		{
-		}
+	///
+	/// Destructor
+	///
+	TextColon::~TextColon()
+	{
+	}
 
 
-		///
-		/// Destructor
-		///
-		TextColon::~TextColon()
-		{
-		}
+	///
+	/// Clone
+	///
+	TextColon* TextColon::clone() const
+	{
+		return new TextColon( this );
+	}
 
 
-		///
-		/// Clone
-		///
-		TextColon* TextColon::clone() const
-		{
-			return new TextColon( this );
-		}
+	///
+	/// Get ID
+	///
+	QString TextColon::id()
+	{
+		return ID;
+	}
 
 
-		///
-		/// Get ID
-		///
-		QString TextColon::id()
-		{
-			return ID;
-		}
+	///
+	/// Create
+	///
+	Merge* TextColon::create()
+	{
+		return new TextColon();
+	}
 
-
-		///
-		/// Create
-		///
-		Merge* TextColon::create()
-		{
-			return new TextColon();
-		}
-
-	} // namespace merge
-
-} // namespace glabels
+} // namespace glabels::merge
diff --git a/glabels/Merge/TextColon.h b/backends/merge/TextColon.h
similarity index 59%
rename from glabels/Merge/TextColon.h
rename to backends/merge/TextColon.h
index 742442f..09f9643 100644
--- a/glabels/Merge/TextColon.h
+++ b/backends/merge/TextColon.h
@@ -25,44 +25,39 @@
 #include "Text.h"
 
 
-namespace glabels
+namespace glabels::merge
 {
 
-	namespace merge
+	///
+	/// TextColon Merge Backend
+	///
+	struct TextColon : public Text
 	{
-	
-		///
-		/// TextColon Merge Backend
-		///
-		struct TextColon : public Text
-		{
 
-			/////////////////////////////////
-			// Life Cycle
-			/////////////////////////////////
-		private:
-			TextColon();
-			TextColon( const TextColon* merge );
-			~TextColon() override;
+		/////////////////////////////////
+		// Life Cycle
+		/////////////////////////////////
+	private:
+		TextColon();
+		TextColon( const TextColon* merge );
+		~TextColon() override;
 
 
-			/////////////////////////////////
-			// Object duplication
-			/////////////////////////////////
-		public:
-			TextColon* clone() const override;
+		/////////////////////////////////
+		// Object duplication
+		/////////////////////////////////
+	public:
+		TextColon* clone() const override;
 
 
-			/////////////////////////////////
-			// Static methods
-			/////////////////////////////////
-		public:
-			static QString id();
-			static Merge* create();
+		/////////////////////////////////
+		// Static methods
+		/////////////////////////////////
+	public:
+		static QString id();
+		static Merge* create();
 
-		};
-
-	}
+	};
 
 }
 
diff --git a/glabels/Merge/TextColonKeys.cpp b/backends/merge/TextColonKeys.cpp
similarity index 53%
rename from glabels/Merge/TextColonKeys.cpp
rename to backends/merge/TextColonKeys.cpp
index 5b227bb..6201126 100644
--- a/glabels/Merge/TextColonKeys.cpp
+++ b/backends/merge/TextColonKeys.cpp
@@ -21,65 +21,61 @@
 #include "TextColonKeys.h"
 
 
-namespace glabels
+namespace glabels::merge
 {
 
-	namespace merge
-	{
-		static const QString ID = "Text/Colon/Line1Keys";
+	static const QString ID = "Text/Colon/Line1Keys";
 
 	
-		///
-		/// Constructor
-		///
-		TextColonKeys::TextColonKeys() : Text(':',true)
-		{
-			mId = ID;
-		}
+	///
+	/// Constructor
+	///
+	TextColonKeys::TextColonKeys() : Text(':',true)
+	{
+		mId = ID;
+	}
 
 
-		///
-		/// Constructor
-		///
-		TextColonKeys::TextColonKeys( const TextColonKeys* merge ) : Text( merge )
-		{
-		}
+	///
+	/// Constructor
+	///
+	TextColonKeys::TextColonKeys( const TextColonKeys* merge ) : Text( merge )
+	{
+	}
 
 
-		///
-		/// Destructor
-		///
-		TextColonKeys::~TextColonKeys()
-		{
-		}
+	///
+	/// Destructor
+	///
+	TextColonKeys::~TextColonKeys()
+	{
+	}
 
 
-		///
-		/// Clone
-		///
-		TextColonKeys* TextColonKeys::clone() const
-		{
-			return new TextColonKeys( this );
-		}
+	///
+	/// Clone
+	///
+	TextColonKeys* TextColonKeys::clone() const
+	{
+		return new TextColonKeys( this );
+	}
 
 
-		///
-		/// Get ID
-		///
-		QString TextColonKeys::id()
-		{
-			return ID;
-		}
+	///
+	/// Get ID
+	///
+	QString TextColonKeys::id()
+	{
+		return ID;
+	}
 
 
-		///
-		/// Create
-		///
-		Merge* TextColonKeys::create()
-		{
-			return new TextColonKeys();
-		}
+	///
+	/// Create
+	///
+	Merge* TextColonKeys::create()
+	{
+		return new TextColonKeys();
+	}
 
-	} // namespace merge
-
-} // namespace glabels
+} // namespace glabels::merge
diff --git a/glabels/Merge/TextColonKeys.h b/backends/merge/TextColonKeys.h
similarity index 58%
rename from glabels/Merge/TextColonKeys.h
rename to backends/merge/TextColonKeys.h
index de0d063..c3c84ff 100644
--- a/glabels/Merge/TextColonKeys.h
+++ b/backends/merge/TextColonKeys.h
@@ -25,44 +25,39 @@
 #include "Text.h"
 
 
-namespace glabels
+namespace glabels::merge
 {
 
-	namespace merge
+	///
+	/// TextColonKeys Merge Backend
+	///
+	struct TextColonKeys : public Text
 	{
-	
-		///
-		/// TextColonKeys Merge Backend
-		///
-		struct TextColonKeys : public Text
-		{
 
-			/////////////////////////////////
-			// Life Cycle
-			/////////////////////////////////
-		private:
-			TextColonKeys();
-			TextColonKeys( const TextColonKeys* merge );
-			~TextColonKeys() override;
+		/////////////////////////////////
+		// Life Cycle
+		/////////////////////////////////
+	private:
+		TextColonKeys();
+		TextColonKeys( const TextColonKeys* merge );
+		~TextColonKeys() override;
 
 
-			/////////////////////////////////
-			// Object duplication
-			/////////////////////////////////
-		public:
-			TextColonKeys* clone() const override;
+		/////////////////////////////////
+		// Object duplication
+		/////////////////////////////////
+	public:
+		TextColonKeys* clone() const override;
 
 
-			/////////////////////////////////
-			// Static methods
-			/////////////////////////////////
-		public:
-			static QString id();
-			static Merge* create();
+		/////////////////////////////////
+		// Static methods
+		/////////////////////////////////
+	public:
+		static QString id();
+		static Merge* create();
 
-		};
-
-	}
+	};
 
 }
 
diff --git a/glabels/Merge/TextCsv.cpp b/backends/merge/TextCsv.cpp
similarity index 56%
rename from glabels/Merge/TextCsv.cpp
rename to backends/merge/TextCsv.cpp
index 2f1e636..db044fc 100644
--- a/glabels/Merge/TextCsv.cpp
+++ b/backends/merge/TextCsv.cpp
@@ -21,65 +21,61 @@
 #include "TextCsv.h"
 
 
-namespace glabels
+namespace glabels::merge
 {
 
-	namespace merge
+	static const QString ID = "Text/Comma";
+	
+	
+	///
+	/// Constructor
+	///
+	TextCsv::TextCsv() : Text(',',false)
 	{
-		static const QString ID = "Text/Comma";
-	
-	
-		///
-		/// Constructor
-		///
-		TextCsv::TextCsv() : Text(',',false)
-		{
-			mId = ID;
-		}
+		mId = ID;
+	}
 
 
-		///
-		/// Constructor
-		///
-		TextCsv::TextCsv( const TextCsv* merge ) : Text( merge )
-		{
-		}
+	///
+	/// Constructor
+	///
+	TextCsv::TextCsv( const TextCsv* merge ) : Text( merge )
+	{
+	}
 
 
-		///
-		/// Destructor
-		///
-		TextCsv::~TextCsv()
-		{
-		}
+	///
+	/// Destructor
+	///
+	TextCsv::~TextCsv()
+	{
+	}
 
 
-		///
-		/// Clone
-		///
-		TextCsv* TextCsv::clone() const
-		{
-			return new TextCsv( this );
-		}
+	///
+	/// Clone
+	///
+	TextCsv* TextCsv::clone() const
+	{
+		return new TextCsv( this );
+	}
 
 
-		///
-		/// Get ID
-		///
-		QString TextCsv::id()
-		{
-			return ID;
-		}
+	///
+	/// Get ID
+	///
+	QString TextCsv::id()
+	{
+		return ID;
+	}
 
 
-		///
-		/// Create
-		///
-		Merge* TextCsv::create()
-		{
-			return new TextCsv();
-		}
+	///
+	/// Create
+	///
+	Merge* TextCsv::create()
+	{
+		return new TextCsv();
+	}
 
-	} // namespace merge
-
-} // namespace glabels
+} // namespace glabels::merge
diff --git a/glabels/Merge/TextCsv.h b/backends/merge/TextCsv.h
similarity index 59%
rename from glabels/Merge/TextCsv.h
rename to backends/merge/TextCsv.h
index f48405c..e0bb0e5 100644
--- a/glabels/Merge/TextCsv.h
+++ b/backends/merge/TextCsv.h
@@ -25,44 +25,39 @@
 #include "Text.h"
 
 
-namespace glabels
+namespace glabels::merge
 {
 
-	namespace merge
+	///
+	/// TextCsv Merge Backend
+	///
+	struct TextCsv : public Text
 	{
-	
-		///
-		/// TextCsv Merge Backend
-		///
-		struct TextCsv : public Text
-		{
 
-			/////////////////////////////////
-			// Life Cycle
-			/////////////////////////////////
-		private:
-			TextCsv();
-			TextCsv( const TextCsv* merge );
-			~TextCsv() override;
+		/////////////////////////////////
+		// Life Cycle
+		/////////////////////////////////
+	private:
+		TextCsv();
+		TextCsv( const TextCsv* merge );
+		~TextCsv() override;
 
 
-			/////////////////////////////////
-			// Object duplication
-			/////////////////////////////////
-		public:
-			TextCsv* clone() const override;
+		/////////////////////////////////
+		// Object duplication
+		/////////////////////////////////
+	public:
+		TextCsv* clone() const override;
 
 
-			/////////////////////////////////
-			// Static methods
-			/////////////////////////////////
-		public:
-			static QString id();
-			static Merge* create();
+		/////////////////////////////////
+		// Static methods
+		/////////////////////////////////
+	public:
+		static QString id();
+		static Merge* create();
 
-		};
-
-	}
+	};
 
 }
 
diff --git a/glabels/Merge/TextCsvKeys.cpp b/backends/merge/TextCsvKeys.cpp
similarity index 54%
rename from glabels/Merge/TextCsvKeys.cpp
rename to backends/merge/TextCsvKeys.cpp
index cbd647a..26c8438 100644
--- a/glabels/Merge/TextCsvKeys.cpp
+++ b/backends/merge/TextCsvKeys.cpp
@@ -21,65 +21,61 @@
 #include "TextCsvKeys.h"
 
 
-namespace glabels
+namespace glabels::merge
 {
 
-	namespace merge
+	static const QString ID = "Text/Comma/Line1Keys";
+	
+	
+	///
+	/// Constructor
+	///
+	TextCsvKeys::TextCsvKeys() : Text(',',true)
 	{
-		static const QString ID = "Text/Comma/Line1Keys";
-	
-	
-		///
-		/// Constructor
-		///
-		TextCsvKeys::TextCsvKeys() : Text(',',true)
-		{
-			mId = ID;
-		}
+		mId = ID;
+	}
 
 
-		///
-		/// Constructor
-		///
-		TextCsvKeys::TextCsvKeys( const TextCsvKeys* merge ) : Text( merge )
-		{
-		}
+	///
+	/// Constructor
+	///
+	TextCsvKeys::TextCsvKeys( const TextCsvKeys* merge ) : Text( merge )
+	{
+	}
 
 
-		///
-		/// Destructor
-		///
-		TextCsvKeys::~TextCsvKeys()
-		{
-		}
+	///
+	/// Destructor
+	///
+	TextCsvKeys::~TextCsvKeys()
+	{
+	}
 
 
-		///
-		/// Clone
-		///
-		TextCsvKeys* TextCsvKeys::clone() const
-		{
-			return new TextCsvKeys( this );
-		}
+	///
+	/// Clone
+	///
+	TextCsvKeys* TextCsvKeys::clone() const
+	{
+		return new TextCsvKeys( this );
+	}
 
 
-		///
-		/// Get ID
-		///
-		QString TextCsvKeys::id()
-		{
-			return ID;
-		}
+	///
+	/// Get ID
+	///
+	QString TextCsvKeys::id()
+	{
+		return ID;
+	}
 
 
-		///
-		/// Create
-		///
-		Merge* TextCsvKeys::create()
-		{
-			return new TextCsvKeys();
-		}
+	///
+	/// Create
+	///
+	Merge* TextCsvKeys::create()
+	{
+		return new TextCsvKeys();
+	}
 
-	} // namespace merge
-
-} // namespace glabels
+} // namespace glabels::merge
diff --git a/glabels/Merge/TextCsvKeys.h b/backends/merge/TextCsvKeys.h
similarity index 59%
rename from glabels/Merge/TextCsvKeys.h
rename to backends/merge/TextCsvKeys.h
index 8b674be..e800444 100644
--- a/glabels/Merge/TextCsvKeys.h
+++ b/backends/merge/TextCsvKeys.h
@@ -25,44 +25,39 @@
 #include "Text.h"
 
 
-namespace glabels
+namespace glabels::merge
 {
 
-	namespace merge
+	///
+	/// TextCsvKeys Merge Backend
+	///
+	struct TextCsvKeys : public Text
 	{
-	
-		///
-		/// TextCsvKeys Merge Backend
-		///
-		struct TextCsvKeys : public Text
-		{
 
-			/////////////////////////////////
-			// Life Cycle
-			/////////////////////////////////
-		private:
-			TextCsvKeys();
-			TextCsvKeys( const TextCsvKeys* merge );
-			~TextCsvKeys() override;
+		/////////////////////////////////
+		// Life Cycle
+		/////////////////////////////////
+	private:
+		TextCsvKeys();
+		TextCsvKeys( const TextCsvKeys* merge );
+		~TextCsvKeys() override;
 
 
-			/////////////////////////////////
-			// Object duplication
-			/////////////////////////////////
-		public:
-			TextCsvKeys* clone() const override;
+		/////////////////////////////////
+		// Object duplication
+		/////////////////////////////////
+	public:
+		TextCsvKeys* clone() const override;
 
 
-			/////////////////////////////////
-			// Static methods
-			/////////////////////////////////
-		public:
-			static QString id();
-			static Merge* create();
+		/////////////////////////////////
+		// Static methods
+		/////////////////////////////////
+	public:
+		static QString id();
+		static Merge* create();
 
-		};
-
-	}
+	};
 
 }
 
diff --git a/glabels/Merge/TextSemicolon.cpp b/backends/merge/TextSemicolon.cpp
similarity index 54%
rename from glabels/Merge/TextSemicolon.cpp
rename to backends/merge/TextSemicolon.cpp
index cdd8e74..393940f 100644
--- a/glabels/Merge/TextSemicolon.cpp
+++ b/backends/merge/TextSemicolon.cpp
@@ -21,65 +21,61 @@
 #include "TextSemicolon.h"
 
 
-namespace glabels
+namespace glabels::merge
 {
 
-	namespace merge
+	static const QString ID = "Text/Semicolon";
+
+
+	///
+	/// Constructor
+	///
+	TextSemicolon::TextSemicolon() : Text(';',false)
 	{
-		static const QString ID = "Text/Semicolon";
+		mId = ID;
+	}
 
 
-		///
-		/// Constructor
-		///
-		TextSemicolon::TextSemicolon() : Text(';',false)
-		{
-			mId = ID;
-		}
+	///
+	/// Constructor
+	///
+	TextSemicolon::TextSemicolon( const TextSemicolon* merge ) : Text( merge )
+	{
+	}
 
 
-		///
-		/// Constructor
-		///
-		TextSemicolon::TextSemicolon( const TextSemicolon* merge ) : Text( merge )
-		{
-		}
+	///
+	/// Destructor
+	///
+	TextSemicolon::~TextSemicolon()
+	{
+	}
 
 
-		///
-		/// Destructor
-		///
-		TextSemicolon::~TextSemicolon()
-		{
-		}
+	///
+	/// Clone
+	///
+	TextSemicolon* TextSemicolon::clone() const
+	{
+		return new TextSemicolon( this );
+	}
 
 
-		///
-		/// Clone
-		///
-		TextSemicolon* TextSemicolon::clone() const
-		{
-			return new TextSemicolon( this );
-		}
+	///
+	/// Get ID
+	///
+	QString TextSemicolon::id()
+	{
+		return ID;
+	}
 
 
-		///
-		/// Get ID
-		///
-		QString TextSemicolon::id()
-		{
-			return ID;
-		}
+	///
+	/// Create
+	///
+	Merge* TextSemicolon::create()
+	{
+		return new TextSemicolon();
+	}
 
-
-		///
-		/// Create
-		///
-		Merge* TextSemicolon::create()
-		{
-			return new TextSemicolon();
-		}
-
-	} // namespace merge
-
-} // namespace glabels
+} // namespace glabels::merge
diff --git a/glabels/Merge/TextSemicolon.h b/backends/merge/TextSemicolon.h
similarity index 58%
rename from glabels/Merge/TextSemicolon.h
rename to backends/merge/TextSemicolon.h
index fde25f2..262dddf 100644
--- a/glabels/Merge/TextSemicolon.h
+++ b/backends/merge/TextSemicolon.h
@@ -25,44 +25,39 @@
 #include "Text.h"
 
 
-namespace glabels
+namespace glabels::merge
 {
 
-	namespace merge
+	///
+	/// TextSemicolon Merge Backend
+	///
+	struct TextSemicolon : public Text
 	{
-	
-		///
-		/// TextSemicolon Merge Backend
-		///
-		struct TextSemicolon : public Text
-		{
 
-			/////////////////////////////////
-			// Life Cycle
-			/////////////////////////////////
-		private:
-			TextSemicolon();
-			TextSemicolon( const TextSemicolon* merge );
-			~TextSemicolon() override;
+		/////////////////////////////////
+		// Life Cycle
+		/////////////////////////////////
+	private:
+		TextSemicolon();
+		TextSemicolon( const TextSemicolon* merge );
+		~TextSemicolon() override;
 
 
-			/////////////////////////////////
-			// Object duplication
-			/////////////////////////////////
-		public:
-			TextSemicolon* clone() const override;
+		/////////////////////////////////
+		// Object duplication
+		/////////////////////////////////
+	public:
+		TextSemicolon* clone() const override;
 
 
-			/////////////////////////////////
-			// Static methods
-			/////////////////////////////////
-		public:
-			static QString id();
-			static Merge* create();
+		/////////////////////////////////
+		// Static methods
+		/////////////////////////////////
+	public:
+		static QString id();
+		static Merge* create();
 
-		};
-
-	}
+	};
 
 }
 
diff --git a/glabels/Merge/TextSemicolonKeys.cpp b/backends/merge/TextSemicolonKeys.cpp
similarity index 52%
rename from glabels/Merge/TextSemicolonKeys.cpp
rename to backends/merge/TextSemicolonKeys.cpp
index 760041d..77a0f14 100644
--- a/glabels/Merge/TextSemicolonKeys.cpp
+++ b/backends/merge/TextSemicolonKeys.cpp
@@ -21,65 +21,61 @@
 #include "TextSemicolonKeys.h"
 
 
-namespace glabels
+namespace glabels::merge
 {
 
-	namespace merge
+	static const QString ID = "Text/Semicolon/Keys";
+
+
+	///
+	/// Constructor
+	///
+	TextSemicolonKeys::TextSemicolonKeys() : Text(';',true)
 	{
-		static const QString ID = "Text/Semicolon/Keys";
+		mId = ID;
+	}
 
 
-		///
-		/// Constructor
-		///
-		TextSemicolonKeys::TextSemicolonKeys() : Text(';',true)
-		{
-			mId = ID;
-		}
+	///
+	/// Constructor
+	///
+	TextSemicolonKeys::TextSemicolonKeys( const TextSemicolonKeys* merge ) : Text( merge )
+	{
+	}
 
 
-		///
-		/// Constructor
-		///
-		TextSemicolonKeys::TextSemicolonKeys( const TextSemicolonKeys* merge ) : Text( merge )
-		{
-		}
+	///
+	/// Destructor
+	///
+	TextSemicolonKeys::~TextSemicolonKeys()
+	{
+	}
 
 
-		///
-		/// Destructor
-		///
-		TextSemicolonKeys::~TextSemicolonKeys()
-		{
-		}
+	///
+	/// Clone
+	///
+	TextSemicolonKeys* TextSemicolonKeys::clone() const
+	{
+		return new TextSemicolonKeys( this );
+	}
 
 
-		///
-		/// Clone
-		///
-		TextSemicolonKeys* TextSemicolonKeys::clone() const
-		{
-			return new TextSemicolonKeys( this );
-		}
+	///
+	/// Get ID
+	///
+	QString TextSemicolonKeys::id()
+	{
+		return ID;
+	}
 
 
-		///
-		/// Get ID
-		///
-		QString TextSemicolonKeys::id()
-		{
-			return ID;
-		}
+	///
+	/// Create
+	///
+	Merge* TextSemicolonKeys::create()
+	{
+		return new TextSemicolonKeys();
+	}
 
-
-		///
-		/// Create
-		///
-		Merge* TextSemicolonKeys::create()
-		{
-			return new TextSemicolonKeys();
-		}
-
-	} // namespace merge
-
-} // namespace glabels
+} // namespace glabels::merge
diff --git a/glabels/Merge/TextSemicolonKeys.h b/backends/merge/TextSemicolonKeys.h
similarity index 58%
rename from glabels/Merge/TextSemicolonKeys.h
rename to backends/merge/TextSemicolonKeys.h
index 6281e4b..1c6a43a 100644
--- a/glabels/Merge/TextSemicolonKeys.h
+++ b/backends/merge/TextSemicolonKeys.h
@@ -25,44 +25,39 @@
 #include "Text.h"
 
 
-namespace glabels
+namespace glabels::merge
 {
 
-	namespace merge
+	///
+	/// TextSemicolonKeys Merge Backend
+	///
+	struct TextSemicolonKeys : public Text
 	{
-	
-		///
-		/// TextSemicolonKeys Merge Backend
-		///
-		struct TextSemicolonKeys : public Text
-		{
 
-			/////////////////////////////////
-			// Life Cycle
-			/////////////////////////////////
-		private:
-			TextSemicolonKeys();
-			TextSemicolonKeys( const TextSemicolonKeys* merge );
-			~TextSemicolonKeys() override;
+		/////////////////////////////////
+		// Life Cycle
+		/////////////////////////////////
+	private:
+		TextSemicolonKeys();
+		TextSemicolonKeys( const TextSemicolonKeys* merge );
+		~TextSemicolonKeys() override;
 
 
-			/////////////////////////////////
-			// Object duplication
-			/////////////////////////////////
-		public:
-			TextSemicolonKeys* clone() const override;
+		/////////////////////////////////
+		// Object duplication
+		/////////////////////////////////
+	public:
+		TextSemicolonKeys* clone() const override;
 
 
-			/////////////////////////////////
-			// Static methods
-			/////////////////////////////////
-		public:
-			static QString id();
-			static Merge* create();
+		/////////////////////////////////
+		// Static methods
+		/////////////////////////////////
+	public:
+		static QString id();
+		static Merge* create();
 
-		};
-
-	}
+	};
 
 }
 
diff --git a/glabels/Merge/TextTsv.cpp b/backends/merge/TextTsv.cpp
similarity index 56%
rename from glabels/Merge/TextTsv.cpp
rename to backends/merge/TextTsv.cpp
index 4963efc..4328be0 100644
--- a/glabels/Merge/TextTsv.cpp
+++ b/backends/merge/TextTsv.cpp
@@ -21,65 +21,61 @@
 #include "TextTsv.h"
 
 
-namespace glabels
+namespace glabels::merge
 {
 
-	namespace merge
-	{
-		static const QString ID = "Text/Tab";
+	static const QString ID = "Text/Tab";
 
 	
-		///
-		/// Constructor
-		///
-		TextTsv::TextTsv() : Text('\t',false)
-		{
-			mId = ID;
-		}
+	///
+	/// Constructor
+	///
+	TextTsv::TextTsv() : Text('\t',false)
+	{
+		mId = ID;
+	}
 
 
-		///
-		/// Constructor
-		///
-		TextTsv::TextTsv( const TextTsv* merge ) : Text( merge )
-		{
-		}
+	///
+	/// Constructor
+	///
+	TextTsv::TextTsv( const TextTsv* merge ) : Text( merge )
+	{
+	}
 
 
-		///
-		/// Destructor
-		///
-		TextTsv::~TextTsv()
-		{
-		}
+	///
+	/// Destructor
+	///
+	TextTsv::~TextTsv()
+	{
+	}
 
 
-		///
-		/// Clone
-		///
-		TextTsv* TextTsv::clone() const
-		{
-			return new TextTsv( this );
-		}
+	///
+	/// Clone
+	///
+	TextTsv* TextTsv::clone() const
+	{
+		return new TextTsv( this );
+	}
 
 
-		///
-		/// Get ID
-		///
-		QString TextTsv::id()
-		{
-			return ID;
-		}
+	///
+	/// Get ID
+	///
+	QString TextTsv::id()
+	{
+		return ID;
+	}
 
 
-		///
-		/// Create
-		///
-		Merge* TextTsv::create()
-		{
-			return new TextTsv();
-		}
+	///
+	/// Create
+	///
+	Merge* TextTsv::create()
+	{
+		return new TextTsv();
+	}
 
-	} // namespace merge
-
-} // namespace glabels
+} // namespace glabels::merge
diff --git a/glabels/Merge/TextTsv.h b/backends/merge/TextTsv.h
similarity index 59%
rename from glabels/Merge/TextTsv.h
rename to backends/merge/TextTsv.h
index 59b8e8f..5c772bf 100644
--- a/glabels/Merge/TextTsv.h
+++ b/backends/merge/TextTsv.h
@@ -25,44 +25,39 @@
 #include "Text.h"
 
 
-namespace glabels
+namespace glabels::merge
 {
 
-	namespace merge
+	///
+	/// TextTsv Merge Backend
+	///
+	struct TextTsv : public Text
 	{
-	
-		///
-		/// TextTsv Merge Backend
-		///
-		struct TextTsv : public Text
-		{
 
-			/////////////////////////////////
-			// Life Cycle
-			/////////////////////////////////
-		private:
-			TextTsv();
-			TextTsv( const TextTsv* merge );
-			~TextTsv() override;
+		/////////////////////////////////
+		// Life Cycle
+		/////////////////////////////////
+	private:
+		TextTsv();
+		TextTsv( const TextTsv* merge );
+		~TextTsv() override;
 
 
-			/////////////////////////////////
-			// Object duplication
-			/////////////////////////////////
-		public:
-			TextTsv* clone() const override;
+		/////////////////////////////////
+		// Object duplication
+		/////////////////////////////////
+	public:
+		TextTsv* clone() const override;
 
 
-			/////////////////////////////////
-			// Static methods
-			/////////////////////////////////
-		public:
-			static QString id();
-			static Merge* create();
+		/////////////////////////////////
+		// Static methods
+		/////////////////////////////////
+	public:
+		static QString id();
+		static Merge* create();
 
-		};
-
-	}
+	};
 
 }
 
diff --git a/glabels/Merge/TextTsvKeys.cpp b/backends/merge/TextTsvKeys.cpp
similarity index 54%
rename from glabels/Merge/TextTsvKeys.cpp
rename to backends/merge/TextTsvKeys.cpp
index 4a1967d..3f6e247 100644
--- a/glabels/Merge/TextTsvKeys.cpp
+++ b/backends/merge/TextTsvKeys.cpp
@@ -21,65 +21,61 @@
 #include "TextTsvKeys.h"
 
 
-namespace glabels
+namespace glabels::merge
 {
 
-	namespace merge
+	static const QString ID = "Text/Tab/Line1Keys";
+
+
+	///
+	/// Constructor
+	///
+	TextTsvKeys::TextTsvKeys() : Text('\t',true)
 	{
-		static const QString ID = "Text/Tab/Line1Keys";
+		mId = ID;
+	}
 
 
-		///
-		/// Constructor
-		///
-		TextTsvKeys::TextTsvKeys() : Text('\t',true)
-		{
-			mId = ID;
-		}
+	///
+	/// Constructor
+	///
+	TextTsvKeys::TextTsvKeys( const TextTsvKeys* merge ) : Text( merge )
+	{
+	}
 
 
-		///
-		/// Constructor
-		///
-		TextTsvKeys::TextTsvKeys( const TextTsvKeys* merge ) : Text( merge )
-		{
-		}
+	///
+	/// Destructor
+	///
+	TextTsvKeys::~TextTsvKeys()
+	{
+	}
 
 
-		///
-		/// Destructor
-		///
-		TextTsvKeys::~TextTsvKeys()
-		{
-		}
+	///
+	/// Clone
+	///
+	TextTsvKeys* TextTsvKeys::clone() const
+	{
+		return new TextTsvKeys( this );
+	}
 
 
-		///
-		/// Clone
-		///
-		TextTsvKeys* TextTsvKeys::clone() const
-		{
-			return new TextTsvKeys( this );
-		}
+	///
+	/// Get ID
+	///
+	QString TextTsvKeys::id()
+	{
+		return ID;
+	}
 
 
-		///
-		/// Get ID
-		///
-		QString TextTsvKeys::id()
-		{
-			return ID;
-		}
+	///
+	/// Create
+	///
+	Merge* TextTsvKeys::create()
+	{
+		return new TextTsvKeys();
+	}
 
-
-		///
-		/// Create
-		///
-		Merge* TextTsvKeys::create()
-		{
-			return new TextTsvKeys();
-		}
-
-	} // namespace merge
-
-} // namespace glabels
+} // namespace glabels::merge
diff --git a/glabels/Merge/TextTsvKeys.h b/backends/merge/TextTsvKeys.h
similarity index 59%
rename from glabels/Merge/TextTsvKeys.h
rename to backends/merge/TextTsvKeys.h
index 7347c88..0668848 100644
--- a/glabels/Merge/TextTsvKeys.h
+++ b/backends/merge/TextTsvKeys.h
@@ -25,44 +25,39 @@
 #include "Text.h"
 
 
-namespace glabels
+namespace glabels::merge
 {
 
-	namespace merge
+	///
+	/// TextTsvKeys Merge Backend
+	///
+	struct TextTsvKeys : public Text
 	{
-	
-		///
-		/// TextTsvKeys Merge Backend
-		///
-		struct TextTsvKeys : public Text
-		{
 
-			/////////////////////////////////
-			// Life Cycle
-			/////////////////////////////////
-		private:
-			TextTsvKeys();
-			TextTsvKeys( const TextTsvKeys* merge );
-			~TextTsvKeys() override;
+		/////////////////////////////////
+		// Life Cycle
+		/////////////////////////////////
+	private:
+		TextTsvKeys();
+		TextTsvKeys( const TextTsvKeys* merge );
+		~TextTsvKeys() override;
 
 
-			/////////////////////////////////
-			// Object duplication
-			/////////////////////////////////
-		public:
-			TextTsvKeys* clone() const override;
+		/////////////////////////////////
+		// Object duplication
+		/////////////////////////////////
+	public:
+		TextTsvKeys* clone() const override;
 
 
-			/////////////////////////////////
-			// Static methods
-			/////////////////////////////////
-		public:
-			static QString id();
-			static Merge* create();
+		/////////////////////////////////
+		// Static methods
+		/////////////////////////////////
+	public:
+		static QString id();
+		static Merge* create();
 
-		};
-
-	}
+	};
 
 }
 
diff --git a/cmake/Modules/FindGnuBarcode.cmake b/cmake/Modules/FindGnuBarcode.cmake
index 45997b9..b8703a2 100644
--- a/cmake/Modules/FindGnuBarcode.cmake
+++ b/cmake/Modules/FindGnuBarcode.cmake
@@ -2,15 +2,36 @@
 # Once done this will define
 #
 #  GNUBARCODE_FOUND - System has GNU Barcode
-#  GNUBARCODE_INCLUDE_DIR - The GNU Barcode include directory
+#  GNUBARCODE_INCLUDE_DIRS - The GNU Barcode include directory
 #  GNUBARCODE_LIBRARIES - The libraries needed to use GNU Barcode
+#  GNUBARCODE_DEFINITIONS - Definitions needed to use GNU Barcode
 #  GNUBARCODE_VERSION_STRING - the version of GNU Barcode found
 
 set (GNUBARCODE_DEFINITIONS "")
 
 find_path (GNUBARCODE_INCLUDE_DIR NAMES barcode.h PATH_SUFFIXES barcode)
 
-find_library (GNUBARCODE_LIBRARIES NAMES barcode )
+find_library (GNUBARCODE_LIBRARY NAMES barcode )
+
+if (GNUBARCODE_LIBRARY AND GNUBARCODE_INCLUDE_DIR)
+  
+  set (GNUBARCODE_INCLUDE_DIRS ${GNUBARCODE_INCLUDE_DIR})
+  set (GNUBARCODE_LIBRARIES ${GNUBARCODE_LIBRARY})
+  set (GNUBARCODE_DEFINITIONS "")
+
+  if (NOT TARGET GNU::BARCODE)
+    
+    add_library (GNU::BARCODE UNKNOWN IMPORTED)
+    set_target_properties (GNU::BARCODE PROPERTIES
+      INTERFACE_COMPILE_DEFINITIONS     "${GNUBARCODE_DEFINITIONS}"
+      INTERFACE_INCLUDE_DIRECTORIES     "${GNUBARCODE_INCLUDE_DIRS}"
+      IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+      IMPORTED_LOCATION                 "${GNUBARCODE_LIBRARY}"
+    )
+    
+  endif ()
+
+endif ()
 
 if (GNUBARCODE_INCLUDE_DIR AND EXISTS "${GNUBARCODE_INCLUDE_DIR}/barcode.h")
   file (STRINGS "${GNUBARCODE_INCLUDE_DIR}/barcode.h" BARCODE_H REGEX "^#define BARCODE_VERSION *\"[^\"]*\"")
@@ -20,8 +41,8 @@ endif()
 # handle the QUIETLY and REQUIRED arguments and set GNUBARCODE_FOUND to TRUE if
 # all listed variables are TRUE
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GnuBarcode
-                                  REQUIRED_VARS GNUBARCODE_LIBRARIES GNUBARCODE_INCLUDE_DIR
+find_package_handle_standard_args(GnuBarcode
+                                  REQUIRED_VARS GNUBARCODE_LIBRARY GNUBARCODE_INCLUDE_DIR
                                   VERSION_VAR GNUBARCODE_VERSION_STRING)
 
-mark_as_advanced(GNUBARCODE_INCLUDE_DIR GNUBARCODE_LIBRARIES)
+mark_as_advanced(GNUBARCODE_INCLUDE_DIR GNUBARCODE_LIBRARY)
diff --git a/cmake/Modules/FindLibQrencode.cmake b/cmake/Modules/FindLibQrencode.cmake
index e5390ee..8aaa839 100644
--- a/cmake/Modules/FindLibQrencode.cmake
+++ b/cmake/Modules/FindLibQrencode.cmake
@@ -2,7 +2,7 @@
 # Once done this will define
 #
 #  LIBQRENCODE_FOUND - System has LibQrencode
-#  LIBQRENCODE_INCLUDE_DIR - The LibQrencode include directory
+#  LIBQRENCODE_INCLUDE_DIRS - The LibQrencode include directory
 #  LIBQRENCODE_LIBRARIES - The libraries needed to use LibQrencode
 #  LIBQRENCODE_DEFINITIONS - Compiler switches required for using LibQrencode
 #  LIBQRENCODE_VERSION_STRING - the version of LibQrencode found
@@ -19,12 +19,32 @@ find_path(LIBQRENCODE_INCLUDE_DIR NAMES qrencode.h
    PATH_SUFFIXES libqrencode
    )
 
-find_library(LIBQRENCODE_LIBRARIES NAMES qrencode libqrencode
+find_library(LIBQRENCODE_LIBRARY NAMES qrencode libqrencode
    HINTS
    ${PC_LIBQRENCODE_LIBDIR}
    ${PC_LIBQRENCODE_LIBRARY_DIRS}
    )
 
+if (LIBQRENCODE_LIBRARY AND LIBQRENCODE_INCLUDE_DIR)
+  
+  set (LIBQRENCODE_INCLUDE_DIRS ${LIBQRENCODE_INCLUDE_DIR})
+  set (LIBQRENCODE_LIBRARIES ${LIBQRENCODE_LIBRARY})
+  set (LIBQRENCODE_DEFINITIONS "")
+
+  if (NOT TARGET QRENCODE::QRENCODE)
+    
+    add_library (QRENCODE::QRENCODE UNKNOWN IMPORTED)
+    set_target_properties (QRENCODE::QRENCODE PROPERTIES
+      INTERFACE_COMPILE_DEFINITIONS     "${LIBQRENCODE_DEFINITIONS}"
+      INTERFACE_INCLUDE_DIRECTORIES     "${LIBQRENCODE_INCLUDE_DIRS}"
+      IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+      IMPORTED_LOCATION                 "${LIBQRENCODE_LIBRARY}"
+    )
+    
+  endif ()
+
+endif ()
+
 if(PC_LIBQRENCODE_VERSION)
     set(LIBQRENCODE_VERSION_STRING ${PC_LIBQRENCODE_VERSION})
 endif()
@@ -32,8 +52,8 @@ endif()
 # handle the QUIETLY and REQUIRED arguments and set LIBQRENCODE_FOUND to TRUE if
 # all listed variables are TRUE
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibQrencode
-                                  REQUIRED_VARS LIBQRENCODE_LIBRARIES LIBQRENCODE_INCLUDE_DIR
+find_package_handle_standard_args(LibQrencode
+                                  REQUIRED_VARS LIBQRENCODE_LIBRARY LIBQRENCODE_INCLUDE_DIR
                                   VERSION_VAR LIBQRENCODE_VERSION_STRING)
 
-mark_as_advanced(LIBQRENCODE_INCLUDE_DIR LIBQRENCODE_LIBRARIES)
+mark_as_advanced(LIBQRENCODE_INCLUDE_DIR LIBQRENCODE_LIBRARY)
diff --git a/cmake/Modules/FindLibZint.cmake b/cmake/Modules/FindLibZint.cmake
index 83bdb6b..b44d80a 100644
--- a/cmake/Modules/FindLibZint.cmake
+++ b/cmake/Modules/FindLibZint.cmake
@@ -2,8 +2,9 @@
 # Once done this will define
 #
 #  LIBZINT_FOUND - System has Zint barcode
-#  LIBZINT_INCLUDE_DIR - The Zint barcode include directory
+#  LIBZINT_INCLUDE_DIRS - The Zint barcode include directory
 #  LIBZINT_LIBRARIES - The libraries needed to use Zint barcode
+#  LIBZINT_DEFINITIONS - Definitions needed to use Zint barcode
 #  LIBZINT_VERSION_STRING - the version of Zint barcode found
 
 set (LIBZINT_DEFINITIONS "")
@@ -12,6 +13,26 @@ find_path (LIBZINT_INCLUDE_DIR NAMES zint.h)
 
 find_library (LIBZINT_LIBRARIES NAMES zint )
 
+if (LIBZINT_LIBRARY AND LIBZINT_INCLUDE_DIR)
+  
+  set (LIBZINT_INCLUDE_DIRS ${LIBZINT_INCLUDE_DIR})
+  set (LIBZINT_LIBRARIES ${LIBZINT_LIBRARY})
+  set (LIBZINT_DEFINITIONS "")
+
+  if (NOT TARGET ZINT::ZINT)
+    
+    add_library (ZINT::ZINT UNKNOWN IMPORTED)
+    set_target_properties (ZINT::ZINT PROPERTIES
+      INTERFACE_COMPILE_DEFINITIONS     "${LIBZINT_DEFINITIONS}"
+      INTERFACE_INCLUDE_DIRECTORIES     "${LIBZINT_INCLUDE_DIRS}"
+      IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+      IMPORTED_LOCATION                 "${LIBZINT_LIBRARY}"
+    )
+    
+  endif ()
+
+endif ()
+
 if (LIBZINT_INCLUDE_DIR AND EXISTS "${LIBZINT_INCLUDE_DIR}/zint.h")
   file (STRINGS "${LIBZINT_INCLUDE_DIR}/zint.h" ZINT_MAJOR_H REGEX "^#define ZINT_VERSION_MAJOR *[0-9]*")
   file (STRINGS "${LIBZINT_INCLUDE_DIR}/zint.h" ZINT_MINOR_H REGEX "^#define ZINT_VERSION_MINOR *[0-9]*")
@@ -25,8 +46,8 @@ endif()
 # handle the QUIETLY and REQUIRED arguments and set LIBZINT_FOUND to TRUE if
 # all listed variables are TRUE
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibZint
-                                  REQUIRED_VARS LIBZINT_LIBRARIES LIBZINT_INCLUDE_DIR
+find_package_handle_standard_args(LibZint
+                                  REQUIRED_VARS LIBZINT_LIBRARY LIBZINT_INCLUDE_DIR
                                   VERSION_VAR LIBZINT_VERSION_STRING)
 
-mark_as_advanced(LIBZINT_INCLUDE_DIR LIBZINT_LIBRARIES)
+mark_as_advanced(LIBZINT_INCLUDE_DIR LIBZINT_LIBRARY)
diff --git a/glabels-batch/CMakeLists.txt b/glabels-batch/CMakeLists.txt
new file mode 100644
index 0000000..c2abedc
--- /dev/null
+++ b/glabels-batch/CMakeLists.txt
@@ -0,0 +1,29 @@
+project (glabels-batch LANGUAGES CXX)
+
+#=======================================
+# Sources
+#=======================================
+set (glabels-batch_sources
+  main.cpp
+)
+
+#=====================================
+# Target
+#=====================================
+add_executable (glabels-batch-qt WIN32
+  ${glabels-batch_sources}
+)
+
+target_compile_features (glabels-batch-qt
+  PUBLIC cxx_std_11
+)
+
+target_link_libraries (glabels-batch-qt
+  Model
+)
+
+#=======================================
+# Install
+#=======================================
+install (TARGETS glabels-batch-qt RUNTIME DESTINATION bin)
+
diff --git a/glabels/glabels-batch_main.cpp b/glabels-batch/main.cpp
similarity index 87%
rename from glabels/glabels-batch_main.cpp
rename to glabels-batch/main.cpp
index 17dab37..a7409e2 100644
--- a/glabels/glabels-batch_main.cpp
+++ b/glabels-batch/main.cpp
@@ -1,4 +1,4 @@
-/*  glabels-batch_main.cpp
+/*  main.cpp
  *
  *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
  *
@@ -18,16 +18,16 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "BarcodeBackends.h"
-#include "FileUtil.h"
-#include "Db.h"
-#include "LabelModel.h"
-#include "PageRenderer.h"
-#include "Settings.h"
-#include "Version.h"
-#include "XmlLabelParser.h"
+#include "model/FileUtil.h"
+#include "model/Db.h"
+#include "model/Model.h"
+#include "model/PageRenderer.h"
+#include "model/Settings.h"
+#include "model/Version.h"
+#include "model/XmlLabelParser.h"
 
-#include "Merge/Factory.h"
+#include "barcode/Backends.h"
+#include "merge/Factory.h"
 
 #include <QApplication>
 #include <QCommandLineParser>
@@ -46,14 +46,14 @@ int main( int argc, char **argv )
 	QCoreApplication::setOrganizationName( "glabels.org" );
 	QCoreApplication::setOrganizationDomain( "glabels.org" );
 	QCoreApplication::setApplicationName( "glabels-batch-qt" );
-	QCoreApplication::setApplicationVersion( glabels::Version::STRING );
+	QCoreApplication::setApplicationVersion( glabels::model::Version::STRING );
 
 	//
 	// Setup translators
 	//
 	QLocale locale = QLocale::system();
 	QString qtTranslationsDir = QLibraryInfo::location( QLibraryInfo::TranslationsPath );
-	QString myTranslationsDir = glabels::FileUtil::translationsDir().canonicalPath();
+	QString myTranslationsDir = glabels::model::FileUtil::translationsDir().canonicalPath();
 	
 	QTranslator qtTranslator;
 	if ( qtTranslator.load( locale, "qt", "_", qtTranslationsDir ) )
@@ -125,18 +125,18 @@ int main( int argc, char **argv )
 	//
 	// Initialize subsystems
 	//
-	glabels::Settings::init();
-	glabels::Db::init();
+	glabels::model::Settings::init();
+	glabels::model::Db::init();
 	glabels::merge::Factory::init();
-	glabels::BarcodeBackends::init();
+	glabels::barcode::Backends::init();
 
 	
 	if ( parser.positionalArguments().size() == 1 )
 	{
 		QString filename = parser.positionalArguments().first();
 
-		glabels::LabelModel *label = glabels::XmlLabelParser::readFile( filename );
-		if ( label )
+		glabels::model::Model *model = glabels::model::XmlLabelParser::readFile( filename );
+		if ( model )
 		{
 			QPrinter printer( QPrinter::HighResolution );
 			printer.setColorMode( QPrinter::Color );
@@ -155,7 +155,7 @@ int main( int argc, char **argv )
 				qDebug() << "Batch mode.  printer =" << QPrinterInfo::defaultPrinterName();
 			}
 
-			glabels::PageRenderer renderer( label );
+			glabels::model::PageRenderer renderer( model );
 			renderer.setNCopies( 1 );
 			renderer.setStartLabel( parser.value( "first" ).toInt() - 1 );
 			renderer.setPrintOutlines( parser.isSet( "outlines" ) );
diff --git a/glabels/AboutDialog.cpp b/glabels/AboutDialog.cpp
index ad4d7fc..d72db39 100644
--- a/glabels/AboutDialog.cpp
+++ b/glabels/AboutDialog.cpp
@@ -20,7 +20,7 @@
 
 #include "AboutDialog.h"
 
-#include "Version.h"
+#include "model/Version.h"
 
 #include <QDesktopServices>
 #include <QUrl>
@@ -38,7 +38,7 @@ namespace glabels
 	{
 		setupUi( this );
 
-		QString version = tr("Version") + " " + Version::STRING;
+		QString version = tr("Version") + " " + model::Version::STRING;
 	
 		QString description = tr("A program to create labels and business cards.");
 	
@@ -81,7 +81,7 @@ namespace glabels
 	///
 	void AboutDialog::onWebsiteButtonClicked()
 	{
-		QDesktopServices::openUrl( QUrl(Version::WEBSITE) );
+		QDesktopServices::openUrl( QUrl(model::Version::WEBSITE) );
 	}
 
 } // namespace glabels
diff --git a/glabels/BarcodeBackends/CMakeLists.txt b/glabels/BarcodeBackends/CMakeLists.txt
deleted file mode 100644
index 16b8ccb..0000000
--- a/glabels/BarcodeBackends/CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-#=======================================
-# Sources
-#=======================================
-set (barcode_sources
-  GnuBarcode.cpp
-  QrEncode.cpp
-  Zint.cpp
-)
-
-add_library (Barcode STATIC
-  ${barcode_sources}
-)
-
-
-#=======================================
-# Where to find stuff
-#=======================================
-include_directories (
-)
-
-link_directories (
-)
-
-
-#=======================================
-# Subdirectories
-#=======================================
-
-
-#=======================================
-# Install
-#=======================================
diff --git a/glabels/BarcodeMenu.cpp b/glabels/BarcodeMenu.cpp
index 7297af6..1f8c597 100644
--- a/glabels/BarcodeMenu.cpp
+++ b/glabels/BarcodeMenu.cpp
@@ -20,9 +20,10 @@
 
 #include "BarcodeMenu.h"
 
-#include "BarcodeBackends.h"
 #include "BarcodeMenuItem.h"
 
+#include "barcode/Backends.h"
+
 #include <QtDebug>
 
 
@@ -34,29 +35,29 @@ namespace glabels
 	///
 	BarcodeMenu::BarcodeMenu()
 	{
-		foreach ( const BarcodeStyle& bcStyle, BarcodeBackends::styleList() )
+		foreach ( const barcode::Style& bcStyle, barcode::Backends::styleList() )
 		{
 			if ( bcStyle.backendId() == "" )
 			{
 				BarcodeMenuItem* bcMenuItem = new BarcodeMenuItem( bcStyle );
-				connect( bcMenuItem, SIGNAL(activated(const BarcodeStyle&)),
-				         this, SLOT(onMenuItemActivated(const BarcodeStyle&)) );
+				connect( bcMenuItem, SIGNAL(activated(const barcode::Style&)),
+				         this, SLOT(onMenuItemActivated(const barcode::Style&)) );
 
 				addAction( bcMenuItem );
 			}
 		}
 
-		foreach ( const QString& backendId, BarcodeBackends::backendList() )
+		foreach ( const QString& backendId, barcode::Backends::backendList() )
 		{
-			QMenu* subMenu = addMenu( BarcodeBackends::backendName( backendId ) );
+			QMenu* subMenu = addMenu( barcode::Backends::backendName( backendId ) );
 			
-			foreach ( const BarcodeStyle& bcStyle, BarcodeBackends::styleList() )
+			foreach ( const barcode::Style& bcStyle, barcode::Backends::styleList() )
 			{
 				if ( bcStyle.backendId() == backendId )
 				{
 					BarcodeMenuItem* bcMenuItem = new BarcodeMenuItem( bcStyle );
-					connect( bcMenuItem, SIGNAL(activated(const BarcodeStyle&)),
-					         this, SLOT(onMenuItemActivated(const BarcodeStyle&)) );
+					connect( bcMenuItem, SIGNAL(activated(const barcode::Style&)),
+					         this, SLOT(onMenuItemActivated(const barcode::Style&)) );
 
 					subMenu->addAction( bcMenuItem );
 				}
@@ -68,7 +69,7 @@ namespace glabels
 	///
 	/// bcStyle getter
 	///
-	BarcodeStyle BarcodeMenu::bcStyle() const
+	barcode::Style BarcodeMenu::bcStyle() const
 	{
 		return mBcStyle;
 	}
@@ -77,7 +78,7 @@ namespace glabels
 	///
 	/// onMenuItemActivated slot
 	///
-	void BarcodeMenu::onMenuItemActivated( const BarcodeStyle& bcStyle )
+	void BarcodeMenu::onMenuItemActivated( const barcode::Style& bcStyle )
 	{
 		mBcStyle = bcStyle;
 
diff --git a/glabels/BarcodeMenu.h b/glabels/BarcodeMenu.h
index 8471bfc..8037f97 100644
--- a/glabels/BarcodeMenu.h
+++ b/glabels/BarcodeMenu.h
@@ -22,7 +22,7 @@
 #define BarcodeMenu_h
 
 
-#include "BarcodeStyle.h"
+#include "barcode/Style.h"
 
 #include <QMenu>
 
@@ -55,21 +55,21 @@ namespace glabels
 		// Properties
 		/////////////////////////////////
 	public:
-		BarcodeStyle bcStyle() const;
+		barcode::Style bcStyle() const;
 
 
 		/////////////////////////////////
 		// Slots
 		/////////////////////////////////
 	private slots:
-		void onMenuItemActivated( const BarcodeStyle& bcStyle );
+		void onMenuItemActivated( const barcode::Style& bcStyle );
 
 
 		/////////////////////////////////
 		// Private Data
 		/////////////////////////////////
 	private:
-		BarcodeStyle mBcStyle;
+		barcode::Style mBcStyle;
 
 	};
 
diff --git a/glabels/BarcodeMenuButton.cpp b/glabels/BarcodeMenuButton.cpp
index 67d2a66..8a2b13e 100644
--- a/glabels/BarcodeMenuButton.cpp
+++ b/glabels/BarcodeMenuButton.cpp
@@ -20,9 +20,10 @@
 
 #include "BarcodeMenuButton.h"
 
-#include "BarcodeBackends.h"
 #include "BarcodeMenuItem.h"
 
+#include "barcode/Backends.h"
+
 #include <QtDebug>
 
 
@@ -38,7 +39,7 @@ namespace glabels
 		mMenu = new BarcodeMenu();
 		setMenu( mMenu );
 
-		mBcStyle = BarcodeBackends::defaultStyle();
+		mBcStyle = barcode::Backends::defaultStyle();
 		setText( mBcStyle.name() );
 
 		connect( mMenu, SIGNAL(selectionChanged()), this, SLOT(onMenuSelectionChanged()) );
@@ -48,7 +49,7 @@ namespace glabels
 	///
 	/// bcStyle getter
 	///
-	BarcodeStyle BarcodeMenuButton::bcStyle() const
+	barcode::Style BarcodeMenuButton::bcStyle() const
 	{
 		return mBcStyle;
 	}
@@ -57,7 +58,7 @@ namespace glabels
 	///
 	/// bcStyle setter
 	///
-	void BarcodeMenuButton::setBcStyle( const BarcodeStyle& bcStyle )
+	void BarcodeMenuButton::setBcStyle( const barcode::Style& bcStyle )
 	{
 		mBcStyle = bcStyle;
 		setText( mBcStyle.name() );
diff --git a/glabels/BarcodeMenuButton.h b/glabels/BarcodeMenuButton.h
index 263ecd6..8d32e0e 100644
--- a/glabels/BarcodeMenuButton.h
+++ b/glabels/BarcodeMenuButton.h
@@ -23,7 +23,8 @@
 
 
 #include "BarcodeMenu.h"
-#include "BarcodeStyle.h"
+
+#include "barcode/Style.h"
 
 #include <QPushButton>
 
@@ -56,8 +57,8 @@ namespace glabels
 		// Properties
 		/////////////////////////////////
 	public:
-		BarcodeStyle bcStyle() const;
-		void setBcStyle( const BarcodeStyle& bcStyle );
+		barcode::Style bcStyle() const;
+		void setBcStyle( const barcode::Style& bcStyle );
 
 
 		/////////////////////////////////
@@ -72,7 +73,7 @@ namespace glabels
 		/////////////////////////////////
 	private:
 		BarcodeMenu* mMenu;
-		BarcodeStyle mBcStyle;
+		barcode::Style mBcStyle;
 
 	};
 
diff --git a/glabels/BarcodeMenuItem.cpp b/glabels/BarcodeMenuItem.cpp
index 1150501..543f79a 100644
--- a/glabels/BarcodeMenuItem.cpp
+++ b/glabels/BarcodeMenuItem.cpp
@@ -29,7 +29,7 @@ namespace glabels
 	///
 	/// Constructor From Data
 	///
-	BarcodeMenuItem::BarcodeMenuItem( const BarcodeStyle& bcStyle, QObject* parent )
+	BarcodeMenuItem::BarcodeMenuItem( const barcode::Style& bcStyle, QObject* parent )
 		: QAction(parent), mBcStyle(bcStyle)
 	{
 		setText( bcStyle.name() );
@@ -41,7 +41,7 @@ namespace glabels
 	///
 	/// bcStyle Property Getter
 	///
-	BarcodeStyle BarcodeMenuItem::bcStyle() const
+	barcode::Style BarcodeMenuItem::bcStyle() const
 	{
 		return mBcStyle;
 	}
diff --git a/glabels/BarcodeMenuItem.h b/glabels/BarcodeMenuItem.h
index 76b0e90..d14b822 100644
--- a/glabels/BarcodeMenuItem.h
+++ b/glabels/BarcodeMenuItem.h
@@ -22,7 +22,7 @@
 #define BarcodeMenuItem_h
 
 
-#include "BarcodeStyle.h"
+#include "barcode/Style.h"
 
 #include <QAction>
 
@@ -41,21 +41,21 @@ namespace glabels
 		// Life Cycle
 		/////////////////////////////////
 	public:
-		BarcodeMenuItem( const BarcodeStyle& bcStyle, QObject* parent = nullptr );
+		BarcodeMenuItem( const barcode::Style& bcStyle, QObject* parent = nullptr );
 
 
 		/////////////////////////////////
 		// Signals
 		/////////////////////////////////
 	signals:
-		void activated( const BarcodeStyle& bcStyle );
+		void activated( const barcode::Style& bcStyle );
 
 
 		/////////////////////////////////
 		// Properties
 		/////////////////////////////////
 	public:
-		BarcodeStyle bcStyle() const;
+		barcode::Style bcStyle() const;
 
 
 		/////////////////////////////////
@@ -69,7 +69,7 @@ namespace glabels
 		// Private Data
 		/////////////////////////////////
 	private:
-		BarcodeStyle mBcStyle;
+		barcode::Style mBcStyle;
 
 	};
 
diff --git a/glabels/CMakeLists.txt b/glabels/CMakeLists.txt
index 27f08b5..5bd6777 100644
--- a/glabels/CMakeLists.txt
+++ b/glabels/CMakeLists.txt
@@ -1,138 +1,45 @@
-#=======================================
-# Compilation
-#=======================================
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-add_compile_options (-std=c++11 -g)
-if (NOT WIN32)
-   add_compile_options (-fPIC)
-endif ()
-
-# Uncomment to build with pedantic flags
-#add_compile_options (-Werror -Wall -Wpedantic)
-#add_definitions (-DQT_DISABLE_DEPRECATED_BEFORE=0x050400)
-
-if (${GNUBARCODE_FOUND})
-  add_definitions (-DHAVE_GNU_BARCODE=1)
-else (${GNUBARCODE_FOUND})
-  set (GNUBARCODE_INCLUDE_DIR "")
-  set (GNUBARCODE_LIBRARIES "")
-endif (${GNUBARCODE_FOUND})
-
-if (${LIBQRENCODE_FOUND})
-  add_definitions (-DHAVE_QRENCODE=1)
-else (${LIBQRENCODE_FOUND})
-  set (LIBQRENCODE_INCLUDE_DIR "")
-  set (LIBQRENCODE_LIBRARIES "")
-endif (${LIBQRENCODE_FOUND})
-
-if (${LIBZINT_FOUND})
-  add_definitions (-DHAVE_ZINT=1)
-else (${LIBZINT_FOUND})
-  set (LIBZINT_INCLUDE_DIR "")
-  set (LIBZINT_LIBRARIES "")
-endif (${LIBZINT_FOUND})
-
-
-#=======================================
-# Auto-generate Version.h
-#=======================================
-configure_file (Version.h.in ${CMAKE_CURRENT_BINARY_DIR}/Version.h @ONLY)
-configure_file (Config.h.in ${CMAKE_CURRENT_BINARY_DIR}/Config.h @ONLY)
-
+project (glabels LANGUAGES CXX)
 
 #=======================================
 # Sources
 #=======================================
-
-#
-# glabels executable
-#
 set (glabels_sources
-  glabels_main.cpp
+  main.cpp
   AboutDialog.cpp
-  BarcodeBackends.cpp
   BarcodeMenu.cpp
   BarcodeMenuButton.cpp
   BarcodeMenuItem.cpp
-  BarcodeStyle.cpp
-  Category.cpp
   ColorButton.cpp
   ColorHistory.cpp
-  ColorNode.cpp
   ColorPaletteDialog.cpp
   ColorPaletteItem.cpp
   ColorPaletteButtonItem.cpp
   ColorSwatch.cpp
   Cursors.cpp
-  DataCache.cpp
-  Db.cpp
-  Distance.cpp
   FieldButton.cpp
   File.cpp
-  FileUtil.cpp
-  Frame.cpp
-  FrameCd.cpp
-  FrameEllipse.cpp
-  FrameRect.cpp
-  FrameRound.cpp
-  Handles.cpp
   Help.cpp
   Icons.cpp
   LabelEditor.cpp
-  LabelModel.cpp
-  LabelModelObject.cpp
-  LabelModelBarcodeObject.cpp
-  LabelModelBoxObject.cpp
-  LabelModelEllipseObject.cpp
-  LabelModelImageObject.cpp
-  LabelModelLineObject.cpp
-  LabelModelShapeObject.cpp
-  LabelModelTextObject.cpp
-  Layout.cpp
   MainWindow.cpp
-  Markup.cpp
   MergeView.cpp
   MiniPreviewPixmap.cpp
   ObjectEditor.cpp
-  Outline.cpp
-  PageRenderer.cpp
-  Paper.cpp
-  Point.cpp
   PreferencesDialog.cpp
   PrintView.cpp
   PropertiesView.cpp
   Preview.cpp
   PreviewOverlayItem.cpp
-  RawText.cpp
-  Region.cpp
   SelectProductDialog.cpp
-  Settings.cpp
   SimplePreview.cpp
-  Size.cpp
   StartupView.cpp
-  StrUtil.cpp
-  SubstitutionField.cpp
-  Template.cpp
   TemplatePicker.cpp
   TemplatePickerItem.cpp
-  TextNode.cpp
   UndoRedoModel.cpp
-  Units.cpp
-  Vendor.cpp
-  XmlCategoryParser.cpp
-  XmlLabelCreator.cpp
-  XmlLabelParser.cpp
-  XmlPaperParser.cpp
-  XmlTemplateCreator.cpp
-  XmlTemplateParser.cpp
-  XmlUtil.cpp
-  XmlVendorParser.cpp
 )
 
 set (glabels_qobject_headers
   AboutDialog.h
-  BarcodeBackends.h
   BarcodeMenu.h
   BarcodeMenuButton.h
   BarcodeMenuItem.h
@@ -144,25 +51,14 @@ set (glabels_qobject_headers
   FieldButton.h
   File.h
   LabelEditor.h
-  LabelModel.h
-  LabelModelObject.h
-  LabelModelBarcodeObject.h
-  LabelModelBoxObject.h
-  LabelModelEllipseObject.h
-  LabelModelImageObject.h
-  LabelModelLineObject.h
-  LabelModelShapeObject.h
-  LabelModelTextObject.h
   MainWindow.h
   MergeView.h
   ObjectEditor.h
-  PageRenderer.h
   PreferencesDialog.h
   PrintView.h
   PropertiesView.h
   Preview.h
   SelectProductDialog.h
-  Settings.h
   SimplePreview.h
   StartupView.h
   TemplatePicker.h
@@ -195,6 +91,9 @@ if (WIN32)
   set (glabels_win_rc glabels.rc)
 endif ()
 
+#=====================================
+# Target
+#=====================================
 add_executable (glabels-qt WIN32
   ${glabels_sources}
   ${glabels_moc_sources}
@@ -203,144 +102,19 @@ add_executable (glabels-qt WIN32
   ${glabels_win_rc}
 )
 
+target_compile_features (glabels-qt
+  PUBLIC cxx_std_11
+)
+
+target_include_directories (glabels-qt
+  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
+)
+
 target_link_libraries (glabels-qt
-  Barcode
-  Merge
-  glbarcode
-  ${Qt5Widgets_LIBRARIES}
-  ${Qt5PrintSupport_LIBRARIES}
-  ${Qt5Xml_LIBRARIES}
-  ${Qt5Svg_LIBRARIES}
-  ${ZLIB_LIBRARIES}
-  ${GNUBARCODE_LIBRARIES}
-  ${LIBQRENCODE_LIBRARIES}
-  ${LIBZINT_LIBRARIES}
+  Model
+  Qt5::Widgets
 )
 
-
-#
-# glabels-batch executable
-#
-set (glabels-batch_sources
-  glabels-batch_main.cpp
-  BarcodeBackends.cpp
-  BarcodeStyle.cpp
-  Category.cpp
-  ColorNode.cpp
-  DataCache.cpp
-  Db.cpp
-  Distance.cpp
-  FileUtil.cpp
-  Frame.cpp
-  FrameCd.cpp
-  FrameEllipse.cpp
-  FrameRect.cpp
-  FrameRound.cpp
-  Handles.cpp
-  LabelModel.cpp
-  LabelModelObject.cpp
-  LabelModelBarcodeObject.cpp
-  LabelModelBoxObject.cpp
-  LabelModelEllipseObject.cpp
-  LabelModelImageObject.cpp
-  LabelModelLineObject.cpp
-  LabelModelShapeObject.cpp
-  LabelModelTextObject.cpp
-  Layout.cpp
-  Markup.cpp
-  Outline.cpp
-  PageRenderer.cpp
-  Paper.cpp
-  Point.cpp
-  RawText.cpp
-  Region.cpp
-  Settings.cpp
-  Size.cpp
-  StrUtil.cpp
-  SubstitutionField.cpp
-  Template.cpp
-  TextNode.cpp
-  Units.cpp
-  Vendor.cpp
-  XmlCategoryParser.cpp
-  XmlLabelCreator.cpp
-  XmlLabelParser.cpp
-  XmlPaperParser.cpp
-  XmlTemplateCreator.cpp
-  XmlTemplateParser.cpp
-  XmlUtil.cpp
-  XmlVendorParser.cpp
-)
-
-set (glabels-batch_qobject_headers
-  BarcodeBackends.h
-  LabelModel.h
-  LabelModelObject.h
-  LabelModelBarcodeObject.h
-  LabelModelBoxObject.h
-  LabelModelEllipseObject.h
-  LabelModelImageObject.h
-  LabelModelLineObject.h
-  LabelModelShapeObject.h
-  LabelModelTextObject.h
-  PageRenderer.h
-  Settings.h
-)
-
-qt5_wrap_cpp (glabels-batch_moc_sources ${glabels-batch_qobject_headers})
-
-if (WIN32)
-  # Windows resource file
-  set (glabels-batch_win_rc glabels-batch.rc)
-endif ()
-
-add_executable (glabels-batch-qt WIN32
-  ${glabels-batch_sources}
-  ${glabels-batch_moc_sources}
-  ${glabels-batch_win_rc}
-)
-
-target_link_libraries (glabels-batch-qt
-  Barcode
-  Merge
-  glbarcode
-  ${Qt5PrintSupport_LIBRARIES}
-  ${Qt5Xml_LIBRARIES}
-  ${Qt5Svg_LIBRARIES}
-  ${ZLIB_LIBRARIES}
-  ${GNUBARCODE_LIBRARIES}
-  ${LIBQRENCODE_LIBRARIES}
-  ${LIBZINT_LIBRARIES}
-)
-
-
-#=======================================
-# Where to find stuff
-#=======================================
-include_directories (
-  ${glabels_SOURCE_DIR}
-  ${ZLIB_INCLUDE_DIRS}
-  ${Qt5Widgets_INCLUDE_DIRS}
-  ${Qt5PrintSupport_INCLUDE_DIRS}
-  ${Qt5Xml_INCLUDE_DIRS}
-  ${Qt5Svg_INCLUDE_DIRS}
-  ${GNUBARCODE_INCLUDE_DIR}
-  ${LIBQRENCODE_INCLUDE_DIR}
-  ${LIBZINT_INCLUDE_DIR}
-)
-
-link_directories (
-)
-
-
-#=======================================
-# Subdirectories
-#=======================================
-add_subdirectory (BarcodeBackends)
-add_subdirectory (Merge)
-add_subdirectory (unit_tests)
-
-
 #=======================================
 # Install
 #=======================================
diff --git a/glabels/ColorButton.cpp b/glabels/ColorButton.cpp
index 253c4e4..f5fc841 100644
--- a/glabels/ColorButton.cpp
+++ b/glabels/ColorButton.cpp
@@ -52,7 +52,7 @@ namespace glabels
 	                        const QColor&  color )
 	{
 		mDefaultColor = defaultColor;
-		mColorNode = ColorNode( color );
+		mColorNode = model::ColorNode( color );
 
 		setMinimumSize( QSize( 85, 34 ) );
 		setIconSize( QSize(SWATCH_W, SWATCH_H) );
@@ -64,14 +64,14 @@ namespace glabels
 		mDialog = new ColorPaletteDialog( defaultLabel, defaultColor, color );
 
 		connect( this, SIGNAL(toggled(bool)), this, SLOT(onButtonToggled(bool)) );
-		connect( mDialog, SIGNAL(colorChanged(ColorNode,bool)),
-		         this, SLOT(onPaletteDialogChanged(ColorNode,bool)) );
+		connect( mDialog, SIGNAL(colorChanged(model::ColorNode,bool)),
+		         this, SLOT(onPaletteDialogChanged(model::ColorNode,bool)) );
 		connect( mDialog, SIGNAL(accepted()), this, SLOT(onPaletteDialogAccepted()) );
 		connect( mDialog, SIGNAL(rejected()), this, SLOT(onPaletteDialogRejected()) );
 	}
 
 
-	void ColorButton::setColorNode( ColorNode colorNode )
+	void ColorButton::setColorNode( model::ColorNode colorNode )
 	{
 		mIsDefault = false;
 
@@ -118,7 +118,7 @@ namespace glabels
 	}
 
 
-	ColorNode ColorButton::colorNode()
+	model::ColorNode ColorButton::colorNode()
 	{
 		return mColorNode;
 	}
@@ -163,7 +163,7 @@ namespace glabels
 	}
 
 
-	void ColorButton::onPaletteDialogChanged( ColorNode colorNode, bool isDefault )
+	void ColorButton::onPaletteDialogChanged( model::ColorNode colorNode, bool isDefault )
 	{
 		mColorNode = colorNode;
 		mIsDefault = isDefault;
diff --git a/glabels/ColorButton.h b/glabels/ColorButton.h
index 06a9ead..eb16611 100644
--- a/glabels/ColorButton.h
+++ b/glabels/ColorButton.h
@@ -22,9 +22,10 @@
 #define ColorButton_h
 
 
-#include "ColorNode.h"
 #include "ColorPaletteDialog.h"
 
+#include "model/ColorNode.h"
+
 #include <QPushButton>
 
 
@@ -58,10 +59,10 @@ namespace glabels
 		/////////////////////////////////
 	public:
 		void   init( const QString& defaultLabel, const QColor& defaultColor, const QColor& color );
-		void   setColorNode( ColorNode colorNode );
+		void   setColorNode( model::ColorNode colorNode );
 		void   setColor( QColor color );
 		void   setToDefault();
-		ColorNode colorNode();
+		model::ColorNode colorNode();
 		void   setKeys( const QList<QString> keyList );
 		void   clearKeys();
 
@@ -73,7 +74,7 @@ namespace glabels
 		void onButtonToggled( bool checked );
 		void onPaletteDialogAccepted();
 		void onPaletteDialogRejected();
-		void onPaletteDialogChanged( ColorNode colorNode, bool isDefault );
+		void onPaletteDialogChanged( model::ColorNode colorNode, bool isDefault );
 
 
 		/////////////////////////////////
@@ -88,7 +89,7 @@ namespace glabels
 	private:
 		QColor              mDefaultColor;
 		bool                mIsDefault;
-		ColorNode           mColorNode;
+		model::ColorNode    mColorNode;
 
 		ColorPaletteDialog* mDialog;
 	};
diff --git a/glabels/ColorPaletteDialog.cpp b/glabels/ColorPaletteDialog.cpp
index fd04131..a89a707 100644
--- a/glabels/ColorPaletteDialog.cpp
+++ b/glabels/ColorPaletteDialog.cpp
@@ -90,7 +90,7 @@ namespace glabels
 		connect( mColorHistory, SIGNAL(changed()), this, SLOT(onColorHistoryChanged()) );
 
 		mDefaultColor = defaultColor;
-		mColorNode = ColorNode( color );
+		mColorNode = model::ColorNode( color );
 
 		setStyleSheet( ".glabels--ColorPaletteDialog {background: white; border: 1px solid black}" );
 		setWindowFlags( Qt::Popup | Qt::FramelessWindowHint );
@@ -177,7 +177,7 @@ namespace glabels
 	}
 
 
-	void ColorPaletteDialog::setColorNode( const ColorNode& colorNode )
+	void ColorPaletteDialog::setColorNode( const model::ColorNode& colorNode )
 	{
 		mColorNode = colorNode;
 	}
@@ -257,7 +257,7 @@ namespace glabels
 
 		if ( dlg.exec() )
 		{
-			ColorNode newColorNode;
+			model::ColorNode newColorNode;
 
 			newColorNode.setField( false );
 			newColorNode.setColor( dlg.currentColor() );
diff --git a/glabels/ColorPaletteDialog.h b/glabels/ColorPaletteDialog.h
index ec3234a..56c1ce2 100644
--- a/glabels/ColorPaletteDialog.h
+++ b/glabels/ColorPaletteDialog.h
@@ -22,11 +22,12 @@
 #define ColorPaletteDialog_h
 
 
-#include "ColorNode.h"
 #include "ColorHistory.h"
 #include "ColorPaletteItem.h"
 #include "ColorPaletteButtonItem.h"
 
+#include "model/ColorNode.h"
+
 #include <QComboBox>
 #include <QDialog>
 
@@ -56,14 +57,14 @@ namespace glabels
 		// Signals
 		/////////////////////////////////
 	signals:
-		void colorChanged( ColorNode colorNode, bool isDefault );
+		void colorChanged( model::ColorNode colorNode, bool isDefault );
 
 
 		/////////////////////////////////
 		// Public Methods
 		/////////////////////////////////
 	public:
-		void   setColorNode( const ColorNode& colorNode );
+		void   setColorNode( const model::ColorNode& colorNode );
 		void   setKeys( const QStringList& keyList );
 		void   clearKeys();
 
@@ -94,8 +95,8 @@ namespace glabels
 		// Private Members
 		/////////////////////////////////
 	private:
-		QColor        mDefaultColor;
-		ColorNode     mColorNode;
+		QColor           mDefaultColor;
+		model::ColorNode mColorNode;
 
 		static const int PALETTE_COLS = ColorHistory::MAX_COLORS;
 		static const int PALETTE_ROWS = 4;
diff --git a/glabels/Distance.h b/glabels/Distance.h
deleted file mode 100644
index ee6ca05..0000000
--- a/glabels/Distance.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*  Distance.h
- *
- *  Copyright (C) 2016  Jim Evins <evins@snaught.com>
- *
- *  This file is part of gLabels-qt.
- *
- *  gLabels-qt is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  gLabels-qt 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef glabels_Distance_h
-#define glabels_Distance_h
-
-
-#include "Units.h"
-
-#include <QCoreApplication>
-#include <QString>
-
-
-namespace glabels
-{
-
-
-	class Distance
-	{
-		Q_DECLARE_TR_FUNCTIONS(Distance)
-
-	public:
-		Distance();
-		Distance( double d, Units::Enum unitsEnum = Units::PT );
-		Distance( double d, const Units& units );
-		Distance( double d, const QString& unitsId );
-
-		static Distance pt( double dPts );
-		static Distance in( double dInches );
-		static Distance mm( double dMm );
-		static Distance cm( double dCm );
-		static Distance pc( double dPicas );
-		static Distance fromString( const QString& string );
-
-
-		double pt() const;
-		double in() const;
-		double mm() const;
-		double cm() const;
-		double pc() const;
-		double inUnits( const Units& units ) const;
-		double inUnits( Units::Enum unitsEnum ) const;
-		double inUnits( const QString& unitsId ) const;
-
-
-		QString toString( const Units& units ) const;
-		QString toString( Units::Enum unitsEnum ) const;
-		QString toString( const QString& unitsId ) const;
-
-
-		Distance& operator+=( const Distance& d );
-		Distance& operator-=( const Distance& d );
-		Distance operator-();
-
-		friend inline Distance operator+( const Distance& d1, const Distance& d2 );
-		friend inline Distance operator-( const Distance& d1, const Distance& d2 );
-		friend inline Distance operator*( double x, const Distance& d );
-		friend inline Distance operator*( const Distance& d, double x );
-		friend inline double   operator/( const Distance& d1, const Distance& d2 );
-		friend inline Distance operator/( const Distance& d, double x );
-		
-		friend inline bool operator<( const Distance& d1, const Distance& d2 );
-		friend inline bool operator<=( const Distance& d1, const Distance& d2 );
-		friend inline bool operator>( const Distance& d1, const Distance& d2 );
-		friend inline bool operator>=( const Distance& d1, const Distance& d2 );
-		friend inline bool operator==( const Distance& d1, const Distance& d2 );
-		friend inline bool operator!=( const Distance& d1, const Distance& d2 );
-		
-		friend inline Distance fabs( const Distance& d );
-		friend inline Distance min( const Distance& d1, const Distance& d2 );
-		friend inline Distance max( const Distance& d1, const Distance& d2 );
-		friend inline Distance fmod( const Distance& d1, const Distance& d2 );
-
-		
-	private:
-		double mDPts;
-
-	};
-
-}
-
-
-#include "Distance.inl"
-
-
-#endif // glabels_Distance_h
diff --git a/glabels/File.cpp b/glabels/File.cpp
index be92437..00a9855 100644
--- a/glabels/File.cpp
+++ b/glabels/File.cpp
@@ -20,12 +20,13 @@
 
 #include "File.h"
 
-#include "FileUtil.h"
-#include "LabelModel.h"
 #include "MainWindow.h"
 #include "SelectProductDialog.h"
-#include "XmlLabelParser.h"
-#include "XmlLabelCreator.h"
+
+#include "model/FileUtil.h"
+#include "model/Model.h"
+#include "model/XmlLabelParser.h"
+#include "model/XmlLabelCreator.h"
 
 #include <QFileDialog>
 #include <QMessageBox>
@@ -49,26 +50,26 @@ namespace glabels
 		SelectProductDialog dialog;
 		dialog.exec();
 
-		const Template* tmplate = dialog.tmplate();
+		const model::Template* tmplate = dialog.tmplate();
 		if ( tmplate )
 		{
-			LabelModel* label = new LabelModel();
-			label->setTmplate( tmplate );
-			label->clearModified();
+			model::Model* model = new model::Model();
+			model->setTmplate( tmplate );
+			model->clearModified();
 
 			// Intelligently decide to rotate label by default
-			const Frame* frame = tmplate->frames().first();
-			label->setRotate( frame->h() > frame->w() );
+			const model::Frame* frame = tmplate->frames().first();
+			model->setRotate( frame->h() > frame->w() );
 
 			// Either apply to current window or open a new one
 			if ( window->isEmpty() )
 			{
-				window->setModel( label );
+				window->setModel( model );
 			}
 			else
 			{
 				MainWindow *newWindow = new MainWindow();
-				newWindow->setModel( label );
+				newWindow->setModel( model );
 				newWindow->show();
 			}
 
@@ -105,20 +106,20 @@ namespace glabels
 				);
 		if ( !fileName.isEmpty() )
 		{
-			LabelModel *label = XmlLabelParser::readFile( fileName );
-			if ( label )
+			model::Model *model = model::XmlLabelParser::readFile( fileName );
+			if ( model )
 			{
-				label->setFileName( fileName );
+				model->setFileName( fileName );
 				
 				// Either apply to current window or open a new one
 				if ( window->isEmpty() )
 				{
-					window->setModel( label );
+					window->setModel( model );
 				}
 				else
 				{
 					MainWindow *newWindow = new MainWindow();
-					newWindow->setModel( label );
+					newWindow->setModel( model );
 					newWindow->show();
 				}
 
@@ -152,7 +153,7 @@ namespace glabels
 			return true;
 		}
 
-		XmlLabelCreator::writeFile( window->model(), window->model()->fileName() );
+		model::XmlLabelCreator::writeFile( window->model(), window->model()->fileName() );
 		window->model()->clearModified();
 
 		// Save CWD
@@ -187,7 +188,7 @@ namespace glabels
 			                              QFileDialog::DontConfirmOverwrite	);
 		if ( !rawFileName.isEmpty() )
 		{
-			QString fileName = FileUtil::addExtension( rawFileName, ".glabels" );
+			QString fileName = model::FileUtil::addExtension( rawFileName, ".glabels" );
 			
 			
 			if ( QFileInfo(fileName).exists() )
@@ -206,7 +207,7 @@ namespace glabels
 				}
 			}
 			
-			XmlLabelCreator::writeFile( window->model(), fileName );
+			model::XmlLabelCreator::writeFile( window->model(), fileName );
 			window->model()->setFileName( fileName );
 			window->model()->clearModified();
 		
diff --git a/glabels/LabelEditor.cpp b/glabels/LabelEditor.cpp
index 9cea76e..c75d7b1 100644
--- a/glabels/LabelEditor.cpp
+++ b/glabels/LabelEditor.cpp
@@ -21,22 +21,23 @@
 #include "LabelEditor.h"
 
 #include "Cursors.h"
-#include "FrameCd.h"
-#include "FrameEllipse.h"
-#include "FrameRect.h"
-#include "FrameRound.h"
-#include "LabelModel.h"
-#include "LabelModelObject.h"
-#include "LabelModelBarcodeObject.h"
-#include "LabelModelBoxObject.h"
-#include "LabelModelEllipseObject.h"
-#include "LabelModelImageObject.h"
-#include "LabelModelLineObject.h"
-#include "LabelModelTextObject.h"
-#include "Markup.h"
-#include "Settings.h"
 #include "UndoRedoModel.h"
 
+#include "model/FrameCd.h"
+#include "model/FrameEllipse.h"
+#include "model/FrameRect.h"
+#include "model/FrameRound.h"
+#include "model/Model.h"
+#include "model/ModelObject.h"
+#include "model/ModelBarcodeObject.h"
+#include "model/ModelBoxObject.h"
+#include "model/ModelEllipseObject.h"
+#include "model/ModelImageObject.h"
+#include "model/ModelLineObject.h"
+#include "model/ModelTextObject.h"
+#include "model/Markup.h"
+#include "model/Settings.h"
+
 #include <QMouseEvent>
 #include <QtMath>
 #include <QtDebug>
@@ -66,7 +67,7 @@ namespace glabels
 
 		const QColor  gridLineColor( 192, 192, 192 );
 		const double  gridLineWidthPixels = 1;
-		const Distance gridSpacing = Distance::pt(9); // TODO: determine from locale.
+		const model::Distance gridSpacing = model::Distance::pt(9); // TODO: determine from locale.
 
 		const QColor  markupLineColor( 240, 99, 99 );
 		const double  markupLineWidthPixels = 1;
@@ -94,7 +95,7 @@ namespace glabels
 		setMouseTracking( true );
 		setFocusPolicy(Qt::StrongFocus);
 
-		connect( Settings::instance(), SIGNAL(changed()), this, SLOT(onSettingsChanged()) );
+		connect( model::Settings::instance(), SIGNAL(changed()), this, SLOT(onSettingsChanged()) );
 		onSettingsChanged();
 	}
 
@@ -133,7 +134,7 @@ namespace glabels
 	/// Model Parameter Setter
 	///
 	void
-	LabelEditor::setModel( LabelModel* model, UndoRedoModel* undoRedoModel )
+	LabelEditor::setModel( model::Model* model, UndoRedoModel* undoRedoModel )
 	{
 		mModel = model;
 		mUndoRedoModel = undoRedoModel;
@@ -246,7 +247,7 @@ namespace glabels
 	
 		double x_scale = ( wPixels - ZOOM_TO_FIT_PAD ) / mModel->w().pt();
 		double y_scale = ( hPixels - ZOOM_TO_FIT_PAD ) / mModel->h().pt();
-		double newZoom = qMin( x_scale, y_scale ) * PTS_PER_INCH / physicalDpiX();
+		double newZoom = qMin( x_scale, y_scale ) * model::PTS_PER_INCH / physicalDpiX();
 
 		// Limits
 		newZoom = qMin( newZoom, zoomLevels[0] );
@@ -286,7 +287,7 @@ namespace glabels
 		mZoomToFitFlag = zoomToFitFlag;
 
 		/* Actual scale depends on DPI of display (assume DpiX == DpiY). */
-		mScale = zoom * physicalDpiX() / PTS_PER_INCH;
+		mScale = zoom * physicalDpiX() / model::PTS_PER_INCH;
 
 		setMinimumSize( mScale*mModel->w().pt() + ZOOM_TO_FIT_PAD,
 		                mScale*mModel->h().pt() + ZOOM_TO_FIT_PAD );
@@ -432,8 +433,8 @@ namespace glabels
 			transform.translate( mX0.pt(), mY0.pt() );
 
 			QPointF pWorld = transform.inverted().map( event->pos() );
-			Distance xWorld = Distance::pt( pWorld.x() );
-			Distance yWorld = Distance::pt( pWorld.y() );
+			model::Distance xWorld = model::Distance::pt( pWorld.x() );
+			model::Distance yWorld = model::Distance::pt( pWorld.y() );
 
 		
 			if ( event->button() & Qt::LeftButton )
@@ -446,8 +447,8 @@ namespace glabels
 
 				case IdleState:
 				{
-					LabelModelObject* object = nullptr;
-					Handle* handle = nullptr;
+					model::ModelObject* object = nullptr;
+					model::Handle* handle = nullptr;
 					if ( mModel->isSelectionAtomic() &&
 					     (handle = mModel->handleAt( mScale, xWorld, yWorld )) != nullptr )
 					{
@@ -521,22 +522,22 @@ namespace glabels
 					switch ( mCreateObjectType )
 					{
 					case Box:
-						mCreateObject = new LabelModelBoxObject();
+						mCreateObject = new model::ModelBoxObject();
 						break;
 					case Ellipse:
-						mCreateObject = new LabelModelEllipseObject();
+						mCreateObject = new model::ModelEllipseObject();
 						break;
 					case Line: 
-						mCreateObject = new LabelModelLineObject();
+						mCreateObject = new model::ModelLineObject();
 						break;
 					case Image:
-						mCreateObject = new LabelModelImageObject();
+						mCreateObject = new model::ModelImageObject();
 						break;
 					case Text:
-						mCreateObject = new LabelModelTextObject();
+						mCreateObject = new model::ModelTextObject();
 						break;
 					case Barcode:
-						mCreateObject = new LabelModelBarcodeObject();
+						mCreateObject = new model::ModelBarcodeObject();
 						break;
 					default:
 						qDebug() << "LabelEditor::mousePressEvent: Invalid creation type. Should not happen!";
@@ -598,8 +599,8 @@ namespace glabels
 			transform.translate( mX0.pt(), mY0.pt() );
 
 			QPointF pWorld = transform.inverted().map( event->pos() );
-			Distance xWorld = Distance::pt( pWorld.x() );
-			Distance yWorld = Distance::pt( pWorld.y() );
+			model::Distance xWorld = model::Distance::pt( pWorld.x() );
+			model::Distance yWorld = model::Distance::pt( pWorld.y() );
 
 		
 			/*
@@ -700,8 +701,8 @@ namespace glabels
 			transform.translate( mX0.pt(), mY0.pt() );
 
 			QPointF pWorld = transform.inverted().map( event->pos() );
-			Distance xWorld = Distance::pt( pWorld.x() );
-			Distance yWorld = Distance::pt( pWorld.y() );
+			model::Distance xWorld = model::Distance::pt( pWorld.x() );
+			model::Distance yWorld = model::Distance::pt( pWorld.y() );
 
 		
 			if ( event->button() & Qt::LeftButton )
@@ -779,11 +780,11 @@ namespace glabels
 	/// Handle resize motion
 	///
 	void
-	LabelEditor::handleResizeMotion( const Distance& xWorld,
-	                                 const Distance& yWorld )
+	LabelEditor::handleResizeMotion( const model::Distance& xWorld,
+	                                 const model::Distance& yWorld )
 	{
 		QPointF p( xWorld.pt(), yWorld.pt() );
-		Handle::Location location = mResizeHandle->location();
+		model::Handle::Location location = mResizeHandle->location();
 	
 		/*
 		 * Change point to object relative coordinates
@@ -809,39 +810,39 @@ namespace glabels
 		double w, h;
 		switch ( location )
 		{
-		case Handle::NW:
+		case model::Handle::NW:
 			w = std::max( x2 - p.x(), 0.0 );
 			h = std::max( y2 - p.y(), 0.0 );
 			break;
-		case Handle::N:
+		case model::Handle::N:
 			w = x2 - x1;
 			h = std::max( y2 - p.y(), 0.0 );
 			break;
-		case Handle::NE:
+		case model::Handle::NE:
 			w = std::max( p.x() - x1, 0.0 );
 			h = std::max( y2 - p.y(), 0.0 );
 			break;
-		case Handle::E:
+		case model::Handle::E:
 			w = std::max( p.x() - x1, 0.0 );
 			h = y2 - y1;
 			break;
-		case Handle::SE:
+		case model::Handle::SE:
 			w = std::max( p.x() - x1, 0.0 );
 			h = std::max( p.y() - y1, 0.0 );
 			break;
-		case Handle::S:
+		case model::Handle::S:
 			w = x2 - x1;
 			h = std::max( p.y() - y1, 0.0 );
 			break;
-		case Handle::SW:
+		case model::Handle::SW:
 			w = std::max( x2 - p.x(), 0.0 );
 			h = std::max( p.y() - y1, 0.0 );
 			break;
-		case Handle::W:
+		case model::Handle::W:
 			w = std::max( x2 - p.x(), 0.0 );
 			h = y2 - y1;
 			break;
-		case Handle::P1:
+		case model::Handle::P1:
 			x1 = p.x();
 			y1 = p.y();
 			w  = x2 - p.x();
@@ -849,7 +850,7 @@ namespace glabels
 			x0 = x0 + x1;
 			y0 = y0 + y1;
 			break;
-		case Handle::P2:
+		case model::Handle::P2:
 			w  = p.x() - x1;
 			h  = p.y() - y1;
 			x0 = x0 + x1;
@@ -862,30 +863,30 @@ namespace glabels
 		/*
 		 * Set size
 		 */
-		if ( !(location == Handle::P1) && !(location == Handle::P2) )
+		if ( !(location == model::Handle::P1) && !(location == model::Handle::P2) )
 		{
 			if ( mResizeHonorAspect )
 			{
 				switch ( location )
 				{
-				case Handle::E:
-				case Handle::W:
-					mResizeObject->setWHonorAspect( Distance::pt(w) );
+				case model::Handle::E:
+				case model::Handle::W:
+					mResizeObject->setWHonorAspect( model::Distance::pt(w) );
 					break;
-				case Handle::N:
-				case Handle::S:
-					mResizeObject->setHHonorAspect( Distance::pt(h) );
+				case model::Handle::N:
+				case model::Handle::S:
+					mResizeObject->setHHonorAspect( model::Distance::pt(h) );
 					break;
 				default:
-					mResizeObject->setSizeHonorAspect( Distance::pt(w),
-					                                   Distance::pt(h) );
+					mResizeObject->setSizeHonorAspect( model::Distance::pt(w),
+					                                   model::Distance::pt(h) );
 					break;
 				}
 			}
 			else
 			{
-				mResizeObject->setSize( Distance::pt(w),
-				                        Distance::pt(h) );
+				mResizeObject->setSize( model::Distance::pt(w),
+				                        model::Distance::pt(h) );
 			}
 
 			/*
@@ -893,16 +894,16 @@ namespace glabels
 			 */
 			switch ( location )
 			{
-			case Handle::NW:
+			case model::Handle::NW:
 				x0 += x2 - mResizeObject->w().pt();
 				y0 += y2 - mResizeObject->h().pt();
 				break;
-			case Handle::N:
-			case Handle::NE:
+			case model::Handle::N:
+			case model::Handle::NE:
 				y0 += y2 - mResizeObject->h().pt();
 				break;
-			case Handle::W:
-			case Handle::SW:
+			case model::Handle::W:
+			case model::Handle::SW:
 				x0 += x2 - mResizeObject->w().pt();
 				break;
 			default:
@@ -911,8 +912,8 @@ namespace glabels
 		}
 		else
 		{
-			mResizeObject->setSize( Distance::pt(w),
-			                        Distance::pt(h) );
+			mResizeObject->setSize( model::Distance::pt(w),
+			                        model::Distance::pt(h) );
 		}
 
 		/*
@@ -921,8 +922,8 @@ namespace glabels
 		QPointF p0( x0, y0 );
 		p0 = mResizeObject->matrix().map( p0 );
 		p0 += QPointF( mResizeObject->x0().pt(), mResizeObject->y0().pt() );
-		mResizeObject->setPosition( Distance::pt(p0.x()),
-		                            Distance::pt(p0.y()) );
+		mResizeObject->setPosition( model::Distance::pt(p0.x()),
+		                            model::Distance::pt(p0.y()) );
 	}
 
 
@@ -938,22 +939,22 @@ namespace glabels
 
 			case Qt::Key_Left:
 				mUndoRedoModel->checkpoint( tr("Move") );
-				mModel->moveSelection( -mStepSize, Distance(0) );
+				mModel->moveSelection( -mStepSize, model::Distance(0) );
 				break;
 
 			case Qt::Key_Up:
 				mUndoRedoModel->checkpoint( tr("Move") );
-				mModel->moveSelection( Distance(0), -mStepSize );
+				mModel->moveSelection( model::Distance(0), -mStepSize );
 				break;
 
 			case Qt::Key_Right:
 				mUndoRedoModel->checkpoint( tr("Move") );
-				mModel->moveSelection( mStepSize, Distance(0) );
+				mModel->moveSelection( mStepSize, model::Distance(0) );
 				break;
 
 			case Qt::Key_Down:
 				mUndoRedoModel->checkpoint( tr("Move") );
-				mModel->moveSelection( Distance(0), mStepSize );
+				mModel->moveSelection( model::Distance(0), mStepSize );
 				break;
 
 			case Qt::Key_Delete:
@@ -1063,11 +1064,11 @@ namespace glabels
 	{
 		if ( mGridVisible )
 		{
-			Distance w = mModel->frame()->w();
-			Distance h = mModel->frame()->h();
+			model::Distance w = mModel->frame()->w();
+			model::Distance h = mModel->frame()->h();
 
-			Distance x0, y0;
-			if ( dynamic_cast<const FrameRect*>( mModel->frame() ) )
+			model::Distance x0, y0;
+			if ( dynamic_cast<const model::FrameRect*>( mModel->frame() ) )
 			{
 				x0 = gridSpacing;
 				y0 = gridSpacing;
@@ -1092,12 +1093,12 @@ namespace glabels
 			pen.setCosmetic( true );
 			painter->setPen( pen );
 
-			for ( Distance x = x0; x < w; x += gridSpacing )
+			for ( model::Distance x = x0; x < w; x += gridSpacing )
 			{
 				painter->drawLine( x.pt(), 0, x.pt(), h.pt() );
 			}
 
-			for ( Distance y = y0; y < h; y += gridSpacing )
+			for ( model::Distance y = y0; y < h; y += gridSpacing )
 			{
 				painter->drawLine( 0, y.pt(), w.pt(), y.pt() );
 			}
@@ -1129,7 +1130,7 @@ namespace glabels
 				painter->translate( -mModel->frame()->w().pt(), 0 );
 			}
 
-			foreach( Markup* markup, mModel->frame()->markups() )
+			foreach( model::Markup* markup, mModel->frame()->markups() )
 			{
 				painter->drawPath( markup->path() );
 			}
@@ -1184,7 +1185,7 @@ namespace glabels
 	{
 		painter->save();
 
-		foreach ( LabelModelObject* object, mModel->objectList() )
+		foreach ( model::ModelObject* object, mModel->objectList() )
 		{
 			if ( object->isSelected() )
 			{
@@ -1224,9 +1225,9 @@ namespace glabels
 	///
 	void LabelEditor::onSettingsChanged()
 	{
-		Units units = Settings::units();
+		model::Units units = model::Settings::units();
 	
-		mStepSize = Distance( units.resolution(), units );
+		mStepSize = model::Distance( units.resolution(), units );
 	}
 
 
@@ -1242,7 +1243,7 @@ namespace glabels
 	
 			double x_scale = ( wPixels - ZOOM_TO_FIT_PAD ) / mModel->w().pt();
 			double y_scale = ( hPixels - ZOOM_TO_FIT_PAD ) / mModel->h().pt();
-			double newZoom = qMin( x_scale, y_scale ) * PTS_PER_INCH / physicalDpiX();
+			double newZoom = qMin( x_scale, y_scale ) * model::PTS_PER_INCH / physicalDpiX();
 
 			// Limits
 			newZoom = qMin( newZoom, zoomLevels[0] );
@@ -1252,7 +1253,7 @@ namespace glabels
 		}
 
 		/* Actual scale depends on DPI of display (assume DpiX == DpiY). */
-		mScale = mZoom * physicalDpiX() / PTS_PER_INCH;
+		mScale = mZoom * physicalDpiX() / model::PTS_PER_INCH;
 
 		setMinimumSize( mScale*mModel->w().pt() + ZOOM_TO_FIT_PAD,
 		                mScale*mModel->h().pt() + ZOOM_TO_FIT_PAD );
diff --git a/glabels/LabelEditor.h b/glabels/LabelEditor.h
index e9f709d..af30700 100644
--- a/glabels/LabelEditor.h
+++ b/glabels/LabelEditor.h
@@ -22,7 +22,10 @@
 #define LabelEditor_h
 
 
-#include "Region.h"
+#include "model/Handles.h"
+#include "model/Model.h"
+#include "model/ModelObject.h"
+#include "model/Region.h"
 
 #include <QPainter>
 #include <QScrollArea>
@@ -33,10 +36,7 @@ namespace glabels
 {
 
 	// Forward References
-	class LabelModel;
-	class LabelModelObject;
 	class UndoRedoModel;
-	class Handle;
 
 
 	///
@@ -59,7 +59,7 @@ namespace glabels
 	signals:
 		void contextMenuActivate();
 		void zoomChanged();
-		void pointerMoved( const Distance& x, const Distance& y );
+		void pointerMoved( const model::Distance& x, const model::Distance& y );
 		void pointerExited();
 		void modeChanged();
 
@@ -77,7 +77,7 @@ namespace glabels
 		// Model
 		/////////////////////////////////////
 	public:
-		void setModel( LabelModel* model, UndoRedoModel* undoRedoModel );
+		void setModel( model::Model* model, UndoRedoModel* undoRedoModel );
 
 
 		/////////////////////////////////////
@@ -132,8 +132,8 @@ namespace glabels
 		// Private methods
 		/////////////////////////////////////
 	private:
-		void handleResizeMotion( const Distance& xWorld,
-		                         const Distance& yWorld );
+		void handleResizeMotion( const model::Distance& xWorld,
+		                         const model::Distance& yWorld );
 
 		void drawBgLayer( QPainter* painter );
 		void drawGridLayer( QPainter* painter );
@@ -179,38 +179,38 @@ namespace glabels
 		double               mZoom;
 		bool                 mZoomToFitFlag;
 		double               mScale;
-		Distance             mX0;
-		Distance             mY0;
+		model::Distance      mX0;
+		model::Distance      mY0;
 
 		bool                 mMarkupVisible;
 		bool                 mGridVisible;
 
 		double               mGridSpacing;
-		Distance             mStepSize;
+		model::Distance      mStepSize;
 
-		LabelModel*          mModel;
+		model::Model*        mModel;
 		UndoRedoModel*       mUndoRedoModel;
 
 		State                mState;
 
 		/* ArrowSelectRegion state */
 		bool                 mSelectRegionVisible;
-		Region               mSelectRegion;
+		model::Region        mSelectRegion;
 
 		/* ArrowMove state */
-		Distance             mMoveLastX;
-		Distance             mMoveLastY;
+		model::Distance      mMoveLastX;
+		model::Distance      mMoveLastY;
 
 		/* ArrowResize state */
-		LabelModelObject*    mResizeObject;
-		Handle*              mResizeHandle;
+		model::ModelObject*  mResizeObject;
+		model::Handle*       mResizeHandle;
 		bool                 mResizeHonorAspect;
 
 		/* CreateDrag state */
 		CreateType           mCreateObjectType;
-		LabelModelObject*    mCreateObject;
-		Distance             mCreateX0;
-		Distance             mCreateY0;
+		model::ModelObject*  mCreateObject;
+		model::Distance      mCreateX0;
+		model::Distance      mCreateY0;
 
 
 	};
diff --git a/glabels/MainWindow.cpp b/glabels/MainWindow.cpp
index 12f43cf..b370cec 100644
--- a/glabels/MainWindow.cpp
+++ b/glabels/MainWindow.cpp
@@ -20,12 +20,10 @@
 
 #include "MainWindow.h"
 
-#include "Db.h"
 #include "File.h"
 #include "Help.h"
 #include "Icons.h"
 #include "LabelEditor.h"
-#include "LabelModel.h"
 #include "MergeView.h"
 #include "ObjectEditor.h"
 #include "PreferencesDialog.h"
@@ -34,6 +32,9 @@
 #include "StartupView.h"
 #include "UndoRedoModel.h"
 
+#include "model/Db.h"
+#include "model/Model.h"
+
 #include <QClipboard>
 #include <QFrame>
 #include <QMessageBox>
@@ -151,7 +152,7 @@ namespace glabels
 	///
 	/// Get model accessor
 	///
-	LabelModel* MainWindow::model() const
+	model::Model* MainWindow::model() const
 	{
 		return mModel;
 	}
@@ -160,9 +161,9 @@ namespace glabels
 	///
 	/// Set model accessor
 	///
-	void MainWindow::setModel( LabelModel *label )
+	void MainWindow::setModel( model::Model* model )
 	{
-		mModel = label;
+		mModel = model;
 		mUndoRedoModel = new UndoRedoModel( mModel );
 	
 		mPropertiesView->setModel( mModel, mUndoRedoModel );
diff --git a/glabels/MainWindow.h b/glabels/MainWindow.h
index b804abe..80c286b 100644
--- a/glabels/MainWindow.h
+++ b/glabels/MainWindow.h
@@ -21,6 +21,7 @@
 #ifndef MainWindow_h
 #define MainWindow_h
 
+#include <model/Model.h>
 
 #include <QAction>
 #include <QCloseEvent>
@@ -39,7 +40,6 @@ namespace glabels
 
 	// Forward References
 	class LabelEditor;
-	class LabelModel;
 	class MergeView;
 	class ObjectEditor;
 	class PrintView;
@@ -68,8 +68,8 @@ namespace glabels
 		// Public Methods
 		/////////////////////////////////////
 	public:
-		LabelModel* model() const;
-		void setModel( LabelModel* label );
+		model::Model* model() const;
+		void setModel( model::Model* model );
 		bool isEmpty() const;
 
 
@@ -209,7 +209,7 @@ namespace glabels
 		QToolBar* fileToolBar;
 		QToolBar* editorToolBar;
 
-		LabelModel*          mModel;
+		model::Model*        mModel;
 		UndoRedoModel*       mUndoRedoModel;
 
 		QListWidget*         mContents;
diff --git a/glabels/Merge/CMakeLists.txt b/glabels/Merge/CMakeLists.txt
deleted file mode 100644
index c06693a..0000000
--- a/glabels/Merge/CMakeLists.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-#=======================================
-# Sources
-#=======================================
-set (merge_sources
-  Factory.cpp
-  Record.cpp
-  Merge.cpp
-  None.cpp
-  Text.cpp
-  TextCsv.cpp
-  TextCsvKeys.cpp
-  TextTsv.cpp
-  TextTsvKeys.cpp
-  TextColon.cpp
-  TextColonKeys.cpp
-  TextSemicolon.cpp
-  TextSemicolonKeys.cpp
-)
-
-set (merge_qobject_headers
-  Merge.h
-)
-
-qt5_wrap_cpp (merge_moc_sources ${merge_qobject_headers})
-
-add_library (Merge STATIC
-  ${merge_sources}
-  ${merge_moc_sources}
-)
-
-
-#=======================================
-# Where to find stuff
-#=======================================
-include_directories (
-  ${Qt5Widgets_INCLUDE_DIRS}
-)
-
-link_directories (
-)
-
-
-#=======================================
-# Subdirectories
-#=======================================
-
-
-#=======================================
-# Install
-#=======================================
diff --git a/glabels/Merge/Factory.cpp b/glabels/Merge/Factory.cpp
deleted file mode 100644
index 3182c06..0000000
--- a/glabels/Merge/Factory.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/*  Merge/Factory.cpp
- *
- *  Copyright (C) 2016  Jim Evins <evins@snaught.com>
- *
- *  This file is part of gLabels-qt.
- *
- *  gLabels-qt is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  gLabels-qt 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "Factory.h"
-
-#include "None.h"
-#include "TextCsv.h"
-#include "TextCsvKeys.h"
-#include "TextTsv.h"
-#include "TextTsvKeys.h"
-#include "TextColon.h"
-#include "TextColonKeys.h"
-#include "TextSemicolon.h"
-#include "TextSemicolonKeys.h"
-
-
-namespace glabels
-{
-
-	namespace merge
-	{
-
-		//
-		// Static data
-		//
-		QMap<QString,Factory::BackendEntry> Factory::mBackendIdMap;
-		QMap<QString,Factory::BackendEntry> Factory::mBackendNameMap;
-		QStringList Factory::mNameList;
-
-
-		///
-		/// Constructor
-		///
-		Factory::Factory()
-		{
-			registerBackend( None::id(),
-			                 tr("None"),
-			                 NONE,
-			                 &None::create );
-	
-			registerBackend( TextCsv::id(),
-			                 tr("Text: Comma Separated Values (CSV)"),
-			                 FILE,
-			                 &TextCsv::create );
-
-			registerBackend( TextCsvKeys::id(),
-			                 tr("Text: Comma Separated Values (CSV), keys on line 1"),
-			                 FILE,
-			                 &TextCsvKeys::create );
-
-			registerBackend( TextTsv::id(),
-			                 tr("Text: Tab Separated Values (TSV)"),
-			                 FILE,
-			                 &TextTsv::create );
-
-			registerBackend( TextTsvKeys::id(),
-			                 tr("Text: Tab Separated Values (TSV), keys on line 1"),
-			                 FILE,
-			                 &TextTsvKeys::create );
-
-			registerBackend( TextColon::id(),
-			                 tr("Text: Colon Separated Values"),
-			                 FILE,
-			                 &TextColon::create );
-
-			registerBackend( TextColonKeys::id(),
-			                 tr("Text: Colon Separated Values, keys on line 1"),
-			                 FILE,
-			                 &TextColonKeys::create );
-
-			registerBackend( TextSemicolon::id(),
-			                 tr("Text: Semicolon Separated Values"),
-			                 FILE,
-			                 &TextSemicolon::create );
-
-			registerBackend( TextSemicolonKeys::id(),
-			                 tr("Text: Semicolon Separated Values, keys on line 1"),
-			                 FILE,
-			                 &TextSemicolonKeys::create );
-		}
-
-
-		///
-		/// Initialize
-		///
-		void Factory::init()
-		{
-			static Factory* singletonInstance = nullptr;
-			if ( !singletonInstance )
-			{
-				singletonInstance = new Factory();
-			}
-		}
-
-
-		///
-		/// Create Merge object
-		///
-		Merge* Factory::createMerge( const QString& id )
-		{
-			QMap<QString,BackendEntry>::iterator iBackend = mBackendIdMap.find( id );
-			if ( iBackend != mBackendIdMap.end() )
-			{
-				return iBackend->create();
-			}
-	
-			return None::create();
-		}
-
-
-		///
-		/// Get name list
-		///
-		QStringList Factory::nameList()
-		{
-			return mNameList;
-		}
-
-
-		///
-		/// Convert ID to name
-		///
-		QString Factory::idToName( const QString& id )
-		{
-			if ( mBackendIdMap.contains( id ) )
-			{
-				return mBackendIdMap[id].name;
-			}
-			else
-			{
-				return tr("None");
-			}
-		}
-
-
-		///
-		/// Convert name to ID
-		///
-		QString Factory::nameToId( const QString& name )
-		{
-			if ( mBackendNameMap.contains( name ) )
-			{
-				return mBackendNameMap[name].id;
-			}
-			else
-			{
-				return "None";
-			}
-		}
-
-
-		///
-		/// Convert ID to type
-		///
-		Factory::SourceType Factory::idToType( const QString& id )
-		{
-			if ( mBackendIdMap.contains( id ) )
-			{
-				return mBackendIdMap[id].type;
-			}
-			else
-			{
-				return NONE;
-			}
-		}
-
-
-		///
-		/// Lookup ID from index
-		///
-		QString Factory::indexToId( int index )
-		{
-			if ( (index > 0) && (index < mNameList.size()) )
-			{
-				QString name = mNameList[index];
-			
-				return mBackendNameMap[ name ].id;
-			}
-
-			return "None";
-		}
-
-
-		///
-		/// Register backend
-		///
-		void Factory::registerBackend( const QString& id,
-		                               const QString& name,
-		                               SourceType     type,
-		                               CreateFct      create )
-		{
-			BackendEntry backend;
-
-			backend.id     = id;
-			backend.name   = name;
-			backend.type   = type;
-			backend.create = create;
-	
-			mBackendIdMap[ id ]     = backend;
-			mBackendNameMap[ name ] = backend;
-
-			mNameList << name;
-		}
-
-	} // namespace merge
-
-} // namespace glabels
diff --git a/glabels/Merge/Factory.h b/glabels/Merge/Factory.h
deleted file mode 100644
index aad6d26..0000000
--- a/glabels/Merge/Factory.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*  Merge/Factory.h
- *
- *  Copyright (C) 2016  Jim Evins <evins@snaught.com>
- *
- *  This file is part of gLabels-qt.
- *
- *  gLabels-qt is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  gLabels-qt 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef merge_Factory_h
-#define merge_Factory_h
-
-
-#include <QCoreApplication>
-#include <QStringList>
-#include <QMap>
-
-
-namespace glabels
-{
-
-	namespace merge
-	{
-
-		// Forward references
-		class Merge;
-	
-
-		///
-		/// Factory
-		///
-		class Factory
-		{
-			Q_DECLARE_TR_FUNCTIONS(Factory)
-	
-
-			/////////////////////////////////
-			// Source Type
-			/////////////////////////////////
-		public:
-			enum SourceType { NONE, FIXED, FILE };
-		
-		
-			/////////////////////////////////
-			// Life Cycle
-			/////////////////////////////////
-		protected:
-			Factory();
-
-
-			/////////////////////////////////
-			// Static methods
-			/////////////////////////////////
-		public:
-			static void init();
-	
-			static Merge* createMerge( const QString& id );
-
-			static QStringList nameList();
-			static QString idToName( const QString& id );
-			static QString nameToId( const QString& name );
-			static SourceType idToType( const QString& id );
-			static QString indexToId( int index );
-
-
-			/////////////////////////////////
-			// private methods
-			/////////////////////////////////
-		private:
-			typedef Merge* (*CreateFct)();
-	
-			static void registerBackend( const QString& id,
-			                             const QString& name,
-			                             SourceType     type,
-			                             CreateFct      create );
-
-
-			/////////////////////////////////
-			// private data
-			/////////////////////////////////
-			class BackendEntry
-			{
-			public:
-				QString    id;
-				QString    name;
-				SourceType type;
-				CreateFct  create;
-			};
-	
-			static QMap<QString,BackendEntry> mBackendIdMap;
-			static QMap<QString,BackendEntry> mBackendNameMap;
-		
-			static QStringList mNameList;
-		};
-
-	}
-
-}
-
-
-#endif // merge_Factory_h
diff --git a/glabels/Merge/Merge.cpp b/glabels/Merge/Merge.cpp
deleted file mode 100644
index b377523..0000000
--- a/glabels/Merge/Merge.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-/*  Merge/Merge.cpp
- *
- *  Copyright (C) 2015-2016  Jim Evins <evins@snaught.com>
- *
- *  This file is part of gLabels-qt.
- *
- *  gLabels-qt is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  gLabels-qt 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "Merge.h"
-
-#include "Record.h"
-
-
-namespace glabels
-{
-
-	namespace merge
-	{
-
-		///
-		/// Constructor
-		///
-		Merge::Merge()
-		{
-		}
-
-
-		///
-		/// Constructor
-		///
-		Merge::Merge( const Merge* merge ) : mSource(merge->mSource)
-		{
-			foreach ( Record* record, merge->mRecordList )
-			{
-				mRecordList << record->clone();
-			}
-		}
-
-
-		///
-		/// Destructor
-		///
-		Merge::~Merge()
-		{
-			foreach ( Record* record, mRecordList )
-			{
-				delete record;
-			}
-			mRecordList.clear();
-		}
-
-
-		///
-		/// Get id
-		///
-		QString Merge::id() const
-		{
-			return mId;
-		}
-
-
-		///
-		/// Get source
-		///
-		QString Merge::source() const
-		{
-			return mSource;
-		}
-
-
-		///
-		/// Set source
-		///
-		void Merge::setSource( const QString& source )
-		{
-			mSource = source;
-
-			// Clear out any old records
-			foreach ( Record* record, mRecordList )
-			{
-				delete record;
-			}
-			mRecordList.clear();
-
-			open();
-			for ( Record* record = readNextRecord(); record != nullptr; record = readNextRecord() )
-			{
-				mRecordList.append( record );
-			}
-			close();
-		
-			emit sourceChanged();
-		}
-
-
-		///
-		/// Get record list
-		///
-		const QList<Record*>& Merge::recordList( ) const
-		{
-			return mRecordList;
-		}
-
-
-		///
-		/// Select matching record
-		///
-		void Merge::select( Record* record )
-		{
-			record->setSelected( true );
-			emit selectionChanged();
-		}
-	
-
-		///
-		/// Unselect matching record
-		///
-		void Merge::unselect( Record* record )
-		{
-			record->setSelected( false );
-			emit selectionChanged();
-		}
-
-	
-		///
-		/// Select/unselect i'th record
-		///
-		void Merge::setSelected( int i, bool state )
-		{
-			if ( (i >= 0) && (i < mRecordList.size()) )
-			{
-				mRecordList[i]->setSelected( state );
-				emit selectionChanged();
-			}
-		}
-
-
-		///
-		/// Select all records
-		///
-		void Merge::selectAll()
-		{
-			foreach ( Record* record, mRecordList )
-			{
-				record->setSelected( true );
-			}
-			emit selectionChanged();
-		}
-
-	
-		///
-		/// Unselect all records
-		///
-		void Merge::unselectAll()
-		{
-			foreach ( Record* record, mRecordList )
-			{
-				record->setSelected( false );
-			}
-			emit selectionChanged();
-		}
-
-	
-		///
-		/// Return count of selected records
-		///
-		int Merge::nSelectedRecords() const
-		{
-			int count = 0;
-
-			foreach ( Record* record, mRecordList )
-			{
-				if ( record->isSelected() )
-				{
-					count++;
-				}
-			}
-
-			return count;
-		}
-
-
-		///
-		/// Return list of selected records
-		///
-		const QList<Record*> Merge::selectedRecords() const
-		{
-			QList<Record*> list;
-
-			foreach ( Record* record, mRecordList )
-			{
-				if ( record->isSelected() )
-				{
-					list.append( record );
-				}
-			}
-
-			return list;
-		}
-
-	} // namespace merge
-
-} // namespace glabels
diff --git a/glabels/Merge/Merge.h b/glabels/Merge/Merge.h
deleted file mode 100644
index 4dd6ac3..0000000
--- a/glabels/Merge/Merge.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*  Merge/Merge.h
- *
- *  Copyright (C) 2015-2016  Jim Evins <evins@snaught.com>
- *
- *  This file is part of gLabels-qt.
- *
- *  gLabels-qt is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  gLabels-qt 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef merge_Merge_h
-#define merge_Merge_h
-
-
-#include <QObject>
-#include <QString>
-#include <QStringList>
-#include <QList>
-
-
-namespace glabels
-{
-
-	namespace merge
-	{
-
-		// Forward references
-		class Record;
-		
-	
-		///
-		/// Merge Object
-		///
-		struct Merge : QObject
-		{
-			Q_OBJECT
-
-
-			/////////////////////////////////
-			// Life Cycle
-			/////////////////////////////////
-		protected:
-			Merge();
-			Merge( const Merge* merge );
-		public:
-			~Merge() override;
-
-
-			/////////////////////////////////
-			// Object duplication
-			/////////////////////////////////
-			virtual Merge* clone() const = 0;
-
-
-			/////////////////////////////////
-			// Properties
-			/////////////////////////////////
-		public:
-			QString id() const;
-			QString source() const;
-			void setSource( const QString& source );
-
-			const QList<Record*>& recordList( void ) const;
-
-
-			/////////////////////////////////
-			// Selection methods
-			/////////////////////////////////
-		public:
-			void select( Record* record );
-			void unselect( Record* record );
-			void setSelected( int i, bool state = true );
-			void selectAll();
-			void unselectAll();
-	
-			int nSelectedRecords() const;
-			const QList<Record*> selectedRecords() const;
-
-
-			/////////////////////////////////
-			// Virtual methods
-			/////////////////////////////////
-		public:
-			virtual QStringList keys() const = 0;
-			virtual QString primaryKey() const = 0;
-		protected:
-			virtual void open() = 0;
-			virtual void close() = 0;
-			virtual Record* readNextRecord() = 0;
-		
-
-			/////////////////////////////////
-			// Signals
-			/////////////////////////////////
-		signals:
-			void sourceChanged();
-			void selectionChanged();
-		
-
-			/////////////////////////////////
-			// Private data
-			/////////////////////////////////
-		protected:
-			QString             mId;
-		private:
-			QString             mSource;
-			QList<Record*>      mRecordList;
-		};
-
-	}
-
-}
-
-
-#endif // merge_Merge_h
diff --git a/glabels/Merge/None.cpp b/glabels/Merge/None.cpp
deleted file mode 100644
index bdb0f4e..0000000
--- a/glabels/Merge/None.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/*  Merge/None.cpp
- *
- *  Copyright (C) 2015-2016  Jim Evins <evins@snaught.com>
- *
- *  This file is part of gLabels-qt.
- *
- *  gLabels-qt is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  gLabels-qt 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "None.h"
-
-
-namespace glabels
-{
-
-	namespace merge
-	{
-
-		///
-		/// Constructor
-		///
-		None::None() : Merge()
-		{
-			mId = "None";
-		}
-
-
-		///
-		/// Constructor
-		///
-		None::None( const None* merge ) : Merge( merge )
-		{
-		}
-
-
-		///
-		/// Destructor
-		///
-		None::~None()
-		{
-		}
-
-
-		///
-		/// Clone
-		///
-		None* None::clone() const
-		{
-			return new None( this );
-		}
-
-
-		///
-		/// Get ID
-		///
-		QString None::id()
-		{
-			return "None";
-		}
-
-
-		///
-		/// Create
-		///
-		Merge* None::create()
-		{
-			return new None();
-		}
-
-
-		///
-		/// Get key list
-		///
-		QStringList None::keys() const
-		{
-			QStringList emptyList;
-			return emptyList;
-		}
-
-
-		///
-		/// Get primary key
-		///
-		QString None::primaryKey() const
-		{
-			return "";
-		}
-
-
-		///
-		/// Open source
-		///
-		void None::open()
-		{
-		}
-
-
-		///
-		/// Close source
-		///
-		void None::close()
-		{
-		}
-
-
-		///
-		/// Read next record
-		///
-		Record* None::readNextRecord()
-		{
-			return nullptr;
-		}
-
-	} // namespace merge
-
-} // namespace glabels
diff --git a/glabels/Merge/Text.cpp b/glabels/Merge/Text.cpp
deleted file mode 100644
index b1c223a..0000000
--- a/glabels/Merge/Text.cpp
+++ /dev/null
@@ -1,421 +0,0 @@
-/*  Merge/Text.cpp
- *
- *  Copyright (C) 2016  Jim Evins <evins@snaught.com>
- *
- *  This file is part of gLabels-qt.
- *
- *  gLabels-qt is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  gLabels-qt 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "Text.h"
-
-#include "Record.h"
-
-#include <QtDebug>
-
-
-namespace glabels
-{
-
-	namespace merge
-	{
-
-		///
-		/// Constructor
-		///
-		Text::Text( QChar delimiter, bool line1HasKeys )
-			: mDelimeter(delimiter), mLine1HasKeys(line1HasKeys), mNFieldsMax(0)
-		{
-		}
-
-
-		///
-		/// Constructor
-		///
-		Text::Text( const Text* merge )
-			: Merge( merge ),
-			  mDelimeter(merge->mDelimeter), mLine1HasKeys(merge->mLine1HasKeys),
-			  mNFieldsMax(merge->mNFieldsMax)
-		{
-		}
-
-
-		///
-		/// Destructor
-		///
-		Text::~Text()
-		{
-		}
-
-
-		///
-		/// Get key list
-		///
-		QStringList Text::keys() const
-		{
-			QStringList keys;
-			for ( int iField = 0; iField < mNFieldsMax; iField++ )
-			{
-				keys << keyFromIndex(iField);
-			}
-			return keys;
-		}
-
-
-		///
-		/// Get primary key
-		///
-		QString Text::primaryKey() const
-		{
-			return keyFromIndex(0);
-		}
-
-
-		///
-		/// Open source
-		///
-		void Text::open()
-		{
-			mFile.setFileName( source() );
-			mFile.open( QIODevice::ReadOnly|QIODevice::Text );
-
-			mKeys.clear();
-			mNFieldsMax = 0;
-
-			if ( mLine1HasKeys && mFile.isOpen() )
-			{
-				mKeys = parseLine();
-				if ( (mKeys.size() == 1) && (mKeys[0] == "") )
-				{
-					mKeys.clear();
-				}
-				else
-				{
-					mNFieldsMax = mKeys.size();
-				}
-			}
-		}
-
-
-		///
-		/// Close source
-		///
-		void Text::close()
-		{
-			if ( mFile.isOpen() )
-			{
-				mFile.close();
-			}
-		}
-
-
-		///
-		/// Read next record
-		///
-		Record* Text::readNextRecord()
-		{
-			QStringList values = parseLine();
-			if ( !values.isEmpty() )
-			{
-				Record* record = new Record();
-
-				int iField = 0;
-				foreach ( QString value, values )
-				{
-					(*record)[ keyFromIndex(iField) ] = value;
-					iField++;
-				}
-				mNFieldsMax = std::max( mNFieldsMax, iField );
-
-				return record;
-			}
-			return nullptr;
-		}
-
-
-		///
-		/// Key from field index
-		///
-		QString Text::keyFromIndex( int iField ) const
-		{
-			if ( mLine1HasKeys && ( iField < mKeys.size() ) )
-			{
-				return mKeys[iField];
-			}
-			else
-			{
-				return QString::number( iField+1 );
-			}
-		}
-
-
-		///
-		/// Parse line.                                                     
-		///                                                                           
-		/// Attempt to be a robust parser of various CSV (and similar) formats.       
-		///                                                                           
-		/// Based on CSV format described in RFC 4180 section 2.                      
-		///                                                                           
-		/// Additions to RFC 4180 rules:                                              
-		///   - delimeters and other special characters may be "escaped" by a leading 
-		///     backslash (\)                                                         
-		///   - C escape sequences for newline (\n) and tab (\t) are also translated. 
-		///   - if quoted text is not followed by a delimeter, any additional text is 
-		///     concatenated with quoted portion.                                     
-		///                                                                           
-		/// Returns a list of fields.  A blank line is considered a line with one     
-		/// empty field.  Returns an empty list when done.                             
-		///
-		QStringList Text::parseLine()
-		{
-			QStringList fields;
-	
-			enum State
-			{
-				DELIM, QUOTED, QUOTED_QUOTE1, QUOTED_ESCAPED, SIMPLE, SIMPLE_ESCAPED, DONE
-			} state = DELIM;
-
-			QByteArray field;
-	
-			while ( state != DONE )
-			{
-				char c;
-				if ( mFile.getChar( &c ) )
-				{
-					switch (state)
-					{
-
-					case DELIM:
-						switch (c)
-						{
-						case '\n':
-							/* last field is empty. */
-							fields << "";
-							state = DONE;
-							break;
-						case '\r':
-							/* ignore */
-							state = DELIM;
-							break;
-						case '"':
-							/* start a quoted field. */
-							state = QUOTED;
-							break;
-						case '\\':
-							/* simple field, but 1st character is an escape. */
-							state = SIMPLE_ESCAPED;
-							break;
-						default:
-							if ( c == mDelimeter )
-							{
-								/* field is empty. */
-								fields << "";
-								state = DELIM;
-							}
-							else
-							{
-								/* begining of a simple field. */
-								field.append( c );
-								state = SIMPLE;
-							}
-							break;
-						}
-						break;
-
-					case QUOTED:
-						switch (c)
-						{
-						case '"':
-							/* Possible end of field, but could be 1st of a pair. */
-							state = QUOTED_QUOTE1;
-							break;
-						case '\\':
-							/* Escape next character, or special escape, e.g. \n. */
-							state = QUOTED_ESCAPED;
-							break;
-						default:
-							/* Use character literally. */
-							field.append( c );
-							break;
-						}
-						break;
-
-					case QUOTED_QUOTE1:
-						switch (c)
-						{
-						case '\n':
-							/* line ended after quoted item */
-							fields << QString( field );
-							state = DONE;
-							break;
-						case '"':
-							/* second quote, insert and stay quoted. */
-							field.append( c );
-							state = QUOTED;
-							break;
-						case '\r':
-							/* ignore and go to fallback */
-							state = SIMPLE;
-							break;
-						default:
-							if ( c == mDelimeter )
-							{
-								/* end of field. */
-								fields << QString( field );
-								field.clear();
-								state = DELIM;
-							}
-							else
-							{
-								/* fallback if not a delim or another quote. */
-								field.append( c );
-								state = SIMPLE;
-							}
-							break;
-						}
-						break;
-
-					case QUOTED_ESCAPED:
-						switch (c)
-						{
-						case 'n':
-							/* Decode "\n" as newline. */
-							field.append( '\n' );
-							state = QUOTED;
-							break;
-						case 't':
-							/* Decode "\t" as tab. */
-							field.append( '\t' );
-							state = QUOTED;
-							break;
-						default:
-							/* Use character literally. */
-							field.append( c );
-							state = QUOTED;
-							break;
-						}
-						break;
-
-					case SIMPLE:
-						switch (c)
-						{
-						case '\n':
-							/* line ended */
-							fields << QString( field );
-							state = DONE;
-							break;
-						case '\r':
-							/* ignore */
-							state = SIMPLE;
-							break;
-						case '\\':
-							/* Escape next character, or special escape, e.g. \n. */
-							state = SIMPLE_ESCAPED;
-							break;
-						default:
-							if ( c == mDelimeter )
-							{
-								/* end of field. */
-								fields << QString( field );
-								field.clear();
-								state = DELIM;
-							}
-							else
-							{
-								/* Use character literally. */
-								field.append( c );
-								state = SIMPLE;
-							}
-							break;
-						}
-						break;
-
-					case SIMPLE_ESCAPED:
-						switch (c)
-						{
-						case 'n':
-							/* Decode "\n" as newline. */
-							field.append( '\n' );
-							state = SIMPLE;
-							break;
-						case 't':
-							/* Decode "\t" as tab. */
-							field.append( '\t' );
-							state = SIMPLE;
-							break;
-						default:
-							/* Use character literally. */
-							field.append( (char)c );
-							state = SIMPLE;
-							break;
-						}
-						break;
-
-					default:
-						qWarning( "merge::Text::parseLine()::Should not be reached! #1" );
-						break;
-					}
-
-				}
-				else
-				{
-					/* Handle EOF (could also be an error while reading). */
-					switch (state)
-					{
-
-					case DELIM:
-						/* EOF, no more lines. */
-						break;
-
-					case QUOTED:
-						/* File ended midway through quoted item. Truncate field. */
-						fields << QString( field );
-						break;
-
-					case QUOTED_QUOTE1:
-						/* File ended after quoted item. */
-						fields << QString( field );
-						break;
-
-					case QUOTED_ESCAPED:
-						/* File ended midway through quoted item. Truncate field. */
-						fields << QString( field );
-						break;
-
-					case SIMPLE:
-						/* File ended after simple item. */
-						fields << QString( field );
-						break;
-
-					case SIMPLE_ESCAPED:
-						/* File ended midway through escaped item. */
-						fields << QString( field );
-						break;
-
-					default:
-						qWarning( "merge::Text::parseLine()::Should not be reached! #2" );
-						break;
-					}
-			
-					state = DONE;
-				}
-			}
-	
-
-			return fields;
-		}
-
-	} // namespace merge
-
-} // namespace glabels
diff --git a/glabels/Merge/Text.h b/glabels/Merge/Text.h
deleted file mode 100644
index 4f95429..0000000
--- a/glabels/Merge/Text.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*  Merge/Text.h
- *
- *  Copyright (C) 2016  Jim Evins <evins@snaught.com>
- *
- *  This file is part of gLabels-qt.
- *
- *  gLabels-qt is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  gLabels-qt 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef merge_Text_h
-#define merge_Text_h
-
-#include "Merge.h"
-
-#include <QFile>
-
-
-namespace glabels
-{
-
-	namespace merge
-	{
-	
-		///
-		/// Text Merge Backend
-		///
-		struct Text : public Merge
-		{
-
-			/////////////////////////////////
-			// Life Cycle
-			/////////////////////////////////
-		protected:
-			Text( QChar delimiter, bool line1HasKeys );
-			Text( const Text* merge );
-			~Text() override;
-
-
-			/////////////////////////////////
-			// Implementation of virtual methods
-			/////////////////////////////////
-		public:
-			QStringList keys() const override;
-			QString primaryKey() const override;
-		protected:
-			void open() override;
-			void close() override;
-			Record* readNextRecord() override;
-
-
-			/////////////////////////////////
-			// Private methods
-			/////////////////////////////////
-			QString keyFromIndex( int iField ) const;
-			QStringList parseLine();
-	
-
-			/////////////////////////////////
-			// Private data
-			/////////////////////////////////
-		private:
-			QChar mDelimeter;
-			bool  mLine1HasKeys;
-
-			QFile          mFile;
-			QStringList    mKeys;
-			int            mNFieldsMax;
-		};
-
-	}
-
-}
-
-
-#endif // merge_Text_h
diff --git a/glabels/MergeView.cpp b/glabels/MergeView.cpp
index bcb0783..d01ecc9 100644
--- a/glabels/MergeView.cpp
+++ b/glabels/MergeView.cpp
@@ -20,9 +20,7 @@
 
 #include "MergeView.h"
 
-#include "LabelModel.h"
-
-#include "Merge/Factory.h"
+#include "merge/Factory.h"
 
 #include <QFileDialog>
 #include <QFileInfo>
@@ -59,7 +57,7 @@ namespace glabels
 	///
 	/// Set Model
 	///
-	void MergeView::setModel( LabelModel* model, UndoRedoModel* undoRedoModel )
+	void MergeView::setModel( model::Model* model, UndoRedoModel* undoRedoModel )
 	{
 		mModel = model;
 		mUndoRedoModel = undoRedoModel;
diff --git a/glabels/MergeView.h b/glabels/MergeView.h
index d14d746..8734994 100644
--- a/glabels/MergeView.h
+++ b/glabels/MergeView.h
@@ -24,14 +24,15 @@
 
 #include "ui_MergeView.h"
 
-#include "Merge/Merge.h"
+#include "model/Model.h"
+
+#include "merge/Merge.h"
 
 
 namespace glabels
 {
 
 	// Forward references
-	class LabelModel;
 	class UndoRedoModel;
 	
 
@@ -54,7 +55,7 @@ namespace glabels
 		/////////////////////////////////
 		// Public methods
 		/////////////////////////////////
-		void setModel( LabelModel* model, UndoRedoModel* undoRedoModel );
+		void setModel( model::Model* model, UndoRedoModel* undoRedoModel );
 
 
 		/////////////////////////////////
@@ -86,7 +87,7 @@ namespace glabels
 	private:
 		QStringList  mMergeFormatNames;
 	
-		LabelModel*    mModel;
+		model::Model*  mModel;
 		UndoRedoModel* mUndoRedoModel;
 
 		QStringList mKeys;
diff --git a/glabels/MiniPreviewPixmap.cpp b/glabels/MiniPreviewPixmap.cpp
index 4e77fcc..4486eed 100644
--- a/glabels/MiniPreviewPixmap.cpp
+++ b/glabels/MiniPreviewPixmap.cpp
@@ -20,7 +20,7 @@
 
 #include "MiniPreviewPixmap.h"
 
-#include "Template.h"
+#include "model/Template.h"
 
 
 namespace glabels
@@ -47,14 +47,14 @@ namespace glabels
 	}
 
 
-	MiniPreviewPixmap::MiniPreviewPixmap( const Template* tmplate, int width, int height )
+	MiniPreviewPixmap::MiniPreviewPixmap( const model::Template* tmplate, int width, int height )
 		: QPixmap( width, height )
 	{
 		draw( tmplate, width, height );
 	}
 
 
-	void MiniPreviewPixmap::draw( const Template* tmplate, int width, int height )
+	void MiniPreviewPixmap::draw( const model::Template* tmplate, int width, int height )
 	{
 		fill( Qt::transparent );
 
@@ -76,8 +76,8 @@ namespace glabels
 		}
 		painter.scale( scale, scale );
 
-		Distance xOffset = ( Distance::pt(width/scale) - tmplate->pageWidth() ) / 2;
-		Distance yOffset = ( Distance::pt(height/scale) - tmplate->pageHeight() ) / 2;
+		model::Distance xOffset = ( model::Distance::pt(width/scale) - tmplate->pageWidth() ) / 2;
+		model::Distance yOffset = ( model::Distance::pt(height/scale) - tmplate->pageHeight() ) / 2;
 		painter.translate( xOffset.pt(), yOffset.pt() );
 
 		drawPaper( painter, tmplate, scale );
@@ -85,7 +85,7 @@ namespace glabels
 	}
 
 
-	void MiniPreviewPixmap::drawPaper( QPainter& painter, const Template* tmplate, double scale )
+	void MiniPreviewPixmap::drawPaper( QPainter& painter, const model::Template* tmplate, double scale )
 	{
 		QBrush brush( paperColor );
 		QPen pen( paperOutlineColor );
@@ -101,7 +101,7 @@ namespace glabels
 	}
 
 
-	void MiniPreviewPixmap::drawLabelOutlines( QPainter& painter, const Template* tmplate, double scale )
+	void MiniPreviewPixmap::drawLabelOutlines( QPainter& painter, const model::Template* tmplate, double scale )
 	{
 		QBrush brush( labelColor );
 		QPen pen( labelOutlineColor );
@@ -112,10 +112,10 @@ namespace glabels
 		painter.setBrush( brush );
 		painter.setPen( pen );
 
-		Frame *frame = tmplate->frames().first();
-		QVector<Point> origins = frame->getOrigins();
+		model::Frame *frame = tmplate->frames().first();
+		QVector<model::Point> origins = frame->getOrigins();
 
-		foreach ( Point p0, origins )
+		foreach ( model::Point p0, origins )
 		{
 			drawLabelOutline( painter, frame, p0 );
 		}
@@ -124,7 +124,7 @@ namespace glabels
 	}
 
 
-	void MiniPreviewPixmap::drawLabelOutline( QPainter& painter, const Frame* frame, const Point& p0 )
+	void MiniPreviewPixmap::drawLabelOutline( QPainter& painter, const model::Frame* frame, const model::Point& p0 )
 	{
 		painter.save();
 
diff --git a/glabels/MiniPreviewPixmap.h b/glabels/MiniPreviewPixmap.h
index 684ae5a..98a8c59 100644
--- a/glabels/MiniPreviewPixmap.h
+++ b/glabels/MiniPreviewPixmap.h
@@ -22,7 +22,9 @@
 #define glabels_MiniPreviewPixmap_h
 
 
-#include "Point.h"
+#include "model/Frame.h"
+#include "model/Point.h"
+#include "model/Template.h"
 
 #include <QPixmap>
 #include <QPainter>
@@ -31,25 +33,20 @@
 namespace glabels
 {
 
-	// Forward references
-	class Template;
-	class Frame;
-
-
 	class MiniPreviewPixmap : public QPixmap
 	{
 		
 	public:
 		MiniPreviewPixmap();
 
-		MiniPreviewPixmap( const Template* tmplate, int width, int height );
+		MiniPreviewPixmap( const model::Template* tmplate, int width, int height );
 
 		
 	private:
-		void draw( const Template* tmplate, int width, int height );
-		void drawPaper( QPainter& painter, const Template* tmplate, double scale );
-		void drawLabelOutlines( QPainter& painter, const Template* tmplate, double scale );
-		void drawLabelOutline( QPainter& painter, const Frame *frame, const Point& point0 );
+		void draw( const model::Template* tmplate, int width, int height );
+		void drawPaper( QPainter& painter, const model::Template* tmplate, double scale );
+		void drawLabelOutlines( QPainter& painter, const model::Template* tmplate, double scale );
+		void drawLabelOutline( QPainter& painter, const model::Frame *frame, const model::Point& point0 );
 		
 	};
 
diff --git a/glabels/ObjectEditor.cpp b/glabels/ObjectEditor.cpp
index 1807516..f575cc2 100644
--- a/glabels/ObjectEditor.cpp
+++ b/glabels/ObjectEditor.cpp
@@ -20,19 +20,20 @@
 
 #include "ObjectEditor.h"
 
-#include "LabelModel.h"
-#include "LabelModelObject.h"
-#include "LabelModelBarcodeObject.h"
-#include "LabelModelBoxObject.h"
-#include "LabelModelEllipseObject.h"
-#include "LabelModelImageObject.h"
-#include "LabelModelLineObject.h"
-#include "LabelModelTextObject.h"
-#include "Settings.h"
-#include "Size.h"
 #include "UndoRedoModel.h"
 
-#include "Merge/Merge.h"
+#include "model/Model.h"
+#include "model/ModelObject.h"
+#include "model/ModelBarcodeObject.h"
+#include "model/ModelBoxObject.h"
+#include "model/ModelEllipseObject.h"
+#include "model/ModelImageObject.h"
+#include "model/ModelLineObject.h"
+#include "model/ModelTextObject.h"
+#include "model/Settings.h"
+#include "model/Size.h"
+
+#include "merge/Merge.h"
 
 #include <QFileDialog>
 #include <QtMath>
@@ -73,14 +74,14 @@ namespace glabels
 		setEnabled( false );
 		hidePages();
 
-		connect( Settings::instance(), SIGNAL(changed()),
+		connect( model::Settings::instance(), SIGNAL(changed()),
 		         this, SLOT(onSettingsChanged()) );
 		
 		onSettingsChanged();
 	}
 
 	
-	void ObjectEditor::setModel( LabelModel* model, UndoRedoModel* undoRedoModel )
+	void ObjectEditor::setModel( model::Model* model, UndoRedoModel* undoRedoModel )
 	{
 		mModel = model;
 		mUndoRedoModel = undoRedoModel;
@@ -117,7 +118,7 @@ namespace glabels
 		{
 			mBlocked = true;
 
-			TextNode filenameNode = mObject->filenameNode();
+			model::TextNode filenameNode = mObject->filenameNode();
 
 			if ( filenameNode.isField() )
 			{
@@ -188,7 +189,7 @@ namespace glabels
 			sizeWSpin->setValue( mObject->w().inUnits(mUnits) );
 			sizeHSpin->setValue( mObject->h().inUnits(mUnits) );
 
-			Size originalSize = mObject->naturalSize();
+			model::Size originalSize = mObject->naturalSize();
 			QString originalSizeString = QString( "%1:  %2 x %3 %4" )
 				.arg( tr("Original size") )
 				.arg( originalSize.w().inUnits(mUnits), 0, 'f', mSpinDigits )
@@ -249,7 +250,7 @@ namespace glabels
 		{
 			mBlocked = true;
 
-			BarcodeStyle bcStyle = mObject->bcStyle();
+			barcode::Style bcStyle = mObject->bcStyle();
 
 			barcodeShowTextCheck->setEnabled( bcStyle.textOptional() );
 			barcodeChecksumCheck->setEnabled( bcStyle.checksumOptional() );
@@ -302,7 +303,7 @@ namespace glabels
 
 	void ObjectEditor::onSettingsChanged()
 	{
-		mUnits = Settings::units();
+		mUnits = model::Settings::units();
 		mSpinDigits = mUnits.resolutionDigits();
 		mSpinStep = mUnits.resolution();
 
@@ -318,7 +319,7 @@ namespace glabels
 		{
 			mBlocked = true;
 
-			Distance whMax = std::max( mModel->w(), mModel->h() );
+			model::Distance whMax = std::max( mModel->w(), mModel->h() );
 			
 			posXSpin->setRange( -whMax.inUnits(mUnits), 2*whMax.inUnits(mUnits) );
 			posYSpin->setRange( -whMax.inUnits(mUnits), 2*whMax.inUnits(mUnits) );
@@ -345,7 +346,7 @@ namespace glabels
 			{
 				mObject = mModel->getFirstSelectedObject();
 
-				if ( dynamic_cast<LabelModelBoxObject*>(mObject) )
+				if ( dynamic_cast<model::ModelBoxObject*>(mObject) )
 				{
 					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-box.svg") );
 					titleLabel->setText( tr("Box object properties") );
@@ -366,7 +367,7 @@ namespace glabels
 				
 					setEnabled( true );
 				}
-				else if ( dynamic_cast<LabelModelEllipseObject*>(mObject) )
+				else if ( dynamic_cast<model::ModelEllipseObject*>(mObject) )
 				{
 					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-ellipse.svg") );
 					titleLabel->setText( tr("Ellipse object properties") );
@@ -387,7 +388,7 @@ namespace glabels
 				
 					setEnabled( true );
 				}
-				else if ( dynamic_cast<LabelModelImageObject*>(mObject) )
+				else if ( dynamic_cast<model::ModelImageObject*>(mObject) )
 				{
 					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-image.svg") );
 					titleLabel->setText( tr("Image object properties") );
@@ -407,7 +408,7 @@ namespace glabels
 				
 					setEnabled( true );
 				}
-				else if ( dynamic_cast<LabelModelLineObject*>(mObject) )
+				else if ( dynamic_cast<model::ModelLineObject*>(mObject) )
 				{
 					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-line.svg") );
 					titleLabel->setText( tr("Line object properties") );
@@ -428,7 +429,7 @@ namespace glabels
 				
 					setEnabled( true );
 				}
-				else if ( dynamic_cast<LabelModelTextObject*>(mObject) )
+				else if ( dynamic_cast<model::ModelTextObject*>(mObject) )
 				{
 					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-text.svg") );
 					titleLabel->setText( tr("Text object properties") );
@@ -447,7 +448,7 @@ namespace glabels
 				
 					setEnabled( true );
 				}
-				else if ( dynamic_cast<LabelModelBarcodeObject*>(mObject) )
+				else if ( dynamic_cast<model::ModelBarcodeObject*>(mObject) )
 				{
 					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-barcode.svg") );
 					titleLabel->setText( tr("Barcode object properties") );
@@ -537,7 +538,7 @@ namespace glabels
 
 			mUndoRedoModel->checkpoint( tr("Line") );
 		
-			mObject->setLineWidth( Distance::pt(lineWidthSpin->value()) );
+			mObject->setLineWidth( model::Distance::pt(lineWidthSpin->value()) );
 			mObject->setLineColorNode( lineColorButton->colorNode() );
 
 			mBlocked = false;
@@ -595,7 +596,7 @@ namespace glabels
 		if ( !filename.isEmpty() )
 		{
 			mUndoRedoModel->checkpoint( tr("Set image") );
-			mObject->setFilenameNode( TextNode( false, filename ) );
+			mObject->setFilenameNode( model::TextNode( false, filename ) );
 
 			// Save CWD for next open
 			QFileInfo fileInfo( filename );
@@ -607,7 +608,7 @@ namespace glabels
 	void ObjectEditor::onImageKeySelected( QString key )
 	{
 		mUndoRedoModel->checkpoint( tr("Set image") );
-		mObject->setFilenameNode( TextNode( true, key ) );
+		mObject->setFilenameNode( model::TextNode( true, key ) );
 	}
 
 
@@ -619,8 +620,8 @@ namespace glabels
 
 			mUndoRedoModel->checkpoint( tr("Move") );
 		
-			Distance x = Distance(posXSpin->value(), mUnits);
-			Distance y = Distance(posYSpin->value(), mUnits);
+			model::Distance x = model::Distance(posXSpin->value(), mUnits);
+			model::Distance y = model::Distance(posYSpin->value(), mUnits);
 
 			mObject->setPosition( x, y );
 
@@ -637,8 +638,8 @@ namespace glabels
 			
 			mUndoRedoModel->checkpoint( tr("Size") );
 		
-			Distance spinW = Distance(sizeWSpin->value(), mUnits);
-			Distance spinH = Distance(sizeHSpin->value(), mUnits);
+			model::Distance spinW = model::Distance(sizeWSpin->value(), mUnits);
+			model::Distance spinH = model::Distance(sizeHSpin->value(), mUnits);
 				
 			if ( sizeAspectCheck->isChecked() )
 			{
@@ -671,7 +672,7 @@ namespace glabels
 			
 			mUndoRedoModel->checkpoint( tr("Size") );
 		
-			Distance spinLength = Distance(sizeLineLengthSpin->value(), mUnits);
+			model::Distance spinLength = model::Distance(sizeLineLengthSpin->value(), mUnits);
 			double spinAngleRads = qDegreesToRadians( sizeLineAngleSpin->value() );
 				
 			mObject->setSize( spinLength*qCos(spinAngleRads),
@@ -718,7 +719,7 @@ namespace glabels
 		{
 			mBlocked = true;
 
-			BarcodeStyle bcStyle = barcodeStyleButton->bcStyle();
+			barcode::Style bcStyle = barcodeStyleButton->bcStyle();
 
 			barcodeShowTextCheck->setEnabled( bcStyle.textOptional() );
 			barcodeChecksumCheck->setEnabled( bcStyle.checksumOptional() );
@@ -765,8 +766,8 @@ namespace glabels
 			mUndoRedoModel->checkpoint( tr("Shadow") );
 		
 			mObject->setShadow( shadowEnableCheck->isChecked() );
-			mObject->setShadowX( Distance(shadowXSpin->value(), mUnits) );
-			mObject->setShadowY( Distance(shadowYSpin->value(), mUnits) );
+			mObject->setShadowX( model::Distance(shadowXSpin->value(), mUnits) );
+			mObject->setShadowY( model::Distance(shadowYSpin->value(), mUnits) );
 			mObject->setShadowColorNode( shadowColorButton->colorNode() );
 			mObject->setShadowOpacity( shadowOpacitySpin->value()/100.0 );
 
diff --git a/glabels/ObjectEditor.h b/glabels/ObjectEditor.h
index 8298176..6e84687 100644
--- a/glabels/ObjectEditor.h
+++ b/glabels/ObjectEditor.h
@@ -24,7 +24,8 @@
 
 #include "ui_ObjectEditor.h"
 
-#include "Distance.h"
+#include "model/Model.h"
+#include "model/ModelObject.h"
 
 #include <QButtonGroup>
 
@@ -33,8 +34,6 @@ namespace glabels
 {
 
 	// Forward references
-	class LabelModel;
-	class LabelModelObject;
 	class UndoRedoModel;
 	
 
@@ -56,7 +55,7 @@ namespace glabels
 		/////////////////////////////////
 		// Public methods
 		/////////////////////////////////
-		void setModel( LabelModel* model, UndoRedoModel* undoRedoModel );
+		void setModel( model::Model* model, UndoRedoModel* undoRedoModel );
 
 
 		/////////////////////////////////
@@ -105,11 +104,11 @@ namespace glabels
 		// Private data
 		/////////////////////////////////
 	private:
-		LabelModel*              mModel;
-		LabelModelObject*        mObject;
+		model::Model*            mModel;
+		model::ModelObject*      mObject;
 		UndoRedoModel*           mUndoRedoModel;
 	
-		Units                    mUnits;
+		model::Units             mUnits;
 		int                      mSpinDigits;
 		double                   mSpinStep;
 	
diff --git a/glabels/PreferencesDialog.cpp b/glabels/PreferencesDialog.cpp
index 7a9e7cc..b063f02 100644
--- a/glabels/PreferencesDialog.cpp
+++ b/glabels/PreferencesDialog.cpp
@@ -20,7 +20,7 @@
 
 #include "PreferencesDialog.h"
 
-#include "Settings.h"
+#include "model/Settings.h"
 
 
 namespace glabels
@@ -34,18 +34,18 @@ namespace glabels
 	{
 		setupUi( this );
 
-		switch ( Settings::units().toEnum() )
+		switch ( model::Settings::units().toEnum() )
 		{
-		case Units::IN:
+		case model::Units::IN:
 			unitsInchesRadio->setChecked( true );
 			break;
-		case Units::MM:
+		case model::Units::MM:
 			unitsMillimetersRadio->setChecked( true );
 			break;
-		case Units::CM:
+		case model::Units::CM:
 			unitsCentimetersRadio->setChecked( true );
 			break;
-		case Units::PC:
+		case model::Units::PC:
 			unitsPicasRadio->setChecked( true );
 			break;
 		default:
@@ -62,23 +62,23 @@ namespace glabels
 	{
 		if ( unitsInchesRadio->isChecked() )
 		{
-			Settings::setUnits( Units::in() );
+			model::Settings::setUnits( model::Units::in() );
 		}
 		else if ( unitsMillimetersRadio->isChecked() )
 		{
-			Settings::setUnits( Units::mm() );
+			model::Settings::setUnits( model::Units::mm() );
 		}
 		else if ( unitsCentimetersRadio->isChecked() )
 		{
-			Settings::setUnits( Units::cm() );
+			model::Settings::setUnits( model::Units::cm() );
 		}
 		else if ( unitsPicasRadio->isChecked() )
 		{
-			Settings::setUnits( Units::pc() );
+			model::Settings::setUnits( model::Units::pc() );
 		}
 		else
 		{
-			Settings::setUnits( Units::pt() );
+			model::Settings::setUnits( model::Units::pt() );
 		}
 	}
 
diff --git a/glabels/Preview.cpp b/glabels/Preview.cpp
index 182dac4..8d018b8 100644
--- a/glabels/Preview.cpp
+++ b/glabels/Preview.cpp
@@ -20,7 +20,6 @@
 
 #include "Preview.h"
 
-#include "LabelModel.h"
 #include "PreviewOverlayItem.h"
 
 #include <QGraphicsDropShadowEffect>
@@ -70,7 +69,7 @@ namespace glabels
 	///
 	/// Set renderer
 	///
-	void Preview::setRenderer( const PageRenderer* renderer )
+	void Preview::setRenderer( const model::PageRenderer* renderer )
 	{
 		mRenderer = renderer;
 
@@ -91,10 +90,10 @@ namespace glabels
 		if ( mModel != nullptr )
 		{
 			// Set scene up with a 5% margin around paper
-			Distance x = -0.05 * mModel->tmplate()->pageWidth();
-			Distance y = -0.05 * mModel->tmplate()->pageHeight();
-			Distance w = 1.10 * mModel->tmplate()->pageWidth();
-			Distance h = 1.10 * mModel->tmplate()->pageHeight();
+			model::Distance x = -0.05 * mModel->tmplate()->pageWidth();
+			model::Distance y = -0.05 * mModel->tmplate()->pageHeight();
+			model::Distance w = 1.10 * mModel->tmplate()->pageWidth();
+			model::Distance h = 1.10 * mModel->tmplate()->pageHeight();
 
 			mScene->setSceneRect( x.pt(), y.pt(), w.pt(), h.pt() );
 			fitInView( mScene->sceneRect(), Qt::KeepAspectRatio );
@@ -131,7 +130,7 @@ namespace glabels
 	///
 	/// Draw Paper
 	///
-	void Preview::drawPaper( const Distance& pw, const Distance& ph )
+	void Preview::drawPaper( const model::Distance& pw, const model::Distance& ph )
 	{
 		QGraphicsDropShadowEffect *shadowEffect = new QGraphicsDropShadowEffect();
 		shadowEffect->setColor( shadowColor );
@@ -157,9 +156,9 @@ namespace glabels
 	///
 	void Preview::drawLabels()
 	{
-		Frame *frame = mModel->tmplate()->frames().first();
+		model::Frame *frame = mModel->tmplate()->frames().first();
 
-		foreach (Point origin, frame->getOrigins() )
+		foreach (model::Point origin, frame->getOrigins() )
 		{
 			drawLabel( origin.x(), origin.y(), frame->path() );
 		}
@@ -169,7 +168,7 @@ namespace glabels
 	///
 	/// Draw a Single Label at x,y
 	///
-	void Preview::drawLabel( const Distance& x, const Distance& y, const QPainterPath& path )
+	void Preview::drawLabel( const model::Distance& x, const model::Distance& y, const QPainterPath& path )
 	{
 		QBrush brush( Qt::NoBrush );
 		QPen pen( labelOutlineColor );
diff --git a/glabels/Preview.h b/glabels/Preview.h
index b7731d7..3ba7981 100644
--- a/glabels/Preview.h
+++ b/glabels/Preview.h
@@ -22,7 +22,9 @@
 #define Preview_h
 
 
-#include "PageRenderer.h"
+#include "model/Distance.h"
+#include "model/Model.h"
+#include "model/PageRenderer.h"
 
 #include <QGraphicsView>
 #include <QGraphicsScene>
@@ -31,10 +33,6 @@
 namespace glabels
 {
 	
-	// Forward references
-	class LabelModel;
-
-
 	///
 	///  Preview Widget
 	///
@@ -54,7 +52,7 @@ namespace glabels
 		// Renderer
 		/////////////////////////////////
 	public:
-		void setRenderer( const PageRenderer* renderer );
+		void setRenderer( const model::PageRenderer* renderer );
 	private slots:
 		void onRendererChanged();
 
@@ -71,9 +69,9 @@ namespace glabels
 		/////////////////////////////////
 	private:
 		void clearScene();
-		void drawPaper( const Distance& pw, const Distance& ph );
+		void drawPaper( const model::Distance& pw, const model::Distance& ph );
 		void drawLabels();
-		void drawLabel( const Distance& x, const Distance& y, const QPainterPath& path );
+		void drawLabel( const model::Distance& x, const model::Distance& y, const QPainterPath& path );
 		
 		void drawPreviewOverlay();
 
@@ -82,9 +80,9 @@ namespace glabels
 		// Private Data
 		/////////////////////////////////
 	private:
-		const LabelModel*   mModel;
-		const PageRenderer* mRenderer;    
-		QGraphicsScene*     mScene;
+		const model::Model*        mModel;
+		const model::PageRenderer* mRenderer;    
+		QGraphicsScene*            mScene;
 
 	};
 
diff --git a/glabels/PreviewOverlayItem.cpp b/glabels/PreviewOverlayItem.cpp
index 3961144..cc1d793 100644
--- a/glabels/PreviewOverlayItem.cpp
+++ b/glabels/PreviewOverlayItem.cpp
@@ -20,7 +20,7 @@
 
 #include "PreviewOverlayItem.h"
 
-#include "PageRenderer.h"
+#include "model/PageRenderer.h"
 
 #include <QtDebug>
 
@@ -28,7 +28,7 @@
 namespace glabels
 {
 
-	PreviewOverlayItem::PreviewOverlayItem( const PageRenderer* renderer, QGraphicsItem* parent )
+	PreviewOverlayItem::PreviewOverlayItem( const model::PageRenderer* renderer, QGraphicsItem* parent )
 		: QGraphicsItem(parent), mRenderer(renderer)
 	{
 		// empty
diff --git a/glabels/PreviewOverlayItem.h b/glabels/PreviewOverlayItem.h
index c189a1c..c7b70e6 100644
--- a/glabels/PreviewOverlayItem.h
+++ b/glabels/PreviewOverlayItem.h
@@ -22,16 +22,14 @@
 #define PreviewOverlayItem_h
 
 
+#include "model/PageRenderer.h"
+
 #include <QGraphicsItem>
 
 
 namespace glabels
 {
 
-	// Forward references
-	class PageRenderer;
-
-
 	///
 	///  PreviewOverlayItem Widget
 	///
@@ -42,7 +40,7 @@ namespace glabels
 		// Life Cycle
 		/////////////////////////////////
 	public:
-		PreviewOverlayItem( const PageRenderer* renderer, QGraphicsItem* parent = nullptr );
+		PreviewOverlayItem( const model::PageRenderer* renderer, QGraphicsItem* parent = nullptr );
 
 
 		/////////////////////////////////////
@@ -57,7 +55,7 @@ namespace glabels
 		// Private Data
 		/////////////////////////////////
 	private:
-		const PageRenderer* mRenderer;
+		const model::PageRenderer* mRenderer;
 
 	};
 
diff --git a/glabels/PrintView.cpp b/glabels/PrintView.cpp
index 8b1a46e..13384e9 100644
--- a/glabels/PrintView.cpp
+++ b/glabels/PrintView.cpp
@@ -20,8 +20,6 @@
 
 #include "PrintView.h"
 
-#include "LabelModel.h"
-
 #include <QPrintDialog>
 #include <QtDebug>
 
@@ -57,7 +55,7 @@ namespace glabels
 	///
 	/// Set Model
 	///
-	void PrintView::setModel( LabelModel* model )
+	void PrintView::setModel( model::Model* model )
 	{
 		mModel = model;
 		mRenderer.setModel( mModel );
diff --git a/glabels/PrintView.h b/glabels/PrintView.h
index de9fabe..7240844 100644
--- a/glabels/PrintView.h
+++ b/glabels/PrintView.h
@@ -24,7 +24,8 @@
 
 #include "ui_PrintView.h"
 
-#include "PageRenderer.h"
+#include "model/Model.h"
+#include "model/PageRenderer.h"
 
 #include <QPrinter>
 
@@ -32,10 +33,6 @@
 namespace glabels
 {
 
-	// Forward references
-	class LabelModel;
-	
-
 	///
 	/// Print View Widget
 	///
@@ -55,7 +52,7 @@ namespace glabels
 		/////////////////////////////////
 		// Public methods
 		/////////////////////////////////
-		void setModel( LabelModel* model );
+		void setModel( model::Model* model );
 
 
 		/////////////////////////////////
@@ -72,9 +69,9 @@ namespace glabels
 		// Private Data
 		/////////////////////////////////
 	private:
-		LabelModel*  mModel;
-		QPrinter*    mPrinter;
-		PageRenderer mRenderer;
+		model::Model*       mModel;
+		QPrinter*           mPrinter;
+		model::PageRenderer mRenderer;
 
 		bool         mBlocked;
 
diff --git a/glabels/PropertiesView.cpp b/glabels/PropertiesView.cpp
index 833e32d..75680f5 100644
--- a/glabels/PropertiesView.cpp
+++ b/glabels/PropertiesView.cpp
@@ -20,12 +20,12 @@
 
 #include "PropertiesView.h"
 
-#include "Db.h"
-#include "LabelModel.h"
 #include "SelectProductDialog.h"
-#include "Settings.h"
 #include "UndoRedoModel.h"
 
+#include "model/Db.h"
+#include "model/Settings.h"
+
 #include <QStyledItemDelegate>
 #include <QtDebug>
 
@@ -51,7 +51,7 @@ namespace glabels
 		similarBrowser->setAttribute(Qt::WA_TranslucentBackground);
 		similarBrowser->viewport()->setAutoFillBackground(false);
 
-		connect( Settings::instance(), SIGNAL(changed()),
+		connect( model::Settings::instance(), SIGNAL(changed()),
 		         this, SLOT(onSettingsChanged()) );
 		
 		onSettingsChanged();
@@ -70,7 +70,7 @@ namespace glabels
 	///
 	/// Set Model
 	///
-	void PropertiesView::setModel( LabelModel* model, UndoRedoModel* undoRedoModel )
+	void PropertiesView::setModel( model::Model* model, UndoRedoModel* undoRedoModel )
 	{
 		mModel = model;
 		mUndoRedoModel = undoRedoModel;
@@ -86,7 +86,7 @@ namespace glabels
 	///
 	void PropertiesView::onSettingsChanged()
 	{
-		mUnits = Settings::units();
+		mUnits = model::Settings::units();
 		if (mModel)
 		{
 			onLabelSizeChanged();
@@ -99,14 +99,14 @@ namespace glabels
 	///
 	void PropertiesView::onLabelSizeChanged()
 	{
-		const Template *tmplate   = mModel->tmplate();
-		const Frame    *frame     = tmplate->frames().first();
-		bool            isRotated = mModel->rotate();
+		const model::Template* tmplate   = mModel->tmplate();
+		const model::Frame*    frame     = tmplate->frames().first();
+		bool                   isRotated = mModel->rotate();
 
 		preview->setTemplate( tmplate );
 		preview->setRotate( isRotated );
 
-		const Vendor *vendor = Db::lookupVendorFromName( tmplate->brand() );
+		const model::Vendor* vendor = model::Db::lookupVendorFromName( tmplate->brand() );
 		if ( (vendor != nullptr) && (vendor->url() != nullptr) )
 		{
 			QString markup = QString( "<a href='%1'>%2</a>" )
@@ -131,7 +131,7 @@ namespace glabels
 
 		descriptionLabel->setText( tmplate->description() );
 
-		QString pgSizeString = Db::lookupPaperNameFromId( tmplate->paperId() );
+		QString pgSizeString = model::Db::lookupPaperNameFromId( tmplate->paperId() );
 		pageSizeLabel->setText( pgSizeString );
 
 		QString labelSizeString = frame->sizeDescription( mUnits );
@@ -140,7 +140,7 @@ namespace glabels
 		QString layoutString = frame->layoutDescription();
 		layoutLabel->setText( layoutString );
 
-		QStringList list = Db::getNameListOfSimilarTemplates( tmplate->name() );
+		QStringList list = model::Db::getNameListOfSimilarTemplates( tmplate->name() );
 		if ( list.isEmpty() )
 		{
 			similarProductsGroupBox->hide();
@@ -181,8 +181,8 @@ namespace glabels
 	///
 	void PropertiesView::onOrientationActivated()
 	{
-		const Template *tmplate = mModel->tmplate();
-		const Frame    *frame   = tmplate->frames().first();
+		const model::Template* tmplate = mModel->tmplate();
+		const model::Frame*    frame   = tmplate->frames().first();
 
 		// Make sure index actually changed.
 		int index = orientationCombo->currentIndex();
@@ -216,7 +216,7 @@ namespace glabels
 		SelectProductDialog selectProductDialog( this );
 		selectProductDialog.exec();
 
-		const Template* tmplate = selectProductDialog.tmplate();
+		const model::Template* tmplate = selectProductDialog.tmplate();
 		if ( tmplate )
 		{
 			mUndoRedoModel->checkpoint( tr("Change Product") );
@@ -224,7 +224,7 @@ namespace glabels
 			mModel->setTmplate( tmplate );
 
 			// Don't rotate circular or round labels
-			const Frame *frame = tmplate->frames().first();
+			const model::Frame *frame = tmplate->frames().first();
 			if ( frame->w() == frame->h() )
 			{
 				mModel->setRotate( false );
diff --git a/glabels/PropertiesView.h b/glabels/PropertiesView.h
index 90d22a9..e2beaf9 100644
--- a/glabels/PropertiesView.h
+++ b/glabels/PropertiesView.h
@@ -24,14 +24,14 @@
 
 #include "ui_PropertiesView.h"
 
-#include "Units.h"
+#include "model/Model.h"
+#include "model/Units.h"
 
 
 namespace glabels
 {
 
 	// Forward references
-	class LabelModel;
 	class UndoRedoModel;
 	
 
@@ -54,7 +54,7 @@ namespace glabels
 		/////////////////////////////////
 		// Public methods
 		/////////////////////////////////
-		void setModel( LabelModel* model, UndoRedoModel* undoRedoModel );
+		void setModel( model::Model* model, UndoRedoModel* undoRedoModel );
 
 
 		/////////////////////////////////
@@ -71,10 +71,10 @@ namespace glabels
 		// Private Data
 		/////////////////////////////////
 	private:
-		LabelModel*    mModel;
-		UndoRedoModel* mUndoRedoModel;
-		Units          mUnits;
-		int            mOldOrientationIndex;
+		model::Model*      mModel;
+		UndoRedoModel*     mUndoRedoModel;
+		model::Units       mUnits;
+		int                mOldOrientationIndex;
 	};
 
 }
diff --git a/glabels/SelectProductDialog.cpp b/glabels/SelectProductDialog.cpp
index 173bd15..40918a3 100644
--- a/glabels/SelectProductDialog.cpp
+++ b/glabels/SelectProductDialog.cpp
@@ -20,10 +20,11 @@
 
 #include "SelectProductDialog.h"
 
-#include "Db.h"
-#include "Settings.h"
 #include "TemplatePickerItem.h"
 
+#include "model/Db.h"
+#include "model/Settings.h"
+
 #include <QtDebug>
 
 
@@ -38,18 +39,18 @@ namespace glabels
 	{
 		setupUi( this );
 
-		pageSizeIsoCheck->setChecked( Settings::searchIsoPaperSizes() );
-		pageSizeUsCheck->setChecked( Settings::searchUsPaperSizes() );
-		pageSizeOtherCheck->setChecked( Settings::searchOtherPaperSizes() );
+		pageSizeIsoCheck->setChecked( model::Settings::searchIsoPaperSizes() );
+		pageSizeUsCheck->setChecked( model::Settings::searchUsPaperSizes() );
+		pageSizeOtherCheck->setChecked( model::Settings::searchOtherPaperSizes() );
 
-		allCategoriesRadio->setChecked( Settings::searchAllCategories() );
-		selectedCategoriesRadio->setChecked( !Settings::searchAllCategories() );
+		allCategoriesRadio->setChecked( model::Settings::searchAllCategories() );
+		selectedCategoriesRadio->setChecked( !model::Settings::searchAllCategories() );
 
-		categoriesCheckContainer->setEnabled( !Settings::searchAllCategories() );
-		mCategoryIdList = Settings::searchCategoryList();
+		categoriesCheckContainer->setEnabled( !model::Settings::searchAllCategories() );
+		mCategoryIdList = model::Settings::searchCategoryList();
 	
-		QList<Category*> categories = Db::categories();
-		foreach ( Category *category, categories )
+		QList<model::Category*> categories = model::Db::categories();
+		foreach ( model::Category *category, categories )
 		{
 			QCheckBox* check = new QCheckBox( category->name() );
 			check->setChecked( mCategoryIdList.contains( category->id() ) );
@@ -60,10 +61,10 @@ namespace glabels
 			connect( check, SIGNAL(clicked()), this, SLOT(onCategoryCheckClicked()) );
 		}
 
-		QList<Template*> tmplates = Db::templates();
+		QList<model::Template*> tmplates = model::Db::templates();
 		templatePicker->setTemplates( tmplates );
 
-		if ( Settings::recentTemplateList().count() > 0 )
+		if ( model::Settings::recentTemplateList().count() > 0 )
 		{
 			modeNotebook->setCurrentIndex(1);
 		}
@@ -75,7 +76,7 @@ namespace glabels
 	///
 	/// Get selected template
 	///
-	const Template* SelectProductDialog::tmplate() const
+	const model::Template* SelectProductDialog::tmplate() const
 	{
 		if ( !mCanceled )
 		{
@@ -106,7 +107,7 @@ namespace glabels
 			break;
 		case 1:
 			// Recent Tab
-			templatePicker->applyFilter( Settings::recentTemplateList() );
+			templatePicker->applyFilter( model::Settings::recentTemplateList() );
 			break;
 		default:
 			qDebug() << "onModeTabChanged(): unknown tab!";
@@ -142,9 +143,9 @@ namespace glabels
 	///
 	void SelectProductDialog::onPageSizeCheckClicked()
 	{
-		Settings::setSearchIsoPaperSizes( pageSizeIsoCheck->isChecked() );
-		Settings::setSearchUsPaperSizes( pageSizeUsCheck->isChecked() );
-		Settings::setSearchOtherPaperSizes( pageSizeOtherCheck->isChecked() );
+		model::Settings::setSearchIsoPaperSizes( pageSizeIsoCheck->isChecked() );
+		model::Settings::setSearchUsPaperSizes( pageSizeUsCheck->isChecked() );
+		model::Settings::setSearchOtherPaperSizes( pageSizeOtherCheck->isChecked() );
 
 		templatePicker->applyFilter( searchEntry->text(),
 		                             pageSizeIsoCheck->isChecked(),
@@ -170,7 +171,7 @@ namespace glabels
 		                             allCategoriesRadio->isChecked(),
 		                             mCategoryIdList );
 
-		Settings::setSearchAllCategories( allCategoriesRadio->isChecked() );
+		model::Settings::setSearchAllCategories( allCategoriesRadio->isChecked() );
 	}
 
 
@@ -189,7 +190,7 @@ namespace glabels
 		                             mCategoryIdList );
 
 
-		Settings::setSearchCategoryList( mCategoryIdList );
+		model::Settings::setSearchCategoryList( mCategoryIdList );
 	}
 
 
diff --git a/glabels/SelectProductDialog.h b/glabels/SelectProductDialog.h
index a4e1aef..890f394 100644
--- a/glabels/SelectProductDialog.h
+++ b/glabels/SelectProductDialog.h
@@ -48,7 +48,7 @@ namespace glabels
 		/////////////////////////////////
 		// Accessors
 		/////////////////////////////////
-		const Template* tmplate() const;
+		const model::Template* tmplate() const;
 
 
 		/////////////////////////////////
diff --git a/glabels/SimplePreview.cpp b/glabels/SimplePreview.cpp
index 8cb62fd..10132f7 100644
--- a/glabels/SimplePreview.cpp
+++ b/glabels/SimplePreview.cpp
@@ -74,7 +74,7 @@ namespace glabels
 	///
 	/// Template Property Setter
 	///
-	void SimplePreview::setTemplate( const Template *tmplate )
+	void SimplePreview::setTemplate( const model::Template *tmplate )
 	{
 		mTmplate = tmplate;
 		update();
@@ -110,10 +110,10 @@ namespace glabels
 		if ( mTmplate != nullptr )
 		{
 			// Set scene up with a 5% margin around paper
-			Distance x = -0.05 * mTmplate->pageWidth();
-			Distance y = -0.05 * mTmplate->pageHeight();
-			Distance w = 1.10 * mTmplate->pageWidth();
-			Distance h = 1.10 * mTmplate->pageHeight();
+			model::Distance x = -0.05 * mTmplate->pageWidth();
+			model::Distance y = -0.05 * mTmplate->pageHeight();
+			model::Distance w = 1.10 * mTmplate->pageWidth();
+			model::Distance h = 1.10 * mTmplate->pageHeight();
 
 			mScene->setSceneRect( x.pt(), y.pt(), w.pt(), h.pt() );
 			fitInView( mScene->sceneRect(), Qt::KeepAspectRatio );
@@ -141,7 +141,7 @@ namespace glabels
 	///
 	/// Draw Paper
 	///
-	void SimplePreview::drawPaper( const Distance& pw, const Distance& ph )
+	void SimplePreview::drawPaper( const model::Distance& pw, const model::Distance& ph )
 	{
 		QGraphicsDropShadowEffect *shadowEffect = new QGraphicsDropShadowEffect();
 		shadowEffect->setColor( shadowColor );
@@ -167,9 +167,9 @@ namespace glabels
 	///
 	void SimplePreview::drawLabels()
 	{
-		Frame *frame = mTmplate->frames().first();
+		model::Frame *frame = mTmplate->frames().first();
 
-		foreach (Point origin, frame->getOrigins() )
+		foreach (model::Point origin, frame->getOrigins() )
 		{
 			drawLabel( origin.x(), origin.y(), frame->path() );
 		}
@@ -179,9 +179,9 @@ namespace glabels
 	///
 	/// Draw a Single Label at x,y
 	///
-	void SimplePreview::drawLabel( const Distance&     x,
-	                               const Distance&     y,
-	                               const QPainterPath& path )
+	void SimplePreview::drawLabel( const model::Distance& x,
+	                               const model::Distance& y,
+	                               const QPainterPath&    path )
 	{
 		QBrush brush( labelColor );
 		QPen pen( labelOutlineColor );
@@ -202,12 +202,12 @@ namespace glabels
 	///
 	void SimplePreview::drawArrow()
 	{
-		Frame *frame = mTmplate->frames().first();
+		model::Frame *frame = mTmplate->frames().first();
 
-		Distance w = frame->w();
-		Distance h = frame->h();
+		model::Distance w = frame->w();
+		model::Distance h = frame->h();
 
-		Distance minWH = min( w, h );
+		model::Distance minWH = min( w, h );
 
 		QPen pen( arrowColor );
 		pen.setWidthF( 0.25*minWH.pt()*arrowScale );
@@ -216,9 +216,9 @@ namespace glabels
 
 		QBrush brush( upColor );
 
-		Point origin = frame->getOrigins().first();
-		Distance x0 = origin.x();
-		Distance y0 = origin.y();
+		model::Point origin = frame->getOrigins().first();
+		model::Distance x0 = origin.x();
+		model::Distance y0 = origin.y();
 
 		QPainterPath path;
 		path.moveTo( 0,                         minWH.pt()*arrowScale/3 );
diff --git a/glabels/SimplePreview.h b/glabels/SimplePreview.h
index d81646c..3148cee 100644
--- a/glabels/SimplePreview.h
+++ b/glabels/SimplePreview.h
@@ -22,7 +22,7 @@
 #define SimplePreview_h
 
 
-#include "Template.h"
+#include "model/Template.h"
 
 #include <QGraphicsView>
 #include <QGraphicsScene>
@@ -51,7 +51,7 @@ namespace glabels
 		// Properties
 		/////////////////////////////////
 	public:
-		void setTemplate( const Template *tmplate );
+		void setTemplate( const model::Template *tmplate );
 		void setRotate( bool rotateFlag );
 
 
@@ -68,9 +68,9 @@ namespace glabels
 	private:
 		void update();
 		void clearScene();
-		void drawPaper( const Distance& pw, const Distance& ph );
+		void drawPaper( const model::Distance& pw, const model::Distance& ph );
 		void drawLabels();
-		void drawLabel( const Distance& x, const Distance& y, const QPainterPath& path );
+		void drawLabel( const model::Distance& x, const model::Distance& y, const QPainterPath& path );
 		void drawArrow();
 
 
@@ -78,10 +78,10 @@ namespace glabels
 		// Private Data
 		/////////////////////////////////
 	private:
-		const Template          *mTmplate;
-		bool                     mRotateFlag;
+		const model::Template* mTmplate;
+		bool                   mRotateFlag;
 
-		QGraphicsScene          *mScene;
+		QGraphicsScene* mScene;
 
 	};
 
diff --git a/glabels/TemplatePicker.cpp b/glabels/TemplatePicker.cpp
index 6b065b0..005bbc5 100644
--- a/glabels/TemplatePicker.cpp
+++ b/glabels/TemplatePicker.cpp
@@ -45,9 +45,9 @@ namespace glabels
 	///
 	/// Set List of Templates to Pick From
 	///
-	void TemplatePicker::setTemplates( const QList <Template*> &tmplates )
+	void TemplatePicker::setTemplates( const QList <model::Template*> &tmplates )
 	{
-		foreach (Template *tmplate, tmplates)
+		foreach (model::Template *tmplate, tmplates)
 		{
 			new TemplatePickerItem( tmplate, this );
 		}
@@ -135,7 +135,7 @@ namespace glabels
 	///
 	/// Get Currently Selected Template
 	///
-	const Template *TemplatePicker::selectedTemplate()
+	const model::Template *TemplatePicker::selectedTemplate()
 	{
 		QList<QListWidgetItem *> items = selectedItems();
 		if ( items.isEmpty() )
diff --git a/glabels/TemplatePicker.h b/glabels/TemplatePicker.h
index c7f9527..5f9841c 100644
--- a/glabels/TemplatePicker.h
+++ b/glabels/TemplatePicker.h
@@ -22,7 +22,7 @@
 #define TemplatePicker_h
 
 
-#include "Template.h"
+#include "model/Template.h"
 
 #include <QList>
 #include <QListWidget>
@@ -50,7 +50,7 @@ namespace glabels
 		// Properties
 		/////////////////////////////////
 	public:
-		void setTemplates( const QList <Template*> &tmplates );
+		void setTemplates( const QList <model::Template*> &tmplates );
 
 
 		/////////////////////////////////
@@ -62,7 +62,7 @@ namespace glabels
 
 		void applyFilter( const QStringList& names );
 
-		const Template *selectedTemplate();
+		const model::Template *selectedTemplate();
 
 	};
 
diff --git a/glabels/TemplatePickerItem.cpp b/glabels/TemplatePickerItem.cpp
index bb4526e..06ff563 100644
--- a/glabels/TemplatePickerItem.cpp
+++ b/glabels/TemplatePickerItem.cpp
@@ -33,7 +33,7 @@ namespace glabels
 	///
 	/// Constructor
 	///
-	TemplatePickerItem::TemplatePickerItem( Template *tmplate, QListWidget *parent )
+	TemplatePickerItem::TemplatePickerItem( model::Template *tmplate, QListWidget *parent )
 		: QListWidgetItem(parent)
 	{
 		mTmplate = tmplate;
@@ -48,7 +48,7 @@ namespace glabels
 	///
 	/// Template Property Getter
 	///
-	const Template *TemplatePickerItem::tmplate() const
+	const model::Template *TemplatePickerItem::tmplate() const
 	{
 		return mTmplate;
 	}
diff --git a/glabels/TemplatePickerItem.h b/glabels/TemplatePickerItem.h
index 7434eb0..7ca14ea 100644
--- a/glabels/TemplatePickerItem.h
+++ b/glabels/TemplatePickerItem.h
@@ -22,7 +22,7 @@
 #define TemplatePickerItem_h
 
 
-#include "Template.h"
+#include "model/Template.h"
 
 #include <QLabel>
 #include <QListWidget>
@@ -43,21 +43,21 @@ namespace glabels
 		// Life Cycle
 		/////////////////////////////////
 	public:
-		TemplatePickerItem( Template *tmplate, QListWidget *parent = nullptr );
+		TemplatePickerItem( model::Template *tmplate, QListWidget *parent = nullptr );
 
 
 		/////////////////////////////////
 		// Properties
 		/////////////////////////////////
 	public:
-		const Template *tmplate() const;
+		const model::Template *tmplate() const;
 
 
 		/////////////////////////////////
 		// Private Data
 		/////////////////////////////////
 	private:
-		Template *mTmplate;
+		model::Template *mTmplate;
 
 	};
 
diff --git a/glabels/UndoRedoModel.cpp b/glabels/UndoRedoModel.cpp
index f292978..cf8ad4a 100644
--- a/glabels/UndoRedoModel.cpp
+++ b/glabels/UndoRedoModel.cpp
@@ -20,7 +20,7 @@
 
 #include "UndoRedoModel.h"
 
-#include "LabelModel.h"
+#include "model/Model.h"
 
 
 namespace glabels
@@ -29,7 +29,7 @@ namespace glabels
 	///
 	/// Constructor
 	///
-	UndoRedoModel::UndoRedoModel( LabelModel* model )
+	UndoRedoModel::UndoRedoModel( model::Model* model )
 	{
 		mModel = model;
 		mNewSelection = true;
@@ -178,7 +178,7 @@ namespace glabels
 	///
 	/// State constructor
 	///
-	UndoRedoModel::State::State( LabelModel* model, const QString& description )
+	UndoRedoModel::State::State( model::Model* model, const QString& description )
 	{
 		this->model = model->save();
 		this->description = description;
diff --git a/glabels/UndoRedoModel.h b/glabels/UndoRedoModel.h
index 5b14b7d..0a11de7 100644
--- a/glabels/UndoRedoModel.h
+++ b/glabels/UndoRedoModel.h
@@ -22,6 +22,8 @@
 #define UndoRedoModel_h
 
 
+#include "model/Model.h"
+
 #include <QList>
 #include <QObject>
 #include <QString>
@@ -30,10 +32,6 @@
 namespace glabels
 {
 
-	// Forward references
-	class LabelModel;
-
-
 	///
 	/// UndoRedoModel
 	///
@@ -46,7 +44,7 @@ namespace glabels
 		// Life Cycle
 		/////////////////////////////////
 	public:
-		UndoRedoModel( LabelModel* model );
+		UndoRedoModel( model::Model* model );
 		~UndoRedoModel() override;
 
 
@@ -84,11 +82,11 @@ namespace glabels
 		class State
 		{
 		public:
-			State( LabelModel* model, const QString& description );
+			State( model::Model* model, const QString& description );
 			~State();
 
-			LabelModel* model;
-			QString     description;
+			model::Model* model;
+			QString       description;
 		};
 
 		class Stack
@@ -112,13 +110,13 @@ namespace glabels
 		// Private data
 		/////////////////////////////////
 	private:
-		LabelModel         *mModel;
+		model::Model*  mModel;
 
-		Stack               mUndoStack;
-		Stack               mRedoStack;
+		Stack          mUndoStack;
+		Stack          mRedoStack;
 	
-		bool                mNewSelection;
-		QString             mLastDescription;
+		bool           mNewSelection;
+		QString        mLastDescription;
 
 	};
 
diff --git a/glabels/XmlLabelCreator.h b/glabels/XmlLabelCreator.h
deleted file mode 100644
index cb135b7..0000000
--- a/glabels/XmlLabelCreator.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*  XmlLabelCreator.h
- *
- *  Copyright (C) 2014  Jim Evins <evins@snaught.com>
- *
- *  This file is part of gLabels-qt.
- *
- *  gLabels-qt is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  gLabels-qt 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef XmlLabelCreator_h
-#define XmlLabelCreator_h
-
-
-#include <QObject>
-#include <QDomElement>
-
-
-namespace glabels
-{
-
-	// Forward references
-	class LabelModel;
-	class LabelModelObject;
-	class LabelModelBoxObject;
-	class LabelModelEllipseObject;
-	class LabelModelLineObject;
-	class LabelModelImageObject;
-	class LabelModelBarcodeObject;
-	class LabelModelTextObject;
-
-
-	///
-	/// XmlLabelCreator
-	///
-	class XmlLabelCreator : public QObject
-	{
-		Q_OBJECT
-
-	public:
-		static void writeFile( const LabelModel* label, const QString& fileName );
-		static void writeBuffer( const LabelModel* label, QByteArray& buffer );
-		static void serializeObjects( const QList<LabelModelObject*>& objects, QByteArray& buffer );
-
-	private:
-		static void createDoc( QDomDocument& doc, const LabelModel* label );
-		static void createRootNode( const LabelModel* label );
-		static void createObjectsNode( QDomElement &parent, const QList<LabelModelObject*>& objects, bool rotate );
-		static void createObjectBoxNode( QDomElement &parent, const LabelModelBoxObject* object );
-		static void createObjectEllipseNode( QDomElement &parent, const LabelModelEllipseObject* object );
-		static void createObjectLineNode( QDomElement &parent, const LabelModelLineObject* object );
-		static void createObjectImageNode( QDomElement &parent, const LabelModelImageObject* object );
-		static void createObjectBarcodeNode( QDomElement &parent, const LabelModelBarcodeObject* object );
-		static void createObjectTextNode( QDomElement &parent, const LabelModelTextObject* object );
-		static void createPNode( QDomElement &parent, const QString& blockText );
-		static void createPositionAttrs( QDomElement &node, const LabelModelObject* object );
-		static void createSizeAttrs( QDomElement &node, const LabelModelObject* object );
-		static void createLineAttrs( QDomElement &node, const LabelModelObject* object );
-		static void createFillAttrs( QDomElement &node, const LabelModelObject* object );
-		static void createAffineAttrs( QDomElement &node, const LabelModelObject* object );
-		static void createShadowAttrs( QDomElement &node, const LabelModelObject* object );
-		static void createMergeNode( QDomElement &parent, const LabelModel* label );
-		static void createDataNode( QDomElement &parent, const QList<LabelModelObject*>& objects );
-		static void createPngFileNode( QDomElement &parent, const QString& name, const QImage& image );
-		static void createSvgFileNode( QDomElement &parent, const QString& name, const QByteArray& svg );
-
-	};
-
-}
-
-
-#endif // XmlLabelCreator_h
diff --git a/glabels/glabels_main.cpp b/glabels/main.cpp
similarity index 80%
rename from glabels/glabels_main.cpp
rename to glabels/main.cpp
index 85799e1..4bdca03 100644
--- a/glabels/glabels_main.cpp
+++ b/glabels/main.cpp
@@ -1,4 +1,4 @@
-/*  glabels_main.cpp
+/*  main.cpp
  *
  *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
  *
@@ -18,16 +18,17 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "BarcodeBackends.h"
-#include "FileUtil.h"
-#include "Db.h"
-#include "LabelModel.h"
 #include "MainWindow.h"
-#include "Settings.h"
-#include "Version.h"
-#include "XmlLabelParser.h"
 
-#include "Merge/Factory.h"
+#include "model/FileUtil.h"
+#include "model/Db.h"
+#include "model/Model.h"
+#include "model/Settings.h"
+#include "model/Version.h"
+#include "model/XmlLabelParser.h"
+
+#include "barcode/Backends.h"
+#include "merge/Factory.h"
 
 #include <QApplication>
 #include <QCommandLineParser>
@@ -44,14 +45,14 @@ int main( int argc, char **argv )
 	QCoreApplication::setOrganizationName( "glabels.org" );
 	QCoreApplication::setOrganizationDomain( "glabels.org" );
 	QCoreApplication::setApplicationName( "glabels-qt" );
-	QCoreApplication::setApplicationVersion( glabels::Version::STRING );
+	QCoreApplication::setApplicationVersion( glabels::model::Version::STRING );
 
 	//
 	// Setup translators
 	//
 	QLocale locale = QLocale::system();
 	QString qtTranslationsDir = QLibraryInfo::location( QLibraryInfo::TranslationsPath );
-	QString myTranslationsDir = glabels::FileUtil::translationsDir().canonicalPath();
+	QString myTranslationsDir = glabels::model::FileUtil::translationsDir().canonicalPath();
 	
 	QTranslator qtTranslator;
 	if ( qtTranslator.load( locale, "qt", "_", qtTranslationsDir ) )
@@ -87,10 +88,10 @@ int main( int argc, char **argv )
 	//
 	// Initialize subsystems
 	//
-	glabels::Settings::init();
-	glabels::Db::init();
+	glabels::model::Settings::init();
+	glabels::model::Db::init();
 	glabels::merge::Factory::init();
-	glabels::BarcodeBackends::init();
+	glabels::barcode::Backends::init();
 
 	
 	//
@@ -99,12 +100,12 @@ int main( int argc, char **argv )
 	bool openedFiles = false;
 	foreach ( QString filename, parser.positionalArguments() )
 	{
-		glabels::LabelModel *label = glabels::XmlLabelParser::readFile( filename );
-		if ( label )
+		glabels::model::Model *model = glabels::model::XmlLabelParser::readFile( filename );
+		if ( model )
 		{
-			label->setFileName( filename );
+			model->setFileName( filename );
 			glabels::MainWindow *newWindow = new glabels::MainWindow();
-			newWindow->setModel( label );
+			newWindow->setModel( model );
 			newWindow->show();
 			openedFiles = true;
 		}
diff --git a/glbarcode/CMakeLists.txt b/glbarcode/CMakeLists.txt
index f08a946..ca561c1 100644
--- a/glbarcode/CMakeLists.txt
+++ b/glbarcode/CMakeLists.txt
@@ -1,21 +1,9 @@
-#=======================================
-# Compilation
-#=======================================
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-add_compile_options (-std=c++11 -g)
-if (NOT WIN32)
-   add_compile_options (-fPIC)
-endif ()
-
-# Uncomment to build with pedantic flags
-#add_compile_options (-Werror -Wall -Wpedantic)
-
+project (glbarcode LANGUAGES CXX)
 
 #=======================================
 # Sources
 #=======================================
-set (LIB_SOURCES
+set (GLBARCODE_SOURCES
   Factory.cpp
   Barcode.cpp
   Barcode1dBase.cpp
@@ -38,15 +26,21 @@ set (LIB_SOURCES
   QtRenderer.cpp
 )
 
-add_library (glbarcode
-  ${LIB_SOURCES}
+#=====================================
+# Target
+#=====================================
+add_library (glbarcode STATIC
+  ${GLBARCODE_SOURCES}
 )
 
-
-#=======================================
-# Where to find stuff
-#=======================================
-include_directories (
-  ${Qt5Widgets_INCLUDE_DIRS}
+target_compile_features (glbarcode
+  PUBLIC cxx_std_11
 )
 
+target_include_directories (glbarcode
+  PUBLIC ..
+)
+
+target_link_libraries (glbarcode
+  Qt5::Widgets
+)
diff --git a/model/CMakeLists.txt b/model/CMakeLists.txt
new file mode 100644
index 0000000..a190a28
--- /dev/null
+++ b/model/CMakeLists.txt
@@ -0,0 +1,106 @@
+project (Model LANGUAGES CXX)
+
+#=======================================
+# Sources
+#=======================================
+# Auto-generated files
+configure_file (Version.h.in ${CMAKE_CURRENT_BINARY_DIR}/Version.h @ONLY)
+configure_file (Config.h.in ${CMAKE_CURRENT_BINARY_DIR}/Config.h @ONLY)
+
+set (Model_sources
+  Category.cpp
+  ColorNode.cpp
+  DataCache.cpp
+  Db.cpp
+  Distance.cpp
+  FileUtil.cpp
+  Frame.cpp
+  FrameCd.cpp
+  FrameEllipse.cpp
+  FrameRect.cpp
+  FrameRound.cpp
+  Handles.cpp
+  Layout.cpp
+  Markup.cpp
+  Model.cpp
+  ModelObject.cpp
+  ModelBarcodeObject.cpp
+  ModelBoxObject.cpp
+  ModelEllipseObject.cpp
+  ModelImageObject.cpp
+  ModelLineObject.cpp
+  ModelShapeObject.cpp
+  ModelTextObject.cpp
+  Outline.cpp
+  PageRenderer.cpp
+  Paper.cpp
+  Point.cpp
+  RawText.cpp
+  Region.cpp
+  Settings.cpp
+  Size.cpp
+  StrUtil.cpp
+  SubstitutionField.cpp
+  Template.cpp
+  TextNode.cpp
+  Units.cpp
+  Vendor.cpp
+  XmlCategoryParser.cpp
+  XmlLabelCreator.cpp
+  XmlLabelParser.cpp
+  XmlPaperParser.cpp
+  XmlTemplateCreator.cpp
+  XmlTemplateParser.cpp
+  XmlUtil.cpp
+  XmlVendorParser.cpp
+)
+
+set (Model_qobject_headers
+  Model.h
+  ModelObject.h
+  ModelBarcodeObject.h
+  ModelBoxObject.h
+  ModelEllipseObject.h
+  ModelImageObject.h
+  ModelLineObject.h
+  ModelShapeObject.h
+  ModelTextObject.h
+  PageRenderer.h
+  Settings.h
+)
+
+qt5_wrap_cpp (Model_moc_sources ${Model_qobject_headers})
+
+#=====================================
+# Target
+#=====================================
+add_library (Model STATIC
+  ${Model_sources}
+  ${Model_moc_sources}
+)
+
+target_compile_features (Model
+  PUBLIC cxx_std_11
+)
+
+target_include_directories (Model
+  PUBLIC .. ${CMAKE_CURRENT_BINARY_DIR}/..
+  PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+target_link_libraries (Model
+  Barcode
+  Merge
+  Qt5::Widgets
+  Qt5::PrintSupport
+  Qt5::Xml
+  Qt5::Svg
+  ZLIB::ZLIB
+)
+
+#=======================================
+# Subdirectories
+#=======================================
+add_subdirectory (unit_tests)
+
+
diff --git a/glabels/Category.cpp b/model/Category.cpp
similarity index 94%
rename from glabels/Category.cpp
rename to model/Category.cpp
index 7be974e..7637e0d 100644
--- a/glabels/Category.cpp
+++ b/model/Category.cpp
@@ -21,7 +21,7 @@
 #include "Category.h"
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	Category::Category( const QString &id, const QString &name )
@@ -42,4 +42,4 @@ namespace glabels
 		return mName;
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/Category.h b/model/Category.h
similarity index 90%
rename from glabels/Category.h
rename to model/Category.h
index a80d91f..63991e4 100644
--- a/glabels/Category.h
+++ b/model/Category.h
@@ -18,14 +18,14 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_Category_h
-#define glabels_Category_h
+#ifndef model_Category_h
+#define model_Category_h
 
 
 #include <QString>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	class Category
@@ -47,4 +47,4 @@ namespace glabels
 }
 
 
-#endif // glabels_Category_h
+#endif // model_Category_h
diff --git a/glabels/ColorNode.cpp b/model/ColorNode.cpp
similarity index 97%
rename from glabels/ColorNode.cpp
rename to model/ColorNode.cpp
index 7e93092..49e91a5 100644
--- a/glabels/ColorNode.cpp
+++ b/model/ColorNode.cpp
@@ -20,10 +20,10 @@
 
 #include "ColorNode.h"
 
-#include "Merge/Record.h"
+#include "merge/Record.h"
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	///
@@ -199,4 +199,4 @@ namespace glabels
 		}
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/ColorNode.h b/model/ColorNode.h
similarity index 94%
rename from glabels/ColorNode.h
rename to model/ColorNode.h
index 54cc26b..fbf7b15 100644
--- a/glabels/ColorNode.h
+++ b/model/ColorNode.h
@@ -18,11 +18,11 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ColorNode_h
-#define ColorNode_h
+#ifndef model_ColorNode_h
+#define model_ColorNode_h
 
 
-#include "Merge/Record.h"
+#include "merge/Record.h"
 
 #include <QString>
 #include <QColor>
@@ -30,7 +30,7 @@
 #include <cstdint>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	///
@@ -109,4 +109,4 @@ namespace glabels
 }
 
 
-#endif // ColorNode_h
+#endif // model_ColorNode_h
diff --git a/glabels/Config.h.in b/model/Config.h.in
similarity index 77%
rename from glabels/Config.h.in
rename to model/Config.h.in
index 1c60c97..d132071 100644
--- a/glabels/Config.h.in
+++ b/model/Config.h.in
@@ -18,20 +18,20 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_Config_h
-#define glabels_Config_h
+#ifndef model_Config_h
+#define model_Config_h
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	namespace Config
 	{
-		const QString PROJECT_SOURCE_DIR    = "@glabels_SOURCE_DIR@";
-		const QString PROJECT_BUILD_DIR     = "@glabels_BINARY_DIR@";
+		const QString PROJECT_SOURCE_DIR    = "@glabels-qt_SOURCE_DIR@";
+		const QString PROJECT_BUILD_DIR     = "@glabels-qt_BINARY_DIR@";
 	}
 
 }
 
 
-#endif // glabels_Config_h
+#endif // model_Config_h
diff --git a/glabels/Constants.h b/model/Constants.h
similarity index 90%
rename from glabels/Constants.h
rename to model/Constants.h
index 5fb4917..383140b 100644
--- a/glabels/Constants.h
+++ b/model/Constants.h
@@ -18,11 +18,11 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_Constants_h
-#define glabels_Constants_h
+#ifndef model_Constants_h
+#define model_Constants_h
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	const double PTS_PER_PT    =  1.0;
@@ -34,4 +34,4 @@ namespace glabels
 	const Distance EPSILON( 0.5, Units::PT );
 }
 
-#endif // glabels_Constants_h
+#endif // model_Constants_h
diff --git a/glabels/DataCache.cpp b/model/DataCache.cpp
similarity index 87%
rename from glabels/DataCache.cpp
rename to model/DataCache.cpp
index 2738756..aa0c480 100644
--- a/glabels/DataCache.cpp
+++ b/model/DataCache.cpp
@@ -20,10 +20,10 @@
 
 #include "DataCache.h"
 
-#include "LabelModelImageObject.h"
+#include "ModelImageObject.h"
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	DataCache::DataCache()
@@ -32,11 +32,11 @@ namespace glabels
 	}
 
 
-	DataCache::DataCache( const QList<LabelModelObject*>& objects )
+	DataCache::DataCache( const QList<ModelObject*>& objects )
 	{
-		foreach( LabelModelObject* object, objects )
+		foreach( ModelObject* object, objects )
 		{
-			if ( LabelModelImageObject* imageObject = dynamic_cast<LabelModelImageObject*>(object) )
+			if ( ModelImageObject* imageObject = dynamic_cast<ModelImageObject*>(object) )
 			{
 				TextNode filenameNode = imageObject->filenameNode();
 				if ( !filenameNode.isField()  )
@@ -107,4 +107,4 @@ namespace glabels
 	}
 
 	
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/DataCache.h b/model/DataCache.h
similarity index 87%
rename from glabels/DataCache.h
rename to model/DataCache.h
index 63fd685..37faed8 100644
--- a/glabels/DataCache.h
+++ b/model/DataCache.h
@@ -18,14 +18,14 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_DataCache_h
-#define glabels_DataCache_h
+#ifndef model_DataCache_h
+#define model_DataCache_h
 
 
-#include "LabelModel.h"
+#include "Model.h"
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	class DataCache
@@ -33,7 +33,7 @@ namespace glabels
 	public:
 		DataCache();
 		
-		DataCache( const QList<LabelModelObject*>& objects );
+		DataCache( const QList<ModelObject*>& objects );
 
 		bool hasImage( const QString& name ) const;
 		QImage getImage( const QString& name ) const;
@@ -55,4 +55,4 @@ namespace glabels
 }
 
 
-#endif // glabels_DataCache_h
+#endif // model_DataCache_h
diff --git a/glabels/Db.cpp b/model/Db.cpp
similarity index 99%
rename from glabels/Db.cpp
rename to model/Db.cpp
index d321ab2..eb9f57d 100644
--- a/glabels/Db.cpp
+++ b/model/Db.cpp
@@ -34,7 +34,7 @@
 #include <algorithm>
 
 
-namespace glabels
+namespace glabels::model
 {
 	
 	//
@@ -686,4 +686,4 @@ namespace glabels
 		}
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/Db.h b/model/Db.h
similarity index 97%
rename from glabels/Db.h
rename to model/Db.h
index 0d47998..d730930 100644
--- a/glabels/Db.h
+++ b/model/Db.h
@@ -18,8 +18,8 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_Db_h
-#define glabels_Db_h
+#ifndef model_Db_h
+#define model_Db_h
 
 
 #include "Category.h"
@@ -33,7 +33,7 @@
 #include <QString>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	class Db
@@ -138,4 +138,4 @@ namespace glabels
 }
 
 
-#endif // glabels_Db_h
+#endif // model_Db_h
diff --git a/glabels/Distance.cpp b/model/Distance.cpp
similarity index 98%
rename from glabels/Distance.cpp
rename to model/Distance.cpp
index 5d83f22..f39ab6a 100644
--- a/glabels/Distance.cpp
+++ b/model/Distance.cpp
@@ -24,7 +24,7 @@
 #include <QtDebug>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	Distance::Distance( double d, Units::Enum unitsEnum )
@@ -204,4 +204,4 @@ namespace glabels
 		return QString::number( inUnits(units) ) + units.toIdString();
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/Distance.inl b/model/Distance.h
similarity index 60%
rename from glabels/Distance.inl
rename to model/Distance.h
index b8d70f7..d0556d7 100644
--- a/glabels/Distance.inl
+++ b/model/Distance.h
@@ -1,4 +1,4 @@
-/*  Distance.inl
+/*  Distance.h
  *
  *  Copyright (C) 2016  Jim Evins <evins@snaught.com>
  *
@@ -18,12 +18,92 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef model_Distance_h
+#define model_Distance_h
 
-#include "Constants.h"
+
+#include "Units.h"
+
+#include <QCoreApplication>
+#include <QString>
 #include <QtMath>
 
 
-namespace glabels
+namespace glabels::model
+{
+
+	class Distance
+	{
+		Q_DECLARE_TR_FUNCTIONS(Distance)
+
+	public:
+		Distance();
+		Distance( double d, Units::Enum unitsEnum = Units::PT );
+		Distance( double d, const Units& units );
+		Distance( double d, const QString& unitsId );
+
+		static Distance pt( double dPts );
+		static Distance in( double dInches );
+		static Distance mm( double dMm );
+		static Distance cm( double dCm );
+		static Distance pc( double dPicas );
+		static Distance fromString( const QString& string );
+
+
+		double pt() const;
+		double in() const;
+		double mm() const;
+		double cm() const;
+		double pc() const;
+		double inUnits( const Units& units ) const;
+		double inUnits( Units::Enum unitsEnum ) const;
+		double inUnits( const QString& unitsId ) const;
+
+
+		QString toString( const Units& units ) const;
+		QString toString( Units::Enum unitsEnum ) const;
+		QString toString( const QString& unitsId ) const;
+
+
+		Distance& operator+=( const Distance& d );
+		Distance& operator-=( const Distance& d );
+		Distance operator-();
+
+		friend inline Distance operator+( const Distance& d1, const Distance& d2 );
+		friend inline Distance operator-( const Distance& d1, const Distance& d2 );
+		friend inline Distance operator*( double x, const Distance& d );
+		friend inline Distance operator*( const Distance& d, double x );
+		friend inline double   operator/( const Distance& d1, const Distance& d2 );
+		friend inline Distance operator/( const Distance& d, double x );
+		
+		friend inline bool operator<( const Distance& d1, const Distance& d2 );
+		friend inline bool operator<=( const Distance& d1, const Distance& d2 );
+		friend inline bool operator>( const Distance& d1, const Distance& d2 );
+		friend inline bool operator>=( const Distance& d1, const Distance& d2 );
+		friend inline bool operator==( const Distance& d1, const Distance& d2 );
+		friend inline bool operator!=( const Distance& d1, const Distance& d2 );
+		
+		friend inline Distance fabs( const Distance& d );
+		friend inline Distance min( const Distance& d1, const Distance& d2 );
+		friend inline Distance max( const Distance& d1, const Distance& d2 );
+		friend inline Distance fmod( const Distance& d1, const Distance& d2 );
+
+		
+	private:
+		double mDPts;
+
+	};
+
+}
+
+
+//
+// Inline methods
+//
+	
+#include "Constants.h"
+
+namespace glabels::model
 {
 
 	inline Distance::Distance() : mDPts(0)
@@ -217,3 +297,6 @@ namespace glabels
 	}
 
 }
+
+
+#endif // model_Distance_h
diff --git a/glabels/FileUtil.cpp b/model/FileUtil.cpp
similarity index 97%
rename from glabels/FileUtil.cpp
rename to model/FileUtil.cpp
index 31c92ed..4618221 100644
--- a/glabels/FileUtil.cpp
+++ b/model/FileUtil.cpp
@@ -25,7 +25,7 @@
 #include <QApplication>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	QString FileUtil::addExtension( const QString& rawFilename, const QString& extension )
@@ -84,4 +84,4 @@ namespace glabels
 		return QDir("/");
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/FileUtil.h b/model/FileUtil.h
similarity index 90%
rename from glabels/FileUtil.h
rename to model/FileUtil.h
index 953de04..3c2469a 100644
--- a/glabels/FileUtil.h
+++ b/model/FileUtil.h
@@ -18,15 +18,15 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef FileUtil_h
-#define FileUtil_h
+#ifndef model_FileUtil_h
+#define model_FileUtil_h
 
 
 #include <QString>
 #include <QDir>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	namespace FileUtil
@@ -43,4 +43,4 @@ namespace glabels
 }
 
 
-#endif // FileUtil_h
+#endif // model_FileUtil_h
diff --git a/glabels/Frame.cpp b/model/Frame.cpp
similarity index 98%
rename from glabels/Frame.cpp
rename to model/Frame.cpp
index 1e82b99..4d730cf 100644
--- a/glabels/Frame.cpp
+++ b/model/Frame.cpp
@@ -25,7 +25,7 @@
 #include <algorithm>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	Frame::Frame( const QString& id )
@@ -135,4 +135,4 @@ namespace glabels
 		mMarkups << markup;
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/Frame.h b/model/Frame.h
similarity index 95%
rename from glabels/Frame.h
rename to model/Frame.h
index 65521ca..45e9859 100644
--- a/glabels/Frame.h
+++ b/model/Frame.h
@@ -18,8 +18,8 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_Frame_h
-#define glabels_Frame_h
+#ifndef model_Frame_h
+#define model_Frame_h
 
 
 #include "Distance.h"
@@ -33,7 +33,7 @@
 #include <QVector>
 
 
-namespace glabels
+namespace glabels::model
 {
 	
 	// Forward references
@@ -85,4 +85,4 @@ namespace glabels
 }
 
 
-#endif // glabels_Frame_h
+#endif // model_Frame_h
diff --git a/glabels/FrameCd.cpp b/model/FrameCd.cpp
similarity index 98%
rename from glabels/FrameCd.cpp
rename to model/FrameCd.cpp
index 7978435..e4d16ef 100644
--- a/glabels/FrameCd.cpp
+++ b/model/FrameCd.cpp
@@ -26,7 +26,7 @@
 #include <QtDebug>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	FrameCd::FrameCd( const Distance& r1,
@@ -215,4 +215,4 @@ namespace glabels
 		return path;
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/FrameCd.h b/model/FrameCd.h
similarity index 94%
rename from glabels/FrameCd.h
rename to model/FrameCd.h
index 984c786..b50c83b 100644
--- a/glabels/FrameCd.h
+++ b/model/FrameCd.h
@@ -18,14 +18,14 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_FrameCd_h
-#define glabels_FrameCd_h
+#ifndef model_FrameCd_h
+#define model_FrameCd_h
 
 
 #include "Frame.h"
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	class FrameCd : public Frame
@@ -74,4 +74,4 @@ namespace glabels
 }
 
 
-#endif // glabels_FrameCd_h
+#endif // model_FrameCd_h
diff --git a/glabels/FrameEllipse.cpp b/model/FrameEllipse.cpp
similarity index 98%
rename from glabels/FrameEllipse.cpp
rename to model/FrameEllipse.cpp
index 16264ad..dc72cb9 100644
--- a/glabels/FrameEllipse.cpp
+++ b/model/FrameEllipse.cpp
@@ -24,7 +24,7 @@
 #include "StrUtil.h"
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	FrameEllipse::FrameEllipse( const Distance& w,
@@ -127,4 +127,4 @@ namespace glabels
 		return path;
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/FrameEllipse.h b/model/FrameEllipse.h
similarity index 93%
rename from glabels/FrameEllipse.h
rename to model/FrameEllipse.h
index e2b7e40..c96045a 100644
--- a/glabels/FrameEllipse.h
+++ b/model/FrameEllipse.h
@@ -18,14 +18,14 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_FrameEllipse_h
-#define glabels_FrameEllipse_h
+#ifndef model_FrameEllipse_h
+#define model_FrameEllipse_h
 
 
 #include "Frame.h"
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	class FrameEllipse : public Frame
@@ -68,4 +68,4 @@ namespace glabels
 }
 
 
-#endif // glabels_FrameEllipse_h
+#endif // model_FrameEllipse_h
diff --git a/glabels/FrameRect.cpp b/model/FrameRect.cpp
similarity index 98%
rename from glabels/FrameRect.cpp
rename to model/FrameRect.cpp
index 854803d..b591b15 100644
--- a/glabels/FrameRect.cpp
+++ b/model/FrameRect.cpp
@@ -24,7 +24,7 @@
 #include "StrUtil.h"
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	FrameRect::FrameRect( const Distance& w,
@@ -149,4 +149,4 @@ namespace glabels
 	}
 
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/FrameRect.h b/model/FrameRect.h
similarity index 94%
rename from glabels/FrameRect.h
rename to model/FrameRect.h
index 9a149d1..f70013a 100644
--- a/glabels/FrameRect.h
+++ b/model/FrameRect.h
@@ -18,14 +18,14 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_FrameRect_h
-#define glabels_FrameRect_h
+#ifndef model_FrameRect_h
+#define model_FrameRect_h
 
 
 #include "Frame.h"
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	class FrameRect : public Frame
@@ -75,4 +75,4 @@ namespace glabels
 }
 
 
-#endif // glabels_FrameRect_h
+#endif // model_FrameRect_h
diff --git a/glabels/FrameRound.cpp b/model/FrameRound.cpp
similarity index 97%
rename from glabels/FrameRound.cpp
rename to model/FrameRound.cpp
index 1db08fb..c12d8fa 100644
--- a/glabels/FrameRound.cpp
+++ b/model/FrameRound.cpp
@@ -24,7 +24,7 @@
 #include "StrUtil.h"
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	FrameRound::FrameRound( const Distance& r,
@@ -131,4 +131,4 @@ namespace glabels
 		return path;
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/FrameRound.h b/model/FrameRound.h
similarity index 93%
rename from glabels/FrameRound.h
rename to model/FrameRound.h
index 38ff557..c4b6fe6 100644
--- a/glabels/FrameRound.h
+++ b/model/FrameRound.h
@@ -18,14 +18,14 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_FrameRound_h
-#define glabels_FrameRound_h
+#ifndef model_FrameRound_h
+#define model_FrameRound_h
 
 
 #include "Frame.h"
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	class FrameRound : public Frame
@@ -67,4 +67,4 @@ namespace glabels
 }
 
 
-#endif // glabels_FrameRound_h
+#endif // model_FrameRound_h
diff --git a/glabels/Handles.cpp b/model/Handles.cpp
similarity index 85%
rename from glabels/Handles.cpp
rename to model/Handles.cpp
index 1912a14..a41874f 100644
--- a/glabels/Handles.cpp
+++ b/model/Handles.cpp
@@ -20,13 +20,13 @@
 
 #include "Handles.h"
 
-#include "LabelModelObject.h"
+#include "ModelObject.h"
 
 #include <QColor>
 #include <QtDebug>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	//
@@ -46,7 +46,7 @@ namespace glabels
 	///
 	/// Handle Constructor
 	///
-	Handle::Handle( LabelModelObject* owner, Location location )
+	Handle::Handle( ModelObject* owner, Location location )
 		: mOwner(owner), mLocation(location)
 	{
 		// empty
@@ -65,7 +65,7 @@ namespace glabels
 	///
 	/// Handle owner
 	///
-	LabelModelObject* Handle::owner() const
+	ModelObject* Handle::owner() const
 	{
 		return mOwner;
 	}
@@ -130,7 +130,7 @@ namespace glabels
 	///
 	/// HandleNorth Constructor
 	///
-	HandleNorth::HandleNorth( LabelModelObject* owner )
+	HandleNorth::HandleNorth( ModelObject* owner )
 		: Handle( owner, N )
 	{
 		// empty
@@ -149,7 +149,7 @@ namespace glabels
 	///
 	/// HandleNorth Clone
 	///
-	HandleNorth* HandleNorth::clone( LabelModelObject* newOwner ) const
+	HandleNorth* HandleNorth::clone( ModelObject* newOwner ) const
 	{
 		return new HandleNorth( newOwner );
 	}
@@ -176,7 +176,7 @@ namespace glabels
 	///
 	/// HandleNorthEast Constructor
 	///
-	HandleNorthEast::HandleNorthEast( LabelModelObject* owner )
+	HandleNorthEast::HandleNorthEast( ModelObject* owner )
 		: Handle( owner, NE )
 	{
 		// empty
@@ -195,7 +195,7 @@ namespace glabels
 	///
 	/// HandleNorthEast Clone
 	///
-	HandleNorthEast* HandleNorthEast::clone( LabelModelObject* newOwner ) const
+	HandleNorthEast* HandleNorthEast::clone( ModelObject* newOwner ) const
 	{
 		return new HandleNorthEast( newOwner );
 	}
@@ -222,7 +222,7 @@ namespace glabels
 	///
 	/// HandleEast Constructor
 	///
-	HandleEast::HandleEast( LabelModelObject* owner )
+	HandleEast::HandleEast( ModelObject* owner )
 		: Handle( owner, E )
 	{
 		// empty
@@ -241,7 +241,7 @@ namespace glabels
 	///
 	/// HandleEast Clone
 	///
-	HandleEast* HandleEast::clone( LabelModelObject* newOwner ) const
+	HandleEast* HandleEast::clone( ModelObject* newOwner ) const
 	{
 		return new HandleEast( newOwner );
 	}
@@ -268,7 +268,7 @@ namespace glabels
 	///
 	/// HandleSouthEast Constructor
 	///
-	HandleSouthEast::HandleSouthEast( LabelModelObject* owner )
+	HandleSouthEast::HandleSouthEast( ModelObject* owner )
 		: Handle( owner, SE )
 	{
 		// empty
@@ -287,7 +287,7 @@ namespace glabels
 	///
 	/// HandleSouthEast Clone
 	///
-	HandleSouthEast* HandleSouthEast::clone( LabelModelObject* newOwner ) const
+	HandleSouthEast* HandleSouthEast::clone( ModelObject* newOwner ) const
 	{
 		return new HandleSouthEast( newOwner );
 	}
@@ -314,7 +314,7 @@ namespace glabels
 	///
 	/// HandleSouth Constructor
 	///
-	HandleSouth::HandleSouth( LabelModelObject* owner )
+	HandleSouth::HandleSouth( ModelObject* owner )
 		: Handle( owner, S )
 	{
 		// empty
@@ -333,7 +333,7 @@ namespace glabels
 	///
 	/// HandleSouth Clone
 	///
-	HandleSouth* HandleSouth::clone( LabelModelObject* newOwner ) const
+	HandleSouth* HandleSouth::clone( ModelObject* newOwner ) const
 	{
 		return new HandleSouth( newOwner );
 	}
@@ -360,7 +360,7 @@ namespace glabels
 	///
 	/// HandleSouthWest Constructor
 	///
-	HandleSouthWest::HandleSouthWest( LabelModelObject* owner )
+	HandleSouthWest::HandleSouthWest( ModelObject* owner )
 		: Handle( owner, SW )
 	{
 		// empty
@@ -379,7 +379,7 @@ namespace glabels
 	///
 	/// HandleSouthWest Clone
 	///
-	HandleSouthWest* HandleSouthWest::clone( LabelModelObject* newOwner ) const
+	HandleSouthWest* HandleSouthWest::clone( ModelObject* newOwner ) const
 	{
 		return new HandleSouthWest( newOwner );
 	}
@@ -406,7 +406,7 @@ namespace glabels
 	///
 	/// HandleWest Constructor
 	///
-	HandleWest::HandleWest( LabelModelObject* owner )
+	HandleWest::HandleWest( ModelObject* owner )
 		: Handle( owner, W )
 	{
 		// empty
@@ -425,7 +425,7 @@ namespace glabels
 	///
 	/// HandleWest Clone
 	///
-	HandleWest* HandleWest::clone( LabelModelObject* newOwner ) const
+	HandleWest* HandleWest::clone( ModelObject* newOwner ) const
 	{
 		return new HandleWest( newOwner );
 	}
@@ -452,7 +452,7 @@ namespace glabels
 	///
 	/// HandleNorthWest Constructor
 	///
-	HandleNorthWest::HandleNorthWest( LabelModelObject* owner )
+	HandleNorthWest::HandleNorthWest( ModelObject* owner )
 		: Handle( owner, NW )
 	{
 		// empty
@@ -470,7 +470,7 @@ namespace glabels
 	///
 	/// HandleNorthWest Clone
 	///
-	HandleNorthWest* HandleNorthWest::clone( LabelModelObject* newOwner ) const
+	HandleNorthWest* HandleNorthWest::clone( ModelObject* newOwner ) const
 	{
 		return new HandleNorthWest( newOwner );
 	}
@@ -497,7 +497,7 @@ namespace glabels
 	///
 	/// HandleP1 Constructor
 	///
-	HandleP1::HandleP1( LabelModelObject* owner )
+	HandleP1::HandleP1( ModelObject* owner )
 		: Handle( owner, P1 )
 	{
 		// empty
@@ -516,7 +516,7 @@ namespace glabels
 	///
 	/// HandleP1 Clone
 	///
-	HandleP1* HandleP1::clone( LabelModelObject* newOwner ) const
+	HandleP1* HandleP1::clone( ModelObject* newOwner ) const
 	{
 		return new HandleP1( newOwner );
 	}
@@ -543,7 +543,7 @@ namespace glabels
 	///
 	/// HandleP2 Constructor
 	///
-	HandleP2::HandleP2( LabelModelObject* owner )
+	HandleP2::HandleP2( ModelObject* owner )
 		: Handle( owner, P2 )
 	{
 		// empty
@@ -562,7 +562,7 @@ namespace glabels
 	///
 	/// HandleP2 Clone
 	///
-	HandleP2* HandleP2::clone( LabelModelObject* newOwner ) const
+	HandleP2* HandleP2::clone( ModelObject* newOwner ) const
 	{
 		return new HandleP2( newOwner );
 	}
@@ -585,4 +585,4 @@ namespace glabels
 		return pathAt( scale, mOwner->w(), mOwner->h() );
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/Handles.h b/model/Handles.h
similarity index 81%
rename from glabels/Handles.h
rename to model/Handles.h
index a1c9dd2..8e110c8 100644
--- a/glabels/Handles.h
+++ b/model/Handles.h
@@ -18,8 +18,8 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef Handles_h
-#define Handles_h
+#ifndef model_Handles_h
+#define model_Handles_h
 
 
 #include "Distance.h"
@@ -28,11 +28,11 @@
 #include <QPainterPath>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	// Forward References
-	class LabelModelObject;
+	class ModelObject;
 
 
 	///
@@ -51,7 +51,7 @@ namespace glabels
 		// Lifecycle Methods
 		////////////////////////////
 	protected:
-		Handle( LabelModelObject* owner, Location location );
+		Handle( ModelObject* owner, Location location );
 	public:
 		virtual ~Handle();
 
@@ -59,13 +59,13 @@ namespace glabels
 		////////////////////////////
 		// Duplication
 		////////////////////////////
-		virtual Handle* clone( LabelModelObject* newOwner ) const = 0;
+		virtual Handle* clone( ModelObject* newOwner ) const = 0;
 	
 		
 		////////////////////////////
 		// Attribue Methods
 		////////////////////////////
-		LabelModelObject* owner() const;
+		ModelObject* owner() const;
 		Location location() const;
 		
 
@@ -91,7 +91,7 @@ namespace glabels
 		// Protected Data
 		////////////////////////////
 	protected:
-		LabelModelObject* mOwner;
+		ModelObject* mOwner;
 		Location mLocation;
 
 	};
@@ -106,9 +106,9 @@ namespace glabels
 		// Lifecycle Methods
 		////////////////////////////
 	public:
-		HandleNorth( LabelModelObject* owner );
+		HandleNorth( ModelObject* owner );
 		~HandleNorth() override;
-		HandleNorth* clone( LabelModelObject* newOwner ) const override;
+		HandleNorth* clone( ModelObject* newOwner ) const override;
 
 
 		////////////////////////////
@@ -129,9 +129,9 @@ namespace glabels
 		// Lifecycle Methods
 		////////////////////////////
 	public:
-		HandleNorthEast( LabelModelObject* owner );
+		HandleNorthEast( ModelObject* owner );
 		~HandleNorthEast() override;
-		HandleNorthEast* clone( LabelModelObject* newOwner ) const override;
+		HandleNorthEast* clone( ModelObject* newOwner ) const override;
 
 
 		////////////////////////////
@@ -152,9 +152,9 @@ namespace glabels
 		// Lifecycle Methods
 		////////////////////////////
 	public:
-		HandleEast( LabelModelObject* owner );
+		HandleEast( ModelObject* owner );
 		~HandleEast() override;
-		HandleEast* clone( LabelModelObject* newOwner ) const override;
+		HandleEast* clone( ModelObject* newOwner ) const override;
 
 
 		////////////////////////////
@@ -175,9 +175,9 @@ namespace glabels
 		// Lifecycle Methods
 		////////////////////////////
 	public:
-		HandleSouthEast( LabelModelObject* owner );
+		HandleSouthEast( ModelObject* owner );
 		~HandleSouthEast() override;
-		HandleSouthEast* clone( LabelModelObject* newOwner ) const override;
+		HandleSouthEast* clone( ModelObject* newOwner ) const override;
 
 
 		////////////////////////////
@@ -198,9 +198,9 @@ namespace glabels
 		// Lifecycle Methods
 		////////////////////////////
 	public:
-		HandleSouth( LabelModelObject* owner );
+		HandleSouth( ModelObject* owner );
 		~HandleSouth() override;
-		HandleSouth* clone( LabelModelObject* newOwner ) const override;
+		HandleSouth* clone( ModelObject* newOwner ) const override;
 
 
 		////////////////////////////
@@ -221,9 +221,9 @@ namespace glabels
 		// Lifecycle Methods
 		////////////////////////////
 	public:
-		HandleSouthWest( LabelModelObject* owner );
+		HandleSouthWest( ModelObject* owner );
 		~HandleSouthWest() override;
-		HandleSouthWest* clone( LabelModelObject* newOwner ) const override;
+		HandleSouthWest* clone( ModelObject* newOwner ) const override;
 
 
 		////////////////////////////
@@ -244,9 +244,9 @@ namespace glabels
 		// Lifecycle Methods
 		////////////////////////////
 	public:
-		HandleWest( LabelModelObject* owner );
+		HandleWest( ModelObject* owner );
 		~HandleWest() override;
-		HandleWest* clone( LabelModelObject* newOwner ) const override;
+		HandleWest* clone( ModelObject* newOwner ) const override;
 
 
 		////////////////////////////
@@ -267,9 +267,9 @@ namespace glabels
 		// Lifecycle Methods
 		////////////////////////////
 	public:
-		HandleNorthWest( LabelModelObject* owner );
+		HandleNorthWest( ModelObject* owner );
 		~HandleNorthWest() override;
-		HandleNorthWest* clone( LabelModelObject* newOwner ) const override;
+		HandleNorthWest* clone( ModelObject* newOwner ) const override;
 
 
 		////////////////////////////
@@ -290,9 +290,9 @@ namespace glabels
 		// Lifecycle Methods
 		////////////////////////////
 	public:
-		HandleP1( LabelModelObject* owner );
+		HandleP1( ModelObject* owner );
 		~HandleP1() override;
-		HandleP1* clone( LabelModelObject* newOwner ) const override;
+		HandleP1* clone( ModelObject* newOwner ) const override;
 
 
 		////////////////////////////
@@ -313,13 +313,13 @@ namespace glabels
 		// Lifecycle Methods
 		////////////////////////////
 	public:
-		HandleP2( LabelModelObject* owner );
+		HandleP2( ModelObject* owner );
 		~HandleP2() override;
 
 		////////////////////////////
 		// Duplication
 		////////////////////////////
-		HandleP2* clone( LabelModelObject* newOwner ) const override;
+		HandleP2* clone( ModelObject* newOwner ) const override;
 
 
 		////////////////////////////
@@ -333,4 +333,4 @@ namespace glabels
 }
 
 
-#endif // Handles_h
+#endif // model_Handles_h
diff --git a/glabels/Layout.cpp b/model/Layout.cpp
similarity index 97%
rename from glabels/Layout.cpp
rename to model/Layout.cpp
index b219f88..f1a38e0 100644
--- a/glabels/Layout.cpp
+++ b/model/Layout.cpp
@@ -25,7 +25,7 @@
 #include <cmath>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	Layout::Layout( int             nx,
@@ -101,4 +101,4 @@ namespace glabels
 		return other;
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/Layout.h b/model/Layout.h
similarity index 93%
rename from glabels/Layout.h
rename to model/Layout.h
index aedcfee..8cf27de 100644
--- a/glabels/Layout.h
+++ b/model/Layout.h
@@ -18,14 +18,14 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_Layout_h
-#define glabels_Layout_h
+#ifndef model_Layout_h
+#define model_Layout_h
 
 
 #include "Distance.h"
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	class Layout
@@ -68,4 +68,4 @@ namespace glabels
 }
 
 
-#endif // glabels_Layout_h
+#endif // model_Layout_h
diff --git a/glabels/Markup.cpp b/model/Markup.cpp
similarity index 98%
rename from glabels/Markup.cpp
rename to model/Markup.cpp
index 76cabd1..5e79eac 100644
--- a/glabels/Markup.cpp
+++ b/model/Markup.cpp
@@ -21,7 +21,7 @@
 #include "Markup.h"
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	const QPainterPath& Markup::path() const
@@ -209,4 +209,4 @@ namespace glabels
 		return mR;
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/Markup.h b/model/Markup.h
similarity index 96%
rename from glabels/Markup.h
rename to model/Markup.h
index 2df99bc..f5fecaf 100644
--- a/glabels/Markup.h
+++ b/model/Markup.h
@@ -18,8 +18,8 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_Markup_h
-#define glabels_Markup_h
+#ifndef model_Markup_h
+#define model_Markup_h
 
 
 #include "Frame.h"
@@ -27,7 +27,7 @@
 #include <QPainterPath>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	class Markup
@@ -153,4 +153,4 @@ namespace glabels
 }
 
 
-#endif // glabels_Markup_h
+#endif // model_Markup_h
diff --git a/glabels/LabelModel.cpp b/model/Model.cpp
similarity index 70%
rename from glabels/LabelModel.cpp
rename to model/Model.cpp
index d1bd9f7..c695b64 100644
--- a/glabels/LabelModel.cpp
+++ b/model/Model.cpp
@@ -1,4 +1,4 @@
-/*  LabelModel.cpp
+/*  Model.cpp
  *
  *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
  *
@@ -18,17 +18,17 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "LabelModel.h"
+#include "Model.h"
 
-#include "LabelModelObject.h"
-#include "LabelModelTextObject.h"
-#include "LabelModelImageObject.h"
+#include "ModelObject.h"
+#include "ModelTextObject.h"
+#include "ModelImageObject.h"
 #include "Region.h"
 #include "Size.h"
 #include "XmlLabelCreator.h"
 #include "XmlLabelParser.h"
 
-#include "Merge/None.h"
+#include "merge/None.h"
 
 #include <QApplication>
 #include <QClipboard>
@@ -37,7 +37,7 @@
 #include <QtDebug>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	//
@@ -52,7 +52,7 @@ namespace glabels
 	///
 	/// Default constructor.
 	///
-	LabelModel::LabelModel() : mUntitledInstance(0), mModified(true), mTmplate(nullptr), mRotate(false)
+	Model::Model() : mUntitledInstance(0), mModified(true), mTmplate(nullptr), mRotate(false)
 	{
 		mMerge = new merge::None();
 	}
@@ -61,9 +61,9 @@ namespace glabels
 	///
 	/// Save model state
 	///
-	LabelModel* LabelModel::save() const
+	Model* Model::save() const
 	{
-		LabelModel* savedModel = new LabelModel;
+		Model* savedModel = new Model;
 		savedModel->restore( this );
 
 		return savedModel;
@@ -73,10 +73,10 @@ namespace glabels
 	///
 	/// Restore model state
 	///
-	void LabelModel::restore( const LabelModel *savedModel )
+	void Model::restore( const Model *savedModel )
 	{
 		// Clear current object list
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			delete object;
 		}
@@ -91,9 +91,9 @@ namespace glabels
 		mFrame            = savedModel->mFrame;
 		mRotate           = savedModel->mRotate;
 
-		foreach ( LabelModelObject* savedObject, savedModel->mObjectList )
+		foreach ( ModelObject* savedObject, savedModel->mObjectList )
 		{
-			LabelModelObject* object = savedObject->clone();
+			ModelObject* object = savedObject->clone();
 		
 			object->setParent( this );
 			mObjectList << object;
@@ -120,7 +120,7 @@ namespace glabels
 	///
 	/// Is model modified?
 	///
-	bool LabelModel::isModified() const
+	bool Model::isModified() const
 	{
 		return mModified;
 	}
@@ -129,7 +129,7 @@ namespace glabels
 	///
 	/// Get filename
 	///
-	const QString& LabelModel::fileName() const
+	const QString& Model::fileName() const
 	{
 		return mFileName;
 	}
@@ -138,7 +138,7 @@ namespace glabels
 	///
 	/// Set filename
 	///
-	void LabelModel::setFileName( const QString &fileName )
+	void Model::setFileName( const QString &fileName )
 	{
 		if ( mFileName != fileName )
 		{
@@ -151,7 +151,7 @@ namespace glabels
 	///
 	/// Get compression level
 	///
-	int LabelModel::compressionLevel() const
+	int Model::compressionLevel() const
 	{
 		return mCompressionLevel;
 	}
@@ -160,7 +160,7 @@ namespace glabels
 	///
 	/// Set compression level
 	///
-	void LabelModel::setCompressionLevel( int compressionLevel )
+	void Model::setCompressionLevel( int compressionLevel )
 	{
 		mCompressionLevel = compressionLevel;
 	}
@@ -169,7 +169,7 @@ namespace glabels
 	///
 	/// Get template
 	///
-	const Template* LabelModel::tmplate() const
+	const Template* Model::tmplate() const
 	{
 		return mTmplate;
 	}
@@ -178,7 +178,7 @@ namespace glabels
 	///
 	/// Get frame
 	///
-	const Frame* LabelModel::frame() const
+	const Frame* Model::frame() const
 	{
 		return mFrame;
 	}
@@ -187,7 +187,7 @@ namespace glabels
 	///
 	/// Set template
 	///
-	void LabelModel::setTmplate( const Template* tmplate )
+	void Model::setTmplate( const Template* tmplate )
 	{
 		if (mTmplate != tmplate)
 		{
@@ -207,7 +207,7 @@ namespace glabels
 	///
 	/// Get rotation
 	///
-	bool LabelModel::rotate() const
+	bool Model::rotate() const
 	{
 		return mRotate;
 	}
@@ -216,7 +216,7 @@ namespace glabels
 	///
 	/// Set rotation
 	///
-	void LabelModel::setRotate( bool rotate )
+	void Model::setRotate( bool rotate )
 	{
 		if (mRotate != rotate)
 		{
@@ -233,7 +233,7 @@ namespace glabels
 	///
 	/// Get width
 	///
-	Distance LabelModel::w() const
+	Distance Model::w() const
 	{
 		return mRotate ? mFrame->h() : mFrame->w();
 	}
@@ -242,7 +242,7 @@ namespace glabels
 	///
 	/// Get height
 	///
-	Distance LabelModel::h() const
+	Distance Model::h() const
 	{
 		return mRotate ? mFrame->w() : mFrame->h();
 	}
@@ -251,7 +251,7 @@ namespace glabels
 	///
 	/// Get object list
 	///
-	const QList<LabelModelObject*>& LabelModel::objectList() const
+	const QList<ModelObject*>& Model::objectList() const
 	{
 		return mObjectList;
 	}
@@ -260,7 +260,7 @@ namespace glabels
 	///
 	/// Get short name.
 	///
-	QString LabelModel::shortName()
+	QString Model::shortName()
 	{
 		static int untitledCount = 0;
 		
@@ -286,7 +286,7 @@ namespace glabels
 	///
 	/// Get merge object
 	///
-	merge::Merge* LabelModel::merge() const
+	merge::Merge* Model::merge() const
 	{
 		return mMerge;
 	}
@@ -295,7 +295,7 @@ namespace glabels
 	///
 	/// Set merge object
 	///
-	void LabelModel::setMerge( merge::Merge* merge )
+	void Model::setMerge( merge::Merge* merge )
 	{
 		if ( merge != mMerge )
 		{
@@ -317,7 +317,7 @@ namespace glabels
 	///
 	/// Set modified status
 	///
-	void LabelModel::setModified()
+	void Model::setModified()
 	{
 		mModified = true;
 		emit modifiedChanged();
@@ -327,7 +327,7 @@ namespace glabels
 	///
 	/// Clear modified status
 	///
-	void LabelModel::clearModified()
+	void Model::clearModified()
 	{
 		mModified = false;
 		emit modifiedChanged();
@@ -337,7 +337,7 @@ namespace glabels
 	///
 	/// Add object.
 	///
-	void LabelModel::addObject( LabelModelObject* object )
+	void Model::addObject( ModelObject* object )
 	{
 		object->setParent( this );
 		mObjectList << object;
@@ -354,7 +354,7 @@ namespace glabels
 	///
 	/// Delete Object
 	///
-	void LabelModel::deleteObject( LabelModelObject* object )
+	void Model::deleteObject( ModelObject* object )
 	{
 		object->unselect();
 		mObjectList.removeOne( object );
@@ -372,16 +372,16 @@ namespace glabels
 	///
 	/// Object at x,y
 	///
-	LabelModelObject* LabelModel::objectAt( double          scale,
-	                                        const Distance& x,
-	                                        const Distance& y ) const
+	ModelObject* Model::objectAt( double          scale,
+	                              const Distance& x,
+	                              const Distance& y ) const
 	{
 		/* Search object list in reverse order.  I.e. from top to bottom. */
-		QList<LabelModelObject*>::const_iterator it = mObjectList.end();
+		QList<ModelObject*>::const_iterator it = mObjectList.end();
 		while ( it != mObjectList.begin() )
 		{
 			it--;
-			LabelModelObject* object = *it;
+			ModelObject* object = *it;
 			if ( object->isLocatedAt( scale, x, y ) )
 			{
 				return object;
@@ -395,11 +395,11 @@ namespace glabels
 	///
 	/// Handle at x,y
 	///
-	Handle* LabelModel::handleAt( double          scale,
-	                              const Distance& x,
-	                              const Distance& y ) const
+	Handle* Model::handleAt( double          scale,
+	                         const Distance& x,
+	                         const Distance& y ) const
 	{
-		foreach( LabelModelObject* object, mObjectList )
+		foreach( ModelObject* object, mObjectList )
 		{
 			Handle* handle = object->handleAt( scale, x, y );
 			if ( handle )
@@ -415,7 +415,7 @@ namespace glabels
 	///
 	/// Object Changed Slot
 	///
-	void LabelModel::onObjectChanged()
+	void Model::onObjectChanged()
 	{
 		setModified();
 		emit changed();
@@ -425,7 +425,7 @@ namespace glabels
 	///
 	/// Object Moved Slot
 	///
-	void LabelModel::onObjectMoved()
+	void Model::onObjectMoved()
 	{
 		setModified();
 		emit changed();
@@ -435,7 +435,7 @@ namespace glabels
 	///
 	/// Merge Source Changed Slot
 	///
-	void LabelModel::onMergeSourceChanged()
+	void Model::onMergeSourceChanged()
 	{
 		setModified();
 		emit changed();
@@ -446,7 +446,7 @@ namespace glabels
 	///
 	/// Merge Selection Changed Slot
 	///
-	void LabelModel::onMergeSelectionChanged()
+	void Model::onMergeSelectionChanged()
 	{
 		emit changed();
 		emit mergeSelectionChanged();
@@ -456,7 +456,7 @@ namespace glabels
 	///
 	/// Select Object
 	///
-	void LabelModel::selectObject( LabelModelObject* object )
+	void Model::selectObject( ModelObject* object )
 	{
 		object->select();
 
@@ -467,7 +467,7 @@ namespace glabels
 	///
 	/// Unselect Object
 	///
-	void LabelModel::unselectObject( LabelModelObject* object )
+	void Model::unselectObject( ModelObject* object )
 	{
 		object->unselect();
 
@@ -478,9 +478,9 @@ namespace glabels
 	///
 	/// Select All Objects
 	///
-	void LabelModel::selectAll()
+	void Model::selectAll()
 	{
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			object->select();
 		}
@@ -492,9 +492,9 @@ namespace glabels
 	///
 	/// Unselect All Objects
 	///
-	void LabelModel::unselectAll()
+	void Model::unselectAll()
 	{
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			object->unselect();
 		}
@@ -506,14 +506,14 @@ namespace glabels
 	///
 	/// Select Region
 	///
-	void LabelModel::selectRegion( const Region &region )
+	void Model::selectRegion( const Region &region )
 	{
 		Distance rX1 = min( region.x1(), region.x2() );
 		Distance rY1 = min( region.y1(), region.y2() );
 		Distance rX2 = max( region.x1(), region.x2() );
 		Distance rY2 = max( region.y1(), region.y2() );
 
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			Region objectExtent = object->getExtent();
 
@@ -533,9 +533,9 @@ namespace glabels
 	///
 	/// Is Selection Empty?
 	///
-	bool LabelModel::isSelectionEmpty()
+	bool Model::isSelectionEmpty()
 	{
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			if ( object->isSelected() )
 			{
@@ -550,11 +550,11 @@ namespace glabels
 	///
 	/// Is Selection Atomic?
 	///
-	bool LabelModel::isSelectionAtomic()
+	bool Model::isSelectionAtomic()
 	{
 		int nSelected = 0;
 
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			if ( object->isSelected() )
 			{
@@ -573,11 +573,11 @@ namespace glabels
 	///
 	/// Get List of Selected Objects
 	///
-	QList<LabelModelObject*> LabelModel::getSelection()
+	QList<ModelObject*> Model::getSelection()
 	{
-		QList<LabelModelObject*> selectedList;
+		QList<ModelObject*> selectedList;
 
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			if ( object->isSelected() )
 			{
@@ -592,9 +592,9 @@ namespace glabels
 	///
 	/// Get First Object in Selection List
 	///
-	LabelModelObject* LabelModel::getFirstSelectedObject()
+	ModelObject* Model::getFirstSelectedObject()
 	{
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			if ( object->isSelected() )
 			{
@@ -609,9 +609,9 @@ namespace glabels
 	///
 	/// Can Any Objects in Selection Accept Text Properties?
 	///
-	bool LabelModel::canSelectionText()
+	bool Model::canSelectionText()
 	{
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			if ( object->isSelected() && object->canText() )
 			{
@@ -626,9 +626,9 @@ namespace glabels
 	///
 	/// Can Any Objects in Selection Accept Fill Property?
 	///
-	bool LabelModel::canSelectionFill()
+	bool Model::canSelectionFill()
 	{
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			if ( object->isSelected() && object->canFill() )
 			{
@@ -643,9 +643,9 @@ namespace glabels
 	///
 	/// Can Any Objects in Selection Accept Line Color Property?
 	///
-	bool LabelModel::canSelectionLineColor()
+	bool Model::canSelectionLineColor()
 	{
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			if ( object->isSelected() && object->canLineColor() )
 			{
@@ -660,9 +660,9 @@ namespace glabels
 	///
 	/// Can Any Objects in Selection Accept Line Width Property?
 	///
-	bool LabelModel::canSelectionLineWidth()
+	bool Model::canSelectionLineWidth()
 	{
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			if ( object->isSelected() && object->canLineWidth() )
 			{
@@ -677,11 +677,11 @@ namespace glabels
 	///
 	/// Delete Selected Objects
 	///
-	void LabelModel::deleteSelection()
+	void Model::deleteSelection()
 	{
-		QList<LabelModelObject*> selectedList = getSelection();
+		QList<ModelObject*> selectedList = getSelection();
 
-		foreach ( LabelModelObject* object, selectedList )
+		foreach ( ModelObject* object, selectedList )
 		{
 			deleteObject( object );
 		}
@@ -696,17 +696,17 @@ namespace glabels
 	///
 	/// Raise Selected Objects To Top
 	///
-	void LabelModel::raiseSelectionToTop()
+	void Model::raiseSelectionToTop()
 	{
-		QList<LabelModelObject*> selectedList = getSelection();
+		QList<ModelObject*> selectedList = getSelection();
 
-		foreach ( LabelModelObject* object, selectedList )
+		foreach ( ModelObject* object, selectedList )
 		{
 			mObjectList.removeOne( object );
 		}
 
 		// Move to end of list, representing top most object.
-		foreach ( LabelModelObject* object, selectedList )
+		foreach ( ModelObject* object, selectedList )
 		{
 			mObjectList.push_back( object );
 		}
@@ -720,17 +720,17 @@ namespace glabels
 	///
 	/// Lower Selected Objects To Bottom
 	///
-	void LabelModel::lowerSelectionToBottom()
+	void Model::lowerSelectionToBottom()
 	{
-		QList<LabelModelObject*> selectedList = getSelection();
+		QList<ModelObject*> selectedList = getSelection();
 
-		foreach ( LabelModelObject* object, selectedList )
+		foreach ( ModelObject* object, selectedList )
 		{
 			mObjectList.removeOne( object );
 		}
 
 		// Move to front of list, representing bottom most object.
-		foreach ( LabelModelObject* object, selectedList )
+		foreach ( ModelObject* object, selectedList )
 		{
 			mObjectList.push_front( object );
 		}
@@ -744,9 +744,9 @@ namespace glabels
 	///
 	/// Rotate Selected Objects
 	///
-	void LabelModel::rotateSelection( double thetaDegs )
+	void Model::rotateSelection( double thetaDegs )
 	{
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			if ( object->isSelected() )
 			{
@@ -763,7 +763,7 @@ namespace glabels
 	///
 	/// Rotate Selected Objects Left 90 degrees
 	///
-	void LabelModel::rotateSelectionLeft()
+	void Model::rotateSelectionLeft()
 	{
 		rotateSelection( -90.0 );
 	}
@@ -772,7 +772,7 @@ namespace glabels
 	///
 	/// Rotate Selected Objects Right 90 degrees
 	///
-	void LabelModel::rotateSelectionRight()
+	void Model::rotateSelectionRight()
 	{
 		rotateSelection( 90.0 );
 	}
@@ -781,9 +781,9 @@ namespace glabels
 	///
 	/// Flip Selected Objects Horizontally
 	///
-	void LabelModel::flipSelectionHoriz()
+	void Model::flipSelectionHoriz()
 	{
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			if ( object->isSelected() )
 			{
@@ -800,9 +800,9 @@ namespace glabels
 	///
 	/// Flip Selected Objects Vertically
 	///
-	void LabelModel::flipSelectionVert()
+	void Model::flipSelectionVert()
 	{
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			if ( object->isSelected() )
 			{
@@ -819,25 +819,25 @@ namespace glabels
 	///
 	/// Align Selected Objects To Their Left Edges
 	///
-	void LabelModel::alignSelectionLeft()
+	void Model::alignSelectionLeft()
 	{
 		if ( isSelectionEmpty() || isSelectionAtomic() )
 		{
 			return;
 		}
 
-		QList<LabelModelObject*> selectedList = getSelection();
+		QList<ModelObject*> selectedList = getSelection();
 
 		// Find left-most edge.
 		Distance x1_min = 7200; // Start with a very large value: 7200pts = 100in
-		foreach ( LabelModelObject* object, selectedList )
+		foreach ( ModelObject* object, selectedList )
 		{
 			Region r = object->getExtent();
 			if ( r.x1() < x1_min ) x1_min = r.x1();
 		}
 
 		// Now adjust the object positions to line up the left edges at left-most edge.
-		foreach ( LabelModelObject* object, selectedList )
+		foreach ( ModelObject* object, selectedList )
 		{
 			Region r = object->getExtent();
 			Distance dx = x1_min - r.x1();
@@ -853,25 +853,25 @@ namespace glabels
 	///
 	/// Align Selected Objects To Their Right Edges
 	///
-	void LabelModel::alignSelectionRight()
+	void Model::alignSelectionRight()
 	{
 		if ( isSelectionEmpty() || isSelectionAtomic() )
 		{
 			return;
 		}
 
-		QList<LabelModelObject*> selectedList = getSelection();
+		QList<ModelObject*> selectedList = getSelection();
 
 		// Find right-most edge.
 		Distance x1_max = -7200; // Start with a very large negative value: 7200pts = 100in
-		foreach ( LabelModelObject* object, selectedList )
+		foreach ( ModelObject* object, selectedList )
 		{
 			Region r = object->getExtent();
 			if ( r.x1() > x1_max ) x1_max = r.x1();
 		}
 
 		// Now adjust the object positions to line up the right edges at right-most edge.
-		foreach ( LabelModelObject* object, selectedList )
+		foreach ( ModelObject* object, selectedList )
 		{
 			Region r = object->getExtent();
 			Distance dx = x1_max - r.x1();
@@ -887,19 +887,19 @@ namespace glabels
 	///
 	/// Align Selected Objects To Their Horizontal Centers
 	///
-	void LabelModel::alignSelectionHCenter()
+	void Model::alignSelectionHCenter()
 	{
 		if ( isSelectionEmpty() || isSelectionAtomic() )
 		{
 			return;
 		}
 
-		QList<LabelModelObject*> selectedList = getSelection();
+		QList<ModelObject*> selectedList = getSelection();
 
 		// Find average center of objects.
 		Distance xsum = 0;
 		int n = 0;
-		foreach ( LabelModelObject* object, selectedList )
+		foreach ( ModelObject* object, selectedList )
 		{
 			Region r = object->getExtent();
 			xsum += (r.x1() + r.x2()) / 2.0;
@@ -910,7 +910,7 @@ namespace glabels
 		// Find object closest to average center of objects.
 		Distance xcenter = 7200; // Start with very large value.
 		Distance dxmin = fabs( xavg - xcenter );
-		foreach ( LabelModelObject* object, selectedList )
+		foreach ( ModelObject* object, selectedList )
 		{
 			Region r = object->getExtent();
 			Distance dx = fabs( xavg - (r.x1() + r.x2())/2.0 );
@@ -922,7 +922,7 @@ namespace glabels
 		}
 
 		// Now adjust the object positions to line up with the center of this object.
-		foreach ( LabelModelObject* object, selectedList )
+		foreach ( ModelObject* object, selectedList )
 		{
 			Region r = object->getExtent();
 			Distance dx = xcenter - (r.x1() + r.x2())/2.0;
@@ -938,25 +938,25 @@ namespace glabels
 	///
 	/// Align Selected Objects To Their Top Edges
 	///
-	void LabelModel::alignSelectionTop()
+	void Model::alignSelectionTop()
 	{
 		if ( isSelectionEmpty() || isSelectionAtomic() )
 		{
 			return;
 		}
 
-		QList<LabelModelObject*> selectedList = getSelection();
+		QList<ModelObject*> selectedList = getSelection();
 
 		// Find top-most edge.
 		Distance y1_min = 7200; // Start with a very large value: 7200pts = 100in
-		foreach ( LabelModelObject* object, selectedList )
+		foreach ( ModelObject* object, selectedList )
 		{
 			Region r = object->getExtent();
 			if ( r.y1() < y1_min ) y1_min = r.y1();
 		}
 
 		// Now adjust the object positions to line up the top edges at top-most edge.
-		foreach ( LabelModelObject* object, selectedList )
+		foreach ( ModelObject* object, selectedList )
 		{
 			Region r = object->getExtent();
 			Distance dy = y1_min - r.y1();
@@ -972,25 +972,25 @@ namespace glabels
 	///
 	/// Align Selected Objects To Their Bottom Edges
 	///
-	void LabelModel::alignSelectionBottom()
+	void Model::alignSelectionBottom()
 	{
 		if ( isSelectionEmpty() || isSelectionAtomic() )
 		{
 			return;
 		}
 
-		QList<LabelModelObject*> selectedList = getSelection();
+		QList<ModelObject*> selectedList = getSelection();
 
 		// Find bottom-most edge.
 		Distance y1_max = -7200; // Start with a very large negative value: 7200pts = 100in
-		foreach ( LabelModelObject* object, selectedList )
+		foreach ( ModelObject* object, selectedList )
 		{
 			Region r = object->getExtent();
 			if ( r.y1() > y1_max ) y1_max = r.y1();
 		}
 
 		// Now adjust the object positions to line up the bottom edges at bottom-most edge.
-		foreach ( LabelModelObject* object, selectedList )
+		foreach ( ModelObject* object, selectedList )
 		{
 			Region r = object->getExtent();
 			Distance dy = y1_max - r.y1();
@@ -1006,19 +1006,19 @@ namespace glabels
 	///
 	/// Align Selected Objects To Their Vertical Centers Edges
 	///
-	void LabelModel::alignSelectionVCenter()
+	void Model::alignSelectionVCenter()
 	{
 		if ( isSelectionEmpty() || isSelectionAtomic() )
 		{
 			return;
 		}
 
-		QList<LabelModelObject*> selectedList = getSelection();
+		QList<ModelObject*> selectedList = getSelection();
 
 		// Find average center of objects.
 		Distance ysum = 0;
 		int n = 0;
-		foreach ( LabelModelObject* object, selectedList )
+		foreach ( ModelObject* object, selectedList )
 		{
 			Region r = object->getExtent();
 			ysum += (r.y1() + r.y2()) / 2.0;
@@ -1029,7 +1029,7 @@ namespace glabels
 		// Find object closest to average center of objects.
 		Distance ycenter = 7200; // Start with very large value.
 		Distance dymin = fabs( yavg - ycenter );
-		foreach ( LabelModelObject* object, selectedList )
+		foreach ( ModelObject* object, selectedList )
 		{
 			Region r = object->getExtent();
 			Distance dy = fabs( yavg - (r.y1() + r.y2())/2.0 );
@@ -1041,7 +1041,7 @@ namespace glabels
 		}
 
 		// Now adjust the object positions to line up with the center of this object.
-		foreach ( LabelModelObject* object, selectedList )
+		foreach ( ModelObject* object, selectedList )
 		{
 			Region r = object->getExtent();
 			Distance dy = ycenter - (r.y1() + r.y2())/2.0;
@@ -1057,11 +1057,11 @@ namespace glabels
 	///
 	/// Align Selected Objects To Center Of Label Horizontally
 	///
-	void LabelModel::centerSelectionHoriz()
+	void Model::centerSelectionHoriz()
 	{
 		Distance xLabelCenter = w() / 2.0;
 
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			if ( object->isSelected() )
 			{
@@ -1081,11 +1081,11 @@ namespace glabels
 	///
 	/// Align Selected Objects To Center Of Label Vertically
 	///
-	void LabelModel::centerSelectionVert()
+	void Model::centerSelectionVert()
 	{
 		Distance yLabelCenter = h() / 2.0;
 
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			if ( object->isSelected() )
 			{
@@ -1105,9 +1105,9 @@ namespace glabels
 	///
 	/// Move Selected Objects By dx,dy
 	///
-	void LabelModel::moveSelection( const Distance& dx, const Distance& dy )
+	void Model::moveSelection( const Distance& dx, const Distance& dy )
 	{
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			if ( object->isSelected() )
 			{
@@ -1124,9 +1124,9 @@ namespace glabels
 	///
 	/// Set Font Family Of Selected Objects
 	///
-	void LabelModel::setSelectionFontFamily( const QString &fontFamily )
+	void Model::setSelectionFontFamily( const QString &fontFamily )
 	{
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			if ( object->isSelected() )
 			{
@@ -1143,9 +1143,9 @@ namespace glabels
 	///
 	/// Set Font Size Of Selected Objects
 	///
-	void LabelModel::setSelectionFontSize( double fontSize )
+	void Model::setSelectionFontSize( double fontSize )
 	{
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			if ( object->isSelected() )
 			{
@@ -1162,9 +1162,9 @@ namespace glabels
 	///
 	/// Set Font Weight Of Selected Objects
 	///
-	void LabelModel::setSelectionFontWeight( QFont::Weight fontWeight )
+	void Model::setSelectionFontWeight( QFont::Weight fontWeight )
 	{
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			if ( object->isSelected() )
 			{
@@ -1181,9 +1181,9 @@ namespace glabels
 	///
 	/// Set Font Italic Flag Of Selected Objects
 	///
-	void LabelModel::setSelectionFontItalicFlag( bool fontItalicFlag )
+	void Model::setSelectionFontItalicFlag( bool fontItalicFlag )
 	{
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			if ( object->isSelected() )
 			{
@@ -1200,9 +1200,9 @@ namespace glabels
 	///
 	/// Set Text Horizontal Alignment Of Selected Objects
 	///
-	void LabelModel::setSelectionTextHAlign( Qt::Alignment textHAlign )
+	void Model::setSelectionTextHAlign( Qt::Alignment textHAlign )
 	{
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			if ( object->isSelected() )
 			{
@@ -1219,9 +1219,9 @@ namespace glabels
 	///
 	/// Set Text Vertical Alignment Of Selected Objects
 	///
-	void LabelModel::setSelectionTextVAlign( Qt::Alignment textVAlign )
+	void Model::setSelectionTextVAlign( Qt::Alignment textVAlign )
 	{
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			if ( object->isSelected() )
 			{
@@ -1238,9 +1238,9 @@ namespace glabels
 	///
 	/// Set Text Line Spacing Of Selected Objects
 	///
-	void LabelModel::setSelectionTextLineSpacing( double textLineSpacing )
+	void Model::setSelectionTextLineSpacing( double textLineSpacing )
 	{
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			if ( object->isSelected() )
 			{
@@ -1257,9 +1257,9 @@ namespace glabels
 	///
 	/// Set Text Color Node Of Selected Objects
 	///
-	void LabelModel::setSelectionTextColorNode( ColorNode textColorNode )
+	void Model::setSelectionTextColorNode( ColorNode textColorNode )
 	{
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			if ( object->isSelected() )
 			{
@@ -1276,9 +1276,9 @@ namespace glabels
 	///
 	/// Set Line Width Of Selected Objects
 	///
-	void LabelModel::setSelectionLineWidth( const Distance& lineWidth )
+	void Model::setSelectionLineWidth( const Distance& lineWidth )
 	{
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			if ( object->isSelected() )
 			{
@@ -1295,9 +1295,9 @@ namespace glabels
 	///
 	/// Set Line Color Node Of Selected Objects
 	///
-	void LabelModel::setSelectionLineColorNode( ColorNode lineColorNode )
+	void Model::setSelectionLineColorNode( ColorNode lineColorNode )
 	{
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			if ( object->isSelected() )
 			{
@@ -1314,9 +1314,9 @@ namespace glabels
 	///
 	/// Set Fill Color Node Of Selected Objects
 	///
-	void LabelModel::setSelectionFillColorNode( ColorNode fillColorNode )
+	void Model::setSelectionFillColorNode( ColorNode fillColorNode )
 	{
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			if ( object->isSelected() )
 			{
@@ -1333,7 +1333,7 @@ namespace glabels
 	///
 	/// Copy selection to clipboard
 	///
-	void LabelModel::copySelection()
+	void Model::copySelection()
 	{
 		if ( !isSelectionEmpty() )
 		{
@@ -1353,7 +1353,7 @@ namespace glabels
 	///
 	/// Cut selection to clipboard
 	///
-	void LabelModel::cutSelection()
+	void Model::cutSelection()
 	{
 		copySelection();
 		deleteSelection();
@@ -1363,7 +1363,7 @@ namespace glabels
 	///
 	/// Can we paste?
 	///
-	bool LabelModel::canPaste()
+	bool Model::canPaste()
 	{
 		const QClipboard *clipboard = QApplication::clipboard();
 		const QMimeData *mimeData = clipboard->mimeData();
@@ -1387,7 +1387,7 @@ namespace glabels
 	///
 	/// Paste from clipboard
 	///
-	void LabelModel::paste()
+	void Model::paste()
 	{
 		const QClipboard *clipboard = QApplication::clipboard();
 		const QMimeData *mimeData = clipboard->mimeData();
@@ -1396,10 +1396,10 @@ namespace glabels
 		{
 			// Native objects
 			QByteArray buffer = mimeData->data( MIME_TYPE );
-			QList <LabelModelObject*> objects = XmlLabelParser::deserializeObjects( buffer );
+			QList <ModelObject*> objects = XmlLabelParser::deserializeObjects( buffer );
 
 			unselectAll();
-			foreach ( LabelModelObject* object, objects )
+			foreach ( ModelObject* object, objects )
 			{
 				addObject( object );
 				selectObject( object );
@@ -1408,7 +1408,7 @@ namespace glabels
 		else if ( mimeData->hasImage() )
 		{
 			// Create object from clipboard image
-			LabelModelImageObject* object = new LabelModelImageObject();
+			ModelImageObject* object = new ModelImageObject();
 			object->setImage( qvariant_cast<QImage>(mimeData->imageData()) );
 			object->setSize( object->naturalSize() );
 			object->setPosition( (w()-object->w())/2.0, (h()-object->h())/2.0 );
@@ -1419,7 +1419,7 @@ namespace glabels
 		else if ( mimeData->hasText() )
 		{
 			// Create object from clipboard text
-			LabelModelTextObject* object = new LabelModelTextObject();
+			ModelTextObject* object = new ModelTextObject();
 			object->setText( mimeData->text() );
 			object->setSize( object->naturalSize() );
 			object->setPosition( (w()-object->w())/2.0, (h()-object->h())/2.0 );
@@ -1433,12 +1433,12 @@ namespace glabels
 	///
 	/// Draw label objects
 	///
-	void LabelModel::draw( QPainter* painter, bool inEditor, merge::Record* record ) const
+	void Model::draw( QPainter* painter, bool inEditor, merge::Record* record ) const
 	{
-		foreach ( LabelModelObject* object, mObjectList )
+		foreach ( ModelObject* object, mObjectList )
 		{
 			object->draw( painter, inEditor, record );
 		}
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/LabelModel.h b/model/Model.h
similarity index 85%
rename from glabels/LabelModel.h
rename to model/Model.h
index 5cdeca9..3eb3039 100644
--- a/glabels/LabelModel.h
+++ b/model/Model.h
@@ -1,4 +1,4 @@
-/*  LabelModel.h
+/*  Model.h
  *
  *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
  *
@@ -18,34 +18,34 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LabelModel_h
-#define LabelModel_h
+#ifndef model_Model_h
+#define model_Model_h
 
 
 #include "Settings.h"
 #include "Template.h"
 
-#include "Merge/Merge.h"
-#include "Merge/Record.h"
+#include "merge/Merge.h"
+#include "merge/Record.h"
 
 #include <QList>
 #include <QObject>
 #include <QPainter>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	// Forward References
 	class ColorNode;
 	class Handle;
-	class LabelModelObject;
+	class ModelObject;
 	class Region;
 
 	///
-	/// LabelModel
+	/// Model
 	///
-	class LabelModel : public QObject
+	class Model : public QObject
 	{
 		Q_OBJECT
 
@@ -54,15 +54,15 @@ namespace glabels
 		// Lifecycle
 		/////////////////////////////////
 	public:
-		LabelModel();
-		~LabelModel() override {}
+		Model();
+		~Model() override {}
 
 	
 		/////////////////////////////////
 		// Save/restore model state
 		/////////////////////////////////
-		LabelModel* save() const;
-		void restore( const LabelModel *savedModel );
+		Model* save() const;
+		void restore( const Model *savedModel );
 	
 
 		/////////////////////////////////
@@ -104,7 +104,7 @@ namespace glabels
 		Distance w() const;
 		Distance h() const;
 
-		const QList<LabelModelObject*>& objectList() const;
+		const QList<ModelObject*>& objectList() const;
 
 		merge::Merge* merge() const;
 		void setMerge( merge::Merge* merge );
@@ -114,12 +114,12 @@ namespace glabels
 		// Manage objects
 		/////////////////////////////////
 	public:
-		void addObject( LabelModelObject* object );
-		void deleteObject( LabelModelObject* object );
+		void addObject( ModelObject* object );
+		void deleteObject( ModelObject* object );
 
-		LabelModelObject* objectAt( double          scale,
-		                            const Distance& x,
-		                            const Distance& y ) const;
+		ModelObject* objectAt( double          scale,
+		                       const Distance& x,
+		                       const Distance& y ) const;
 		
 		Handle* handleAt( double          scale,
 		                  const Distance& x,
@@ -130,8 +130,8 @@ namespace glabels
 		// Manipulate selection
 		/////////////////////////////////
 	public:
-		void selectObject( LabelModelObject* object );
-		void unselectObject( LabelModelObject* object );
+		void selectObject( ModelObject* object );
+		void unselectObject( ModelObject* object );
 		void selectAll();
 		void unselectAll();
 		void selectRegion( const Region& region );
@@ -143,8 +143,8 @@ namespace glabels
 		// Get selected objects
 		/////////////////////////////////
 	public:
-		QList<LabelModelObject*> getSelection();
-		LabelModelObject* getFirstSelectedObject();
+		QList<ModelObject*> getSelection();
+		ModelObject* getFirstSelectedObject();
 
 
 		/////////////////////////////////
@@ -228,7 +228,7 @@ namespace glabels
 		const Frame*              mFrame;
 		bool                      mRotate;
 
-		QList<LabelModelObject*>  mObjectList;
+		QList<ModelObject*>  mObjectList;
 
 		merge::Merge*             mMerge;
 	};
@@ -236,4 +236,4 @@ namespace glabels
 }
 
 
-#endif // LabelModel_h
+#endif // model_Model_h
diff --git a/glabels/LabelModelBarcodeObject.cpp b/model/ModelBarcodeObject.cpp
similarity index 74%
rename from glabels/LabelModelBarcodeObject.cpp
rename to model/ModelBarcodeObject.cpp
index 753d783..2bac922 100644
--- a/glabels/LabelModelBarcodeObject.cpp
+++ b/model/ModelBarcodeObject.cpp
@@ -1,4 +1,4 @@
-/*  LabelModelBarcodeObject.cpp
+/*  ModelBarcodeObject.cpp
  *
  *  Copyright (C) 2017  Jim Evins <evins@snaught.com>
  *
@@ -18,11 +18,12 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "LabelModelBarcodeObject.h"
+#include "ModelBarcodeObject.h"
 
-#include "BarcodeBackends.h"
 #include "Size.h"
 
+#include "barcode/Backends.h"
+
 #include "glbarcode/Factory.h"
 #include "glbarcode/QtRenderer.h"
 
@@ -34,7 +35,7 @@
 #include <QtDebug>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	//
@@ -52,7 +53,7 @@ namespace glabels
 	///
 	/// Constructor
 	///
-	LabelModelBarcodeObject::LabelModelBarcodeObject()
+	ModelBarcodeObject::ModelBarcodeObject()
 	{
 		mOutline = new Outline( this );
 
@@ -65,7 +66,7 @@ namespace glabels
 		mHandles << new HandleSouthWest( this );
 		mHandles << new HandleWest( this );
 
-		mBcStyle        = BarcodeBackends::defaultStyle();
+		mBcStyle        = barcode::Backends::defaultStyle();
 		mBcTextFlag     = mBcStyle.canText();
 		mBcChecksumFlag = mBcStyle.canChecksum();
 		mBcFormatDigits = mBcStyle.preferedN();
@@ -82,17 +83,17 @@ namespace glabels
 	///
 	/// Constructor
 	///
-	LabelModelBarcodeObject::LabelModelBarcodeObject( const Distance&     x0,
-	                                                  const Distance&     y0,
-	                                                  const Distance&     w,
-	                                                  const Distance&     h,
-	                                                  const BarcodeStyle& bcStyle,
-	                                                  bool                bcTextFlag,
-	                                                  bool                bcChecksumFlag,
-	                                                  QString             bcData,
-	                                                  const ColorNode&    bcColorNode,
-	                                                  const QMatrix&      matrix )
-	: LabelModelObject( x0, y0, w, h, matrix )
+	ModelBarcodeObject::ModelBarcodeObject( const Distance&       x0,
+	                                        const Distance&       y0,
+	                                        const Distance&       w,
+	                                        const Distance&       h,
+	                                        const barcode::Style& bcStyle,
+	                                        bool                  bcTextFlag,
+	                                        bool                  bcChecksumFlag,
+	                                        QString               bcData,
+	                                        const ColorNode&      bcColorNode,
+	                                        const QMatrix&        matrix )
+	: ModelObject( x0, y0, w, h, matrix )
 	{
 		mOutline = new Outline( this );
 
@@ -121,8 +122,8 @@ namespace glabels
 	///
 	/// Copy constructor
 	///
-	LabelModelBarcodeObject::LabelModelBarcodeObject( const LabelModelBarcodeObject* object )
-		: LabelModelObject(object)
+	ModelBarcodeObject::ModelBarcodeObject( const ModelBarcodeObject* object )
+		: ModelObject(object)
 	{
 		mBcStyle        = object->mBcStyle;
 		mBcTextFlag     = object->mBcTextFlag;
@@ -141,7 +142,7 @@ namespace glabels
 	///
 	/// Destructor
 	///
-	LabelModelBarcodeObject::~LabelModelBarcodeObject()
+	ModelBarcodeObject::~ModelBarcodeObject()
 	{
 		delete mOutline;
 
@@ -158,16 +159,16 @@ namespace glabels
 	///
 	/// Clone
 	///
-	LabelModelBarcodeObject* LabelModelBarcodeObject::clone() const
+	ModelBarcodeObject* ModelBarcodeObject::clone() const
 	{
-		return new LabelModelBarcodeObject( this );
+		return new ModelBarcodeObject( this );
 	}
 
 
 	///
 	/// bcData Property Getter
 	///
-	QString LabelModelBarcodeObject::bcData() const
+	QString ModelBarcodeObject::bcData() const
 	{
 		return mBcData.toString();
 	}
@@ -176,7 +177,7 @@ namespace glabels
 	///
 	/// bcData Property Setter
 	///
-	void LabelModelBarcodeObject::setBcData( const QString& value )
+	void ModelBarcodeObject::setBcData( const QString& value )
 	{
 		if ( mBcData.toString() != value )
 		{
@@ -190,7 +191,7 @@ namespace glabels
 	///
 	/// bcTextFlag Property Getter
 	///
-	bool LabelModelBarcodeObject::bcTextFlag() const
+	bool ModelBarcodeObject::bcTextFlag() const
 	{
 		return mBcTextFlag;
 	}
@@ -199,7 +200,7 @@ namespace glabels
 	///
 	/// bcTextFlag Property Setter
 	///
-	void LabelModelBarcodeObject::setBcTextFlag( bool value )
+	void ModelBarcodeObject::setBcTextFlag( bool value )
 	{
 		if ( mBcTextFlag != value )
 		{
@@ -213,7 +214,7 @@ namespace glabels
 	///
 	/// bcChecksumFlag Property Getter
 	///
-	bool LabelModelBarcodeObject::bcChecksumFlag() const
+	bool ModelBarcodeObject::bcChecksumFlag() const
 	{
 		return mBcChecksumFlag;
 	}
@@ -222,7 +223,7 @@ namespace glabels
 	///
 	/// bcChecksumFlag Property Setter
 	///
-	void LabelModelBarcodeObject::setBcChecksumFlag( bool value )
+	void ModelBarcodeObject::setBcChecksumFlag( bool value )
 	{
 		if ( mBcChecksumFlag != value )
 		{
@@ -236,7 +237,7 @@ namespace glabels
 	///
 	/// Barcode Color Node Property Getter
 	///
-	ColorNode LabelModelBarcodeObject::bcColorNode() const
+	ColorNode ModelBarcodeObject::bcColorNode() const
 	{
 		return mBcColorNode;
 	}
@@ -245,7 +246,7 @@ namespace glabels
 	///
 	/// Barcode Color Node Property Setter
 	///
-	void LabelModelBarcodeObject::setBcColorNode( const ColorNode& value )
+	void ModelBarcodeObject::setBcColorNode( const ColorNode& value )
 	{
 		if ( mBcColorNode != value )
 		{
@@ -259,7 +260,7 @@ namespace glabels
 	///
 	/// Barcode Style Property Getter
 	///
-	BarcodeStyle LabelModelBarcodeObject::bcStyle() const
+	barcode::Style ModelBarcodeObject::bcStyle() const
 	{
 		return mBcStyle;
 	}
@@ -268,7 +269,7 @@ namespace glabels
 	///
 	/// Barcode Style Property Setter
 	///
-	void LabelModelBarcodeObject::setBcStyle( const BarcodeStyle& value )
+	void ModelBarcodeObject::setBcStyle( const barcode::Style& value )
 	{
 		if ( mBcStyle != value )
 		{
@@ -282,7 +283,7 @@ namespace glabels
 	///
 	/// Barcode Format Digits Property Getter
 	///
-	int LabelModelBarcodeObject::bcFormatDigits() const
+	int ModelBarcodeObject::bcFormatDigits() const
 	{
 		return mBcFormatDigits;
 	}
@@ -291,7 +292,7 @@ namespace glabels
 	///
 	/// Barcode Format Digits Property Setter
 	///
-	void LabelModelBarcodeObject::setBcFormatDigits( int value )
+	void ModelBarcodeObject::setBcFormatDigits( int value )
 	{
 		if ( mBcFormatDigits != value )
 		{
@@ -305,9 +306,9 @@ namespace glabels
 	///
 	/// Draw shadow of object
 	///
-	void LabelModelBarcodeObject::drawShadow( QPainter*      painter,
-	                                          bool           inEditor,
-	                                          merge::Record* record ) const
+	void ModelBarcodeObject::drawShadow( QPainter*      painter,
+	                                     bool           inEditor,
+	                                     merge::Record* record ) const
 	{
 		// Barcodes don't support shadows.
 	}
@@ -316,9 +317,9 @@ namespace glabels
 	///
 	/// Draw object itself
 	///
-	void LabelModelBarcodeObject::drawObject( QPainter*      painter,
-	                                          bool           inEditor,
-	                                          merge::Record* record ) const
+	void ModelBarcodeObject::drawObject( QPainter*      painter,
+	                                     bool           inEditor,
+	                                     merge::Record* record ) const
 	{
 		QColor bcColor = mBcColorNode.color( record );
 
@@ -336,7 +337,7 @@ namespace glabels
 	///
 	/// Path to test for hover condition
 	///
-	QPainterPath LabelModelBarcodeObject::hoverPath( double scale ) const
+	QPainterPath ModelBarcodeObject::hoverPath( double scale ) const
 	{
 		return mHoverPath;
 	}
@@ -345,7 +346,7 @@ namespace glabels
 	///
 	/// Size updated
 	///
-	void LabelModelBarcodeObject::sizeUpdated()
+	void ModelBarcodeObject::sizeUpdated()
 	{
 		update();
 	}
@@ -354,7 +355,7 @@ namespace glabels
 	///
 	/// Update cached information for editor view
 	///
-	void LabelModelBarcodeObject::update()
+	void ModelBarcodeObject::update()
 	{
 		//
 		// Build barcode from data
@@ -367,7 +368,7 @@ namespace glabels
 		if ( !mEditorBarcode )
 		{
 			qWarning() << "Invalid barcode style" << mBcStyle.fullId() << "using \"code39\".";
-			mBcStyle = BarcodeBackends::defaultStyle();
+			mBcStyle = barcode::Backends::defaultStyle();
 			mEditorBarcode = glbarcode::Factory::createBarcode( mBcStyle.id().toStdString() );
 		}
 		mEditorBarcode->setChecksum(mBcChecksumFlag);
@@ -386,7 +387,7 @@ namespace glabels
 		if ( !mEditorDefaultBarcode )
 		{
 			qWarning() << "Invalid barcode style" << mBcStyle.fullId() << "using \"code39\".";
-			mBcStyle = BarcodeBackends::defaultStyle();
+			mBcStyle = barcode::Backends::defaultStyle();
 			mEditorDefaultBarcode = glbarcode::Factory::createBarcode( mBcStyle.id().toStdString() );
 		}
 		mEditorDefaultBarcode->setChecksum(mBcChecksumFlag);
@@ -417,7 +418,7 @@ namespace glabels
 	///
 	/// Draw barcode in editor from cached information
 	///
-	void LabelModelBarcodeObject::drawBcInEditor( QPainter* painter, const QColor& color ) const
+	void ModelBarcodeObject::drawBcInEditor( QPainter* painter, const QColor& color ) const
 	{
 		if ( mBcData.isEmpty() )
 		{
@@ -444,9 +445,9 @@ namespace glabels
 	/// Draw barcode in final printout or preview
 	///
 	void
-	LabelModelBarcodeObject::drawBc( QPainter*      painter,
-	                                 const QColor&  color,
-	                                 merge::Record* record ) const
+	ModelBarcodeObject::drawBc( QPainter*      painter,
+	                            const QColor&  color,
+	                            merge::Record* record ) const
 	{
 		painter->setPen( QPen( color ) );
 
@@ -465,9 +466,9 @@ namespace glabels
 	/// Draw barcode place holder in editor
 	///
 	void
-	LabelModelBarcodeObject::drawPlaceHolder( QPainter*      painter,
-	                                          const QColor&  color,
-	                                          const QString& text ) const
+	ModelBarcodeObject::drawPlaceHolder( QPainter*      painter,
+	                                     const QColor&  color,
+	                                     const QString& text ) const
 	{
 		QString shortText = text.left( 32 ); // Don't let the text get out of hand
 		
@@ -527,4 +528,4 @@ namespace glabels
 	}
 
 	
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/LabelModelBarcodeObject.h b/model/ModelBarcodeObject.h
similarity index 74%
rename from glabels/LabelModelBarcodeObject.h
rename to model/ModelBarcodeObject.h
index 05cc7f7..c1f2596 100644
--- a/glabels/LabelModelBarcodeObject.h
+++ b/model/ModelBarcodeObject.h
@@ -1,4 +1,4 @@
-/*  LabelModelBarcodeObject.h
+/*  ModelBarcodeObject.h
  *
  *  Copyright (C) 2017  Jim Evins <evins@snaught.com>
  *
@@ -18,24 +18,24 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LabelModelBarcodeObject_h
-#define LabelModelBarcodeObject_h
+#ifndef model_ModelBarcodeObject_h
+#define model_ModelBarcodeObject_h
 
 
-#include "LabelModelObject.h"
+#include "ModelObject.h"
 
 #include "RawText.h"
 
 #include "glbarcode/Barcode.h"
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	///
 	/// Label Model Line Object
 	///
-	class LabelModelBarcodeObject : public LabelModelObject
+	class ModelBarcodeObject : public ModelObject
 	{
 		Q_OBJECT
 
@@ -43,28 +43,28 @@ namespace glabels
 		// Lifecycle Methods
 		///////////////////////////////////////////////////////////////
 	public:
-		LabelModelBarcodeObject();
+		ModelBarcodeObject();
 
-		LabelModelBarcodeObject( const Distance&     x0,
-		                         const Distance&     y0,
-		                         const Distance&     w,
-		                         const Distance&     h,
-		                         const BarcodeStyle& bcStyle,
-		                         bool                bcTextFlag,
-		                         bool                bcChecksumFlag,
-		                         QString             bcData,
-		                         const ColorNode&    bcColorNode,
-		                         const QMatrix&      matrix = QMatrix() );
+		ModelBarcodeObject( const Distance&       x0,
+		                    const Distance&       y0,
+		                    const Distance&       w,
+		                    const Distance&       h,
+		                    const barcode::Style& bcStyle,
+		                    bool                  bcTextFlag,
+		                    bool                  bcChecksumFlag,
+		                    QString               bcData,
+		                    const ColorNode&      bcColorNode,
+		                    const QMatrix&        matrix = QMatrix() );
 
-		LabelModelBarcodeObject( const LabelModelBarcodeObject* object );
+		ModelBarcodeObject( const ModelBarcodeObject* object );
 
-		~LabelModelBarcodeObject() override;
+		~ModelBarcodeObject() override;
 
 
 		///////////////////////////////////////////////////////////////
 		// Object duplication
 		///////////////////////////////////////////////////////////////
-		LabelModelBarcodeObject* clone() const override;
+		ModelBarcodeObject* clone() const override;
 
 
 		///////////////////////////////////////////////////////////////
@@ -102,8 +102,8 @@ namespace glabels
                 //
                 // Barcode Property: bcStyle
                 //
-                BarcodeStyle bcStyle() const override;
-                void setBcStyle( const BarcodeStyle &value ) override;
+                barcode::Style bcStyle() const override;
+                void setBcStyle( const barcode::Style &value ) override;
                 
 
                 //
@@ -146,12 +146,12 @@ namespace glabels
 		// Private Members
 		///////////////////////////////////////////////////////////////
 	private:
-		BarcodeStyle mBcStyle;
-		bool         mBcTextFlag;
-		bool         mBcChecksumFlag;
-		int          mBcFormatDigits;
-		RawText      mBcData;
-		ColorNode    mBcColorNode;
+		barcode::Style      mBcStyle;
+		bool                mBcTextFlag;
+		bool                mBcChecksumFlag;
+		int                 mBcFormatDigits;
+		RawText             mBcData;
+		ColorNode           mBcColorNode;
 
 		glbarcode::Barcode* mEditorBarcode;
 		glbarcode::Barcode* mEditorDefaultBarcode;
@@ -163,4 +163,4 @@ namespace glabels
 }
 
 
-#endif // LabelModelBarcodeObject_h
+#endif // model_ModelBarcodeObject_h
diff --git a/glabels/LabelModelBoxObject.cpp b/model/ModelBoxObject.cpp
similarity index 65%
rename from glabels/LabelModelBoxObject.cpp
rename to model/ModelBoxObject.cpp
index cfb80df..9d40554 100644
--- a/glabels/LabelModelBoxObject.cpp
+++ b/model/ModelBoxObject.cpp
@@ -1,4 +1,4 @@
-/*  LabelModelBoxObject.cpp
+/*  ModelBoxObject.cpp
  *
  *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
  *
@@ -18,13 +18,13 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "LabelModelBoxObject.h"
+#include "ModelBoxObject.h"
 
 #include <QBrush>
 #include <QPen>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	//
@@ -39,7 +39,7 @@ namespace glabels
 	///
 	/// Constructor
 	///
-	LabelModelBoxObject::LabelModelBoxObject()
+	ModelBoxObject::ModelBoxObject()
 	{
 		// empty
 	}
@@ -48,23 +48,23 @@ namespace glabels
 	///
 	/// Constructor
 	///
-	LabelModelBoxObject::LabelModelBoxObject( const Distance&  x0,
-	                                          const Distance&  y0,
-	                                          const Distance&  w,
-	                                          const Distance&  h,
-	                                          const Distance&  lineWidth,
-	                                          const ColorNode& lineColorNode,
-	                                          const ColorNode& fillColorNode,
-	                                          const QMatrix&   matrix,
-	                                          bool             shadowState,
-	                                          const Distance&  shadowX,
-	                                          const Distance&  shadowY,
-	                                          double           shadowOpacity,
-	                                          const ColorNode& shadowColorNode )
-	: LabelModelShapeObject( x0, y0, w, h,
-	                         lineWidth, lineColorNode, fillColorNode,
-	                         matrix,
-	                         shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
+	ModelBoxObject::ModelBoxObject( const Distance&  x0,
+	                                const Distance&  y0,
+	                                const Distance&  w,
+	                                const Distance&  h,
+	                                const Distance&  lineWidth,
+	                                const ColorNode& lineColorNode,
+	                                const ColorNode& fillColorNode,
+	                                const QMatrix&   matrix,
+	                                bool             shadowState,
+	                                const Distance&  shadowX,
+	                                const Distance&  shadowY,
+	                                double           shadowOpacity,
+	                                const ColorNode& shadowColorNode )
+	: ModelShapeObject( x0, y0, w, h,
+	                    lineWidth, lineColorNode, fillColorNode,
+	                    matrix,
+	                    shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
 	{
 		// empty
 	}
@@ -73,8 +73,8 @@ namespace glabels
 	///
 	/// Copy constructor
 	///
-	LabelModelBoxObject::LabelModelBoxObject( const LabelModelBoxObject* object )
-		: LabelModelShapeObject( object )
+	ModelBoxObject::ModelBoxObject( const ModelBoxObject* object )
+		: ModelShapeObject( object )
 	{
 		// empty
 	}
@@ -83,7 +83,7 @@ namespace glabels
 	///
 	/// Destructor
 	///
-	LabelModelBoxObject::~LabelModelBoxObject()
+	ModelBoxObject::~ModelBoxObject()
 	{
 		// empty
 	}
@@ -92,16 +92,16 @@ namespace glabels
 	///
 	/// Clone
 	///
-	LabelModelBoxObject* LabelModelBoxObject::clone() const
+	ModelBoxObject* ModelBoxObject::clone() const
 	{
-		return new LabelModelBoxObject( this );
+		return new ModelBoxObject( this );
 	}
 
 
 	///
 	/// Draw shadow of object
 	///
-	void LabelModelBoxObject::drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const
+	void ModelBoxObject::drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const
 	{
 		QColor lineColor = mLineColorNode.color( record );
 		QColor fillColor = mFillColorNode.color( record );
@@ -146,7 +146,7 @@ namespace glabels
 	///
 	/// Draw object itself
 	///
-	void LabelModelBoxObject::drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const
+	void ModelBoxObject::drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const
 	{
 		QColor lineColor = mLineColorNode.color( record );
 		QColor fillColor = mFillColorNode.color( record );
@@ -161,7 +161,7 @@ namespace glabels
 	///
 	/// Path to test for hover condition
 	///
-	QPainterPath LabelModelBoxObject::hoverPath( double scale ) const
+	QPainterPath ModelBoxObject::hoverPath( double scale ) const
 	{
 		double s = 1 / scale;
 
@@ -191,4 +191,4 @@ namespace glabels
 		return path;
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/LabelModelBoxObject.h b/model/ModelBoxObject.h
similarity index 58%
rename from glabels/LabelModelBoxObject.h
rename to model/ModelBoxObject.h
index 14ec443..0e810d2 100644
--- a/glabels/LabelModelBoxObject.h
+++ b/model/ModelBoxObject.h
@@ -1,4 +1,4 @@
-/*  LabelModelBoxObject.h
+/*  ModelBoxObject.h
  *
  *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
  *
@@ -18,20 +18,20 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LabelModelBoxObject_h
-#define LabelModelBoxObject_h
+#ifndef model_ModelBoxObject_h
+#define model_ModelBoxObject_h
 
 
-#include "LabelModelShapeObject.h"
+#include "ModelShapeObject.h"
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	///
 	/// Label Model Box Object
 	///
-	class LabelModelBoxObject : public LabelModelShapeObject
+	class ModelBoxObject : public ModelShapeObject
 	{
 		Q_OBJECT
 
@@ -39,31 +39,31 @@ namespace glabels
 		// Lifecycle Methods
 		///////////////////////////////////////////////////////////////
 	public:
-		LabelModelBoxObject();
+		ModelBoxObject();
 
-		LabelModelBoxObject( const Distance&  x0,
-		                     const Distance&  y0,
-		                     const Distance&  w,
-		                     const Distance&  h,
-		                     const Distance&  lineWidth,
-		                     const ColorNode& lineColorNode,
-		                     const ColorNode& fillColorNode,
-		                     const QMatrix&   matrix = QMatrix(),
-		                     bool             shadowState = false,
-		                     const Distance&  shadowX = 0,
-		                     const Distance&  shadowY = 0,
-		                     double           shadowOpacity = 1.0,
-		                     const ColorNode& shadowColorNode = ColorNode() );
+		ModelBoxObject( const Distance&  x0,
+		                const Distance&  y0,
+		                const Distance&  w,
+		                const Distance&  h,
+		                const Distance&  lineWidth,
+		                const ColorNode& lineColorNode,
+		                const ColorNode& fillColorNode,
+		                const QMatrix&   matrix = QMatrix(),
+		                bool             shadowState = false,
+		                const Distance&  shadowX = 0,
+		                const Distance&  shadowY = 0,
+		                double           shadowOpacity = 1.0,
+		                const ColorNode& shadowColorNode = ColorNode() );
 
-		LabelModelBoxObject( const LabelModelBoxObject* object );
+		ModelBoxObject( const ModelBoxObject* object );
 		
-		~LabelModelBoxObject() override;
+		~ModelBoxObject() override;
 
 	
 		///////////////////////////////////////////////////////////////
 		// Object duplication
 		///////////////////////////////////////////////////////////////
-		LabelModelBoxObject* clone() const override;
+		ModelBoxObject* clone() const override;
 
 
 		///////////////////////////////////////////////////////////////
@@ -79,4 +79,4 @@ namespace glabels
 }
 
 
-#endif // LabelModelBoxObject_h
+#endif // model_ModelBoxObject_h
diff --git a/glabels/LabelModelEllipseObject.cpp b/model/ModelEllipseObject.cpp
similarity index 63%
rename from glabels/LabelModelEllipseObject.cpp
rename to model/ModelEllipseObject.cpp
index 162fce6..2f6a91d 100644
--- a/glabels/LabelModelEllipseObject.cpp
+++ b/model/ModelEllipseObject.cpp
@@ -1,4 +1,4 @@
-/*  LabelModelEllipseObject.cpp
+/*  ModelEllipseObject.cpp
  *
  *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
  *
@@ -18,13 +18,13 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "LabelModelEllipseObject.h"
+#include "ModelEllipseObject.h"
 
 #include <QBrush>
 #include <QPen>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	//
@@ -39,7 +39,7 @@ namespace glabels
 	///
 	/// Constructor
 	///
-	LabelModelEllipseObject::LabelModelEllipseObject()
+	ModelEllipseObject::ModelEllipseObject()
 	{
 		// empty
 	}
@@ -48,23 +48,23 @@ namespace glabels
 	///
 	/// Constructor
 	///
-	LabelModelEllipseObject::LabelModelEllipseObject( const Distance&  x0,
-	                                                  const Distance&  y0,
-	                                                  const Distance&  w,
-	                                                  const Distance&  h,
-	                                                  const Distance&  lineWidth,
-	                                                  const ColorNode& lineColorNode,
-	                                                  const ColorNode& fillColorNode,
-	                                                  const QMatrix&   matrix,
-	                                                  bool             shadowState,
-	                                                  const Distance&  shadowX,
-	                                                  const Distance&  shadowY,
-	                                                  double           shadowOpacity,
-	                                                  const ColorNode& shadowColorNode )
-	: LabelModelShapeObject( x0, y0, w, h,
-	                         lineWidth, lineColorNode, fillColorNode,
-	                         matrix,
-	                         shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
+	ModelEllipseObject::ModelEllipseObject( const Distance&  x0,
+	                                        const Distance&  y0,
+	                                        const Distance&  w,
+	                                        const Distance&  h,
+	                                        const Distance&  lineWidth,
+	                                        const ColorNode& lineColorNode,
+	                                        const ColorNode& fillColorNode,
+	                                        const QMatrix&   matrix,
+	                                        bool             shadowState,
+	                                        const Distance&  shadowX,
+	                                        const Distance&  shadowY,
+	                                        double           shadowOpacity,
+	                                        const ColorNode& shadowColorNode )
+	: ModelShapeObject( x0, y0, w, h,
+	                    lineWidth, lineColorNode, fillColorNode,
+	                    matrix,
+	                    shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
 	{
 		// empty
 	}
@@ -73,8 +73,8 @@ namespace glabels
 	///
 	/// Copy constructor
 	///
-	LabelModelEllipseObject::LabelModelEllipseObject( const LabelModelEllipseObject* object )
-		: LabelModelShapeObject( object )
+	ModelEllipseObject::ModelEllipseObject( const ModelEllipseObject* object )
+		: ModelShapeObject( object )
 	{
 		// empty
 	}
@@ -83,7 +83,7 @@ namespace glabels
 	///
 	/// Destructor
 	///
-	LabelModelEllipseObject::~LabelModelEllipseObject()
+	ModelEllipseObject::~ModelEllipseObject()
 	{
 		// empty
 	}
@@ -92,16 +92,16 @@ namespace glabels
 	///
 	/// Clone
 	///
-	LabelModelEllipseObject* LabelModelEllipseObject::clone() const
+	ModelEllipseObject* ModelEllipseObject::clone() const
 	{
-		return new LabelModelEllipseObject( this );
+		return new ModelEllipseObject( this );
 	}
 
 
 	///
 	/// Draw shadow of object
 	///
-	void LabelModelEllipseObject::drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const
+	void ModelEllipseObject::drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const
 	{
 		QColor lineColor = mLineColorNode.color( record );
 		QColor fillColor = mFillColorNode.color( record );
@@ -146,7 +146,7 @@ namespace glabels
 	///
 	/// Draw object itself
 	///
-	void LabelModelEllipseObject::drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const
+	void ModelEllipseObject::drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const
 	{
 		QColor lineColor = mLineColorNode.color( record );
 		QColor fillColor = mFillColorNode.color( record );
@@ -161,7 +161,7 @@ namespace glabels
 	///
 	/// Path to test for hover condition
 	///
-	QPainterPath LabelModelEllipseObject::hoverPath( double scale ) const
+	QPainterPath ModelEllipseObject::hoverPath( double scale ) const
 	{
 		double s = 1 / scale;
 
@@ -191,4 +191,4 @@ namespace glabels
 		return path;
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/LabelModelEllipseObject.h b/model/ModelEllipseObject.h
similarity index 57%
rename from glabels/LabelModelEllipseObject.h
rename to model/ModelEllipseObject.h
index 4d98c48..3a83302 100644
--- a/glabels/LabelModelEllipseObject.h
+++ b/model/ModelEllipseObject.h
@@ -1,4 +1,4 @@
-/*  LabelModelEllipseObject.h
+/*  ModelEllipseObject.h
  *
  *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
  *
@@ -18,20 +18,20 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LabelModelEllipseObject_h
-#define LabelModelEllipseObject_h
+#ifndef model_ModelEllipseObject_h
+#define model_ModelEllipseObject_h
 
 
-#include "LabelModelShapeObject.h"
+#include "ModelShapeObject.h"
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	///
 	/// Label Model Ellipse Object
 	///
-	class LabelModelEllipseObject : public LabelModelShapeObject
+	class ModelEllipseObject : public ModelShapeObject
 	{
 		Q_OBJECT
 
@@ -39,31 +39,31 @@ namespace glabels
 		// Lifecycle Methods
 		///////////////////////////////////////////////////////////////
 	public:
-		LabelModelEllipseObject();
+		ModelEllipseObject();
 
-		LabelModelEllipseObject( const Distance&  x0,
-		                         const Distance&  y0,
-		                         const Distance&  w,
-		                         const Distance&  h,
-		                         const Distance&  lineWidth,
-		                         const ColorNode& lineColorNode,
-		                         const ColorNode& fillColorNode,
-		                         const QMatrix&   matrix = QMatrix(),
-		                         bool             shadowState = false,
-		                         const Distance&  shadowX = 0,
-		                         const Distance&  shadowY = 0,
-		                         double           shadowOpacity = 1.0,
-		                         const ColorNode& shadowColorNode = ColorNode() );
+		ModelEllipseObject( const Distance&  x0,
+		                    const Distance&  y0,
+		                    const Distance&  w,
+		                    const Distance&  h,
+		                    const Distance&  lineWidth,
+		                    const ColorNode& lineColorNode,
+		                    const ColorNode& fillColorNode,
+		                    const QMatrix&   matrix = QMatrix(),
+		                    bool             shadowState = false,
+		                    const Distance&  shadowX = 0,
+		                    const Distance&  shadowY = 0,
+		                    double           shadowOpacity = 1.0,
+		                    const ColorNode& shadowColorNode = ColorNode() );
 
-		LabelModelEllipseObject( const LabelModelEllipseObject* object );
+		ModelEllipseObject( const ModelEllipseObject* object );
 
-		~LabelModelEllipseObject() override;
+		~ModelEllipseObject() override;
 
 	
 		///////////////////////////////////////////////////////////////
 		// Object duplication
 		///////////////////////////////////////////////////////////////
-		LabelModelEllipseObject* clone() const override;
+		ModelEllipseObject* clone() const override;
 
 
 		///////////////////////////////////////////////////////////////
@@ -79,4 +79,4 @@ namespace glabels
 }
 
 
-#endif // LabelModelEllipseObject_h
+#endif // model_ModelEllipseObject_h
diff --git a/glabels/LabelModelImageObject.cpp b/model/ModelImageObject.cpp
similarity index 67%
rename from glabels/LabelModelImageObject.cpp
rename to model/ModelImageObject.cpp
index 9219cb7..d3bc30e 100644
--- a/glabels/LabelModelImageObject.cpp
+++ b/model/ModelImageObject.cpp
@@ -1,4 +1,4 @@
-/*  LabelModelImageObject.cpp
+/*  ModelImageObject.cpp
  *
  *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
  *
@@ -18,7 +18,7 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "LabelModelImageObject.h"
+#include "ModelImageObject.h"
 
 #include "Size.h"
 
@@ -29,19 +29,19 @@
 #include <QtDebug>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	///
 	/// Static data
 	///
-	QImage* LabelModelImageObject::smDefaultImage = nullptr;
+	QImage* ModelImageObject::smDefaultImage = nullptr;
 
 
 	///
 	/// Constructor
 	///
-	LabelModelImageObject::LabelModelImageObject() : mImage(nullptr), mSvgRenderer(nullptr)
+	ModelImageObject::ModelImageObject() : mImage(nullptr), mSvgRenderer(nullptr)
 	{
 		mOutline = new Outline( this );
 
@@ -64,20 +64,20 @@ namespace glabels
 	///
 	/// Constructor
 	///
-	LabelModelImageObject::LabelModelImageObject( const Distance&  x0,
-	                                              const Distance&  y0,
-	                                              const Distance&  w,
-	                                              const Distance&  h,
-	                                              const TextNode&  filenameNode,
-	                                              const QMatrix&   matrix,
-	                                              bool             shadowState,
-	                                              const Distance&  shadowX,
-	                                              const Distance&  shadowY,
-	                                              double           shadowOpacity,
-	                                              const ColorNode& shadowColorNode )
-	: LabelModelObject( x0, y0, w, h,
-	                    matrix,
-	                    shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
+	ModelImageObject::ModelImageObject( const Distance&  x0,
+	                                    const Distance&  y0,
+	                                    const Distance&  w,
+	                                    const Distance&  h,
+	                                    const TextNode&  filenameNode,
+	                                    const QMatrix&   matrix,
+	                                    bool             shadowState,
+	                                    const Distance&  shadowX,
+	                                    const Distance&  shadowY,
+	                                    double           shadowOpacity,
+	                                    const ColorNode& shadowColorNode )
+	: ModelObject( x0, y0, w, h,
+	               matrix,
+	               shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
 	{
 		mOutline = new Outline( this );
 
@@ -105,21 +105,21 @@ namespace glabels
 	///
 	/// Constructor
 	///
-	LabelModelImageObject::LabelModelImageObject( const Distance&  x0,
-	                                              const Distance&  y0,
-	                                              const Distance&  w,
-	                                              const Distance&  h,
-	                                              const QString&   filename,
-	                                              const QImage&    image,
-	                                              const QMatrix&   matrix,
-	                                              bool             shadowState,
-	                                              const Distance&  shadowX,
-	                                              const Distance&  shadowY,
-	                                              double           shadowOpacity,
-	                                              const ColorNode& shadowColorNode )
-	: LabelModelObject( x0, y0, w, h,
-	                    matrix,
-	                    shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
+	ModelImageObject::ModelImageObject( const Distance&  x0,
+	                                    const Distance&  y0,
+	                                    const Distance&  w,
+	                                    const Distance&  h,
+	                                    const QString&   filename,
+	                                    const QImage&    image,
+	                                    const QMatrix&   matrix,
+	                                    bool             shadowState,
+	                                    const Distance&  shadowX,
+	                                    const Distance&  shadowY,
+	                                    double           shadowOpacity,
+	                                    const ColorNode& shadowColorNode )
+	: ModelObject( x0, y0, w, h,
+	               matrix,
+	               shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
 	{
 		mOutline = new Outline( this );
 
@@ -146,21 +146,21 @@ namespace glabels
 	///
 	/// Constructor
 	///
-	LabelModelImageObject::LabelModelImageObject( const Distance&   x0,
-	                                              const Distance&   y0,
-	                                              const Distance&   w,
-	                                              const Distance&   h,
-	                                              const QString&    filename,
-	                                              const QByteArray& svg,
-	                                              const QMatrix&    matrix,
-	                                              bool              shadowState,
-	                                              const Distance&   shadowX,
-	                                              const Distance&   shadowY,
-	                                              double            shadowOpacity,
-	                                              const ColorNode&  shadowColorNode )
-	: LabelModelObject( x0, y0, w, h,
-	                    matrix,
-	                    shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
+	ModelImageObject::ModelImageObject( const Distance&   x0,
+	                                    const Distance&   y0,
+	                                    const Distance&   w,
+	                                    const Distance&   h,
+	                                    const QString&    filename,
+	                                    const QByteArray& svg,
+	                                    const QMatrix&    matrix,
+	                                    bool              shadowState,
+	                                    const Distance&   shadowX,
+	                                    const Distance&   shadowY,
+	                                    double            shadowOpacity,
+	                                    const ColorNode&  shadowColorNode )
+	: ModelObject( x0, y0, w, h,
+	               matrix,
+	               shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
 	{
 		mOutline = new Outline( this );
 
@@ -188,7 +188,7 @@ namespace glabels
 	///
 	/// Copy constructor
 	///
-	LabelModelImageObject::LabelModelImageObject( const LabelModelImageObject* object ) : LabelModelObject(object)
+	ModelImageObject::ModelImageObject( const ModelImageObject* object ) : ModelObject(object)
 	{
 		mFilenameNode = object->mFilenameNode;
 		if ( object->mImage )
@@ -214,7 +214,7 @@ namespace glabels
 	///
 	/// Destructor
 	///
-	LabelModelImageObject::~LabelModelImageObject()
+	ModelImageObject::~ModelImageObject()
 	{
 		delete mOutline;
 
@@ -238,16 +238,16 @@ namespace glabels
 	///
 	/// Clone
 	///
-	LabelModelImageObject* LabelModelImageObject::clone() const
+	ModelImageObject* ModelImageObject::clone() const
 	{
-		return new LabelModelImageObject( this );
+		return new ModelImageObject( this );
 	}
 
 
 	///
 	/// Image filenameNode Property Getter
 	///
-	TextNode LabelModelImageObject::filenameNode() const
+	TextNode ModelImageObject::filenameNode() const
 	{
 		return mFilenameNode;
 	}
@@ -256,7 +256,7 @@ namespace glabels
 	///
 	/// Image filenameNode Property Setter
 	///
-	void LabelModelImageObject::setFilenameNode( const TextNode& value )
+	void ModelImageObject::setFilenameNode( const TextNode& value )
 	{
 		if ( mFilenameNode != value )
 		{
@@ -271,7 +271,7 @@ namespace glabels
 	///
 	/// Image image Property Getter
 	///
-	const QImage* LabelModelImageObject::image() const
+	const QImage* ModelImageObject::image() const
 	{
 		return mImage;
 	}
@@ -280,7 +280,7 @@ namespace glabels
 	///
 	/// Image Property Setter
 	///
-	void LabelModelImageObject::setImage( const QImage& value )
+	void ModelImageObject::setImage( const QImage& value )
 	{
 		if ( !value.isNull() )
 		{
@@ -307,7 +307,7 @@ namespace glabels
 	///
 	/// Image Property Setter
 	///
-	void LabelModelImageObject::setImage( const QString& name, const QImage& value )
+	void ModelImageObject::setImage( const QString& name, const QImage& value )
 	{
 		if ( !value.isNull() )
 		{
@@ -333,7 +333,7 @@ namespace glabels
 	///
 	/// Image svg Property Getter
 	///
-	QByteArray LabelModelImageObject::svg() const
+	QByteArray ModelImageObject::svg() const
 	{
 		return mSvg;
 	}
@@ -342,7 +342,7 @@ namespace glabels
 	///
 	/// Image svgSource Property Setter
 	///
-	void LabelModelImageObject::setSvg( const QString& name, const QByteArray& value )
+	void ModelImageObject::setSvg( const QString& name, const QByteArray& value )
 	{
 		if ( !value.isEmpty() )
 		{
@@ -369,7 +369,7 @@ namespace glabels
 	///
 	/// naturalSize Property Getter (assumes 72 DPI, i.e. 1pixel == 1pt)
 	///
-	Size LabelModelImageObject::naturalSize() const
+	Size ModelImageObject::naturalSize() const
 	{
 		Size size( Distance::pt(72), Distance::pt(72) );
 
@@ -393,7 +393,7 @@ namespace glabels
 	///
 	/// Draw shadow of object
 	///
-	void LabelModelImageObject::drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const
+	void ModelImageObject::drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const
 	{
 		QRectF destRect( 0, 0, mW.pt(), mH.pt() );
 	
@@ -422,7 +422,7 @@ namespace glabels
 	///
 	/// Draw object itself
 	///
-	void LabelModelImageObject::drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const
+	void ModelImageObject::drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const
 	{
 		QRectF destRect( 0, 0, mW.pt(), mH.pt() );
 	
@@ -451,7 +451,7 @@ namespace glabels
 	///
 	/// Path to test for hover condition
 	///
-	QPainterPath LabelModelImageObject::hoverPath( double scale ) const
+	QPainterPath ModelImageObject::hoverPath( double scale ) const
 	{
 		QPainterPath path;
 		path.addRect( 0, 0, mW.pt(), mH.pt() );
@@ -463,7 +463,7 @@ namespace glabels
 	///
 	/// Load image
 	///
-	void LabelModelImageObject::loadImage()
+	void ModelImageObject::loadImage()
 	{
 		if ( mImage )
 		{
@@ -542,7 +542,7 @@ namespace glabels
 	///
 	/// Create shadow image
 	///
-	QImage* LabelModelImageObject::createShadowImage( const QColor& color ) const
+	QImage* ModelImageObject::createShadowImage( const QColor& color ) const
 	{
 		int r = color.red();
 		int g = color.green();
@@ -563,4 +563,4 @@ namespace glabels
 		return shadow;
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/LabelModelImageObject.h b/model/ModelImageObject.h
similarity index 56%
rename from glabels/LabelModelImageObject.h
rename to model/ModelImageObject.h
index a460cfe..043fa3d 100644
--- a/glabels/LabelModelImageObject.h
+++ b/model/ModelImageObject.h
@@ -1,4 +1,4 @@
-/*  LabelModelImageObject.h
+/*  ModelImageObject.h
  *
  *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
  *
@@ -18,22 +18,22 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LabelModelImageObject_h
-#define LabelModelImageObject_h
+#ifndef model_ModelImageObject_h
+#define model_ModelImageObject_h
 
 
-#include "LabelModelObject.h"
+#include "ModelObject.h"
 
 #include <QSvgRenderer>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	///
 	/// Label Model Image Object
 	///
-	class LabelModelImageObject : public LabelModelObject
+	class ModelImageObject : public ModelObject
 	{
 		Q_OBJECT
 
@@ -41,55 +41,55 @@ namespace glabels
 		// Lifecycle Methods
 		///////////////////////////////////////////////////////////////
 	public:
-		LabelModelImageObject();
+		ModelImageObject();
 
-		LabelModelImageObject( const Distance&  x0,
-		                       const Distance&  y0,
-		                       const Distance&  w,
-		                       const Distance&  h,
-		                       const TextNode&  filenameNode,
-		                       const QMatrix&   matrix = QMatrix(),
-		                       bool             shadowState = false,
-		                       const Distance&  shadowX = 0,
-		                       const Distance&  shadowY = 0,
-		                       double           shadowOpacity = 1.0,
-		                       const ColorNode& shadowColorNode = ColorNode() );
+		ModelImageObject( const Distance&  x0,
+		                  const Distance&  y0,
+		                  const Distance&  w,
+		                  const Distance&  h,
+		                  const TextNode&  filenameNode,
+		                  const QMatrix&   matrix = QMatrix(),
+		                  bool             shadowState = false,
+		                  const Distance&  shadowX = 0,
+		                  const Distance&  shadowY = 0,
+		                  double           shadowOpacity = 1.0,
+		                  const ColorNode& shadowColorNode = ColorNode() );
 
-		LabelModelImageObject( const Distance&  x0,
-		                       const Distance&  y0,
-		                       const Distance&  w,
-		                       const Distance&  h,
-		                       const QString&   filename,
-		                       const QImage&    image,
-		                       const QMatrix&   matrix = QMatrix(),
-		                       bool             shadowState = false,
-		                       const Distance&  shadowX = 0,
-		                       const Distance&  shadowY = 0,
-		                       double           shadowOpacity = 1.0,
-		                       const ColorNode& shadowColorNode = ColorNode() );
+		ModelImageObject( const Distance&  x0,
+		                  const Distance&  y0,
+		                  const Distance&  w,
+		                  const Distance&  h,
+		                  const QString&   filename,
+		                  const QImage&    image,
+		                  const QMatrix&   matrix = QMatrix(),
+		                  bool             shadowState = false,
+		                  const Distance&  shadowX = 0,
+		                  const Distance&  shadowY = 0,
+		                  double           shadowOpacity = 1.0,
+		                  const ColorNode& shadowColorNode = ColorNode() );
 
-		LabelModelImageObject( const Distance&   x0,
-		                       const Distance&   y0,
-		                       const Distance&   w,
-		                       const Distance&   h,
-		                       const QString&    filename,
-		                       const QByteArray& svg,
-		                       const QMatrix&    matrix = QMatrix(),
-		                       bool              shadowState = false,
-		                       const Distance&   shadowX = 0,
-		                       const Distance&   shadowY = 0,
-		                       double            shadowOpacity = 1.0,
-		                       const ColorNode&  shadowColorNode = ColorNode() );
+		ModelImageObject( const Distance&   x0,
+		                  const Distance&   y0,
+		                  const Distance&   w,
+		                  const Distance&   h,
+		                  const QString&    filename,
+		                  const QByteArray& svg,
+		                  const QMatrix&    matrix = QMatrix(),
+		                  bool              shadowState = false,
+		                  const Distance&   shadowX = 0,
+		                  const Distance&   shadowY = 0,
+		                  double            shadowOpacity = 1.0,
+		                  const ColorNode&  shadowColorNode = ColorNode() );
 
-		LabelModelImageObject( const LabelModelImageObject* object );
+		ModelImageObject( const ModelImageObject* object );
 		
-		~LabelModelImageObject() override;
+		~ModelImageObject() override;
 
 
 		///////////////////////////////////////////////////////////////
 		// Object duplication
 		///////////////////////////////////////////////////////////////
-		LabelModelImageObject* clone() const override;
+		ModelImageObject* clone() const override;
 
 
 		///////////////////////////////////////////////////////////////
@@ -158,4 +158,4 @@ namespace glabels
 }
 
 
-#endif // LabelModelImageObject_h
+#endif // model_ModelImageObject_h
diff --git a/glabels/LabelModelLineObject.cpp b/model/ModelLineObject.cpp
similarity index 64%
rename from glabels/LabelModelLineObject.cpp
rename to model/ModelLineObject.cpp
index 872003a..4a653f4 100644
--- a/glabels/LabelModelLineObject.cpp
+++ b/model/ModelLineObject.cpp
@@ -1,4 +1,4 @@
-/*  LabelModelLineObject.cpp
+/*  ModelLineObject.cpp
  *
  *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
  *
@@ -18,13 +18,13 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "LabelModelLineObject.h"
+#include "ModelLineObject.h"
 
 #include <QBrush>
 #include <QPen>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	//
@@ -39,7 +39,7 @@ namespace glabels
 	///
 	/// Constructor
 	///
-	LabelModelLineObject::LabelModelLineObject()
+	ModelLineObject::ModelLineObject()
 	{
 		mOutline = nullptr;
 
@@ -54,21 +54,21 @@ namespace glabels
 	///
 	/// Constructor
 	///
-	LabelModelLineObject::LabelModelLineObject( const Distance&  x0,
-	                                            const Distance&  y0,
-	                                            const Distance&  dx,
-	                                            const Distance&  dy,
-	                                            const Distance&  lineWidth,
-	                                            const ColorNode& lineColorNode,
-	                                            const QMatrix&   matrix,
-	                                            bool             shadowState,
-	                                            const Distance&  shadowX,
-	                                            const Distance&  shadowY,
-	                                            double           shadowOpacity,
-	                                            const ColorNode& shadowColorNode )
-	: LabelModelObject( x0, y0, dx, dy,
-	                    matrix,
-	                    shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
+	ModelLineObject::ModelLineObject( const Distance&  x0,
+	                                  const Distance&  y0,
+	                                  const Distance&  dx,
+	                                  const Distance&  dy,
+	                                  const Distance&  lineWidth,
+	                                  const ColorNode& lineColorNode,
+	                                  const QMatrix&   matrix,
+	                                  bool             shadowState,
+	                                  const Distance&  shadowX,
+	                                  const Distance&  shadowY,
+	                                  double           shadowOpacity,
+	                                  const ColorNode& shadowColorNode )
+	: ModelObject( x0, y0, dx, dy,
+	               matrix,
+	               shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
 	{
 		mOutline = new Outline( this );
 
@@ -89,8 +89,8 @@ namespace glabels
 	///
 	/// Copy constructor
 	///
-	LabelModelLineObject::LabelModelLineObject( const LabelModelLineObject* object )
-		: LabelModelObject(object)
+	ModelLineObject::ModelLineObject( const ModelLineObject* object )
+		: ModelObject(object)
 	{
 		mLineWidth       = object->mLineWidth;
 		mLineColorNode   = object->mLineColorNode;
@@ -100,7 +100,7 @@ namespace glabels
 	///
 	/// Destructor
 	///
-	LabelModelLineObject::~LabelModelLineObject()
+	ModelLineObject::~ModelLineObject()
 	{
 		foreach( Handle* handle, mHandles )
 		{
@@ -113,16 +113,16 @@ namespace glabels
 	///
 	/// Clone
 	///
-	LabelModelLineObject* LabelModelLineObject::clone() const
+	ModelLineObject* ModelLineObject::clone() const
 	{
-		return new LabelModelLineObject( this );
+		return new ModelLineObject( this );
 	}
 
 
 	///
 	/// Line Width Property Getter
 	///
-	Distance LabelModelLineObject::lineWidth() const
+	Distance ModelLineObject::lineWidth() const
 	{
 		return mLineWidth;
 	}
@@ -131,7 +131,7 @@ namespace glabels
 	///
 	/// Line Width Property Setter
 	///
-	void LabelModelLineObject::setLineWidth( const Distance& value )
+	void ModelLineObject::setLineWidth( const Distance& value )
 	{
 		if ( mLineWidth != value )
 		{
@@ -144,7 +144,7 @@ namespace glabels
 	///
 	/// Line Color Node Property Getter
 	///
-	ColorNode LabelModelLineObject::lineColorNode() const
+	ColorNode ModelLineObject::lineColorNode() const
 	{
 		return mLineColorNode;
 	}
@@ -153,7 +153,7 @@ namespace glabels
 	///
 	/// Line Color Node Property Setter
 	///
-	void LabelModelLineObject::setLineColorNode( const ColorNode& value )
+	void ModelLineObject::setLineColorNode( const ColorNode& value )
 	{
 		if ( mLineColorNode != value )
 		{
@@ -166,7 +166,7 @@ namespace glabels
 	///
 	/// Can Line Color Capability Implementation
 	///
-	bool LabelModelLineObject::canLineColor()
+	bool ModelLineObject::canLineColor()
 	{
 		return true;
 	}
@@ -175,7 +175,7 @@ namespace glabels
 	///
 	/// Can Line Width Capability Implementation
 	///
-	bool LabelModelLineObject::canLineWidth()
+	bool ModelLineObject::canLineWidth()
 	{
 		return true;
 	}
@@ -184,7 +184,7 @@ namespace glabels
 	///
 	/// Draw shadow of object
 	///
-	void LabelModelLineObject::drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const
+	void ModelLineObject::drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const
 	{
 		QColor lineColor = mLineColorNode.color( record );
 		QColor shadowColor = mShadowColorNode.color( record );
@@ -202,7 +202,7 @@ namespace glabels
 	///
 	/// Draw object itself
 	///
-	void LabelModelLineObject::drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const
+	void ModelLineObject::drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const
 	{
 		QColor lineColor = mLineColorNode.color( record );
 
@@ -214,7 +214,7 @@ namespace glabels
 	///
 	/// Path to test for hover condition
 	///
-	QPainterPath LabelModelLineObject::hoverPath( double scale ) const
+	QPainterPath ModelLineObject::hoverPath( double scale ) const
 	{
 		QPainterPath path;
 
@@ -240,4 +240,4 @@ namespace glabels
 		return path;
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/LabelModelLineObject.h b/model/ModelLineObject.h
similarity index 70%
rename from glabels/LabelModelLineObject.h
rename to model/ModelLineObject.h
index 6bbc4fb..1b75301 100644
--- a/glabels/LabelModelLineObject.h
+++ b/model/ModelLineObject.h
@@ -1,4 +1,4 @@
-/*  LabelModelLineObject.h
+/*  ModelLineObject.h
  *
  *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
  *
@@ -18,20 +18,20 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LabelModelLineObject_h
-#define LabelModelLineObject_h
+#ifndef model_ModelLineObject_h
+#define model_ModelLineObject_h
 
 
-#include "LabelModelObject.h"
+#include "ModelObject.h"
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	///
 	/// Label Model Line Object
 	///
-	class LabelModelLineObject : public LabelModelObject
+	class ModelLineObject : public ModelObject
 	{
 		Q_OBJECT
 
@@ -39,30 +39,30 @@ namespace glabels
 		// Lifecycle Methods
 		///////////////////////////////////////////////////////////////
 	public:
-		LabelModelLineObject();
+		ModelLineObject();
 
-		LabelModelLineObject( const Distance&  x0,
-		                      const Distance&  y0,
-		                      const Distance&  w,
-		                      const Distance&  h,
-		                      const Distance&  lineWidth,
-		                      const ColorNode& lineColorNode,
-		                      const QMatrix&   matrix = QMatrix(),
-		                      bool             shadowState = false,
-		                      const Distance&  shadowX = 0,
-		                      const Distance&  shadowY = 0,
-		                      double           shadowOpacity = 1.0,
-		                      const ColorNode& shadowColorNode = ColorNode() );
+		ModelLineObject( const Distance&  x0,
+		                 const Distance&  y0,
+		                 const Distance&  w,
+		                 const Distance&  h,
+		                 const Distance&  lineWidth,
+		                 const ColorNode& lineColorNode,
+		                 const QMatrix&   matrix = QMatrix(),
+		                 bool             shadowState = false,
+		                 const Distance&  shadowX = 0,
+		                 const Distance&  shadowY = 0,
+		                 double           shadowOpacity = 1.0,
+		                 const ColorNode& shadowColorNode = ColorNode() );
 
-		LabelModelLineObject( const LabelModelLineObject* object );
+		ModelLineObject( const ModelLineObject* object );
 		
-		~LabelModelLineObject() override;
+		~ModelLineObject() override;
 
 
 		///////////////////////////////////////////////////////////////
 		// Object duplication
 		///////////////////////////////////////////////////////////////
-		LabelModelLineObject* clone() const override;
+		ModelLineObject* clone() const override;
 
 
 		///////////////////////////////////////////////////////////////
@@ -112,4 +112,4 @@ namespace glabels
 }
 
 
-#endif // LabelModelLineObject_h
+#endif // model_ModelLineObject_h
diff --git a/glabels/LabelModelObject.cpp b/model/ModelObject.cpp
similarity index 70%
rename from glabels/LabelModelObject.cpp
rename to model/ModelObject.cpp
index 92183c4..449d800 100644
--- a/glabels/LabelModelObject.cpp
+++ b/model/ModelObject.cpp
@@ -1,4 +1,4 @@
-/*  LabelModelObject.cpp
+/*  ModelObject.cpp
  *
  *  Copyright (C) 2013  Jim Evins <evins@snaught.com>
  *
@@ -18,10 +18,9 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "LabelModelObject.h"
+#include "ModelObject.h"
 
 #include "ColorNode.h"
-#include "BarcodeStyle.h"
 #include "Region.h"
 #include "Size.h"
 #include "TextNode.h"
@@ -30,19 +29,19 @@
 #include <QtDebug>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	///
 	/// Next Object ID
 	///
-	int LabelModelObject::msNextId = 0;
+	int ModelObject::msNextId = 0;
 
 
 	///
 	/// Constructor
 	///
-	LabelModelObject::LabelModelObject() : QObject(nullptr)
+	ModelObject::ModelObject() : QObject(nullptr)
 	{
 		mId = msNextId++;
 
@@ -67,16 +66,16 @@ namespace glabels
 	///
 	/// Constructor
 	///
-	LabelModelObject::LabelModelObject( const Distance&  x0,
-	                                    const Distance&  y0,
-	                                    const Distance&  w,
-	                                    const Distance&  h,
-	                                    const QMatrix&   matrix,
-	                                    bool             shadowState,
-	                                    const Distance&  shadowX,
-	                                    const Distance&  shadowY,
-	                                    double           shadowOpacity,
-	                                    const ColorNode& shadowColorNode ) : QObject(nullptr)
+	ModelObject::ModelObject( const Distance&  x0,
+	                          const Distance&  y0,
+	                          const Distance&  w,
+	                          const Distance&  h,
+	                          const QMatrix&   matrix,
+	                          bool             shadowState,
+	                          const Distance&  shadowX,
+	                          const Distance&  shadowY,
+	                          double           shadowOpacity,
+	                          const ColorNode& shadowColorNode ) : QObject(nullptr)
 	{
 		mId = msNextId++;
 
@@ -101,7 +100,7 @@ namespace glabels
 	///
 	/// Copy constructor
 	///
-	LabelModelObject::LabelModelObject( const LabelModelObject* object )
+	ModelObject::ModelObject( const ModelObject* object )
 	{
 		mId = msNextId++;
 
@@ -139,7 +138,7 @@ namespace glabels
 	///
 	/// Destructor
 	///
-	LabelModelObject::~LabelModelObject()
+	ModelObject::~ModelObject()
 	{
 		// empty
 	}
@@ -148,7 +147,7 @@ namespace glabels
 	///
 	/// ID Property Getter
 	///
-	int LabelModelObject::id() const
+	int ModelObject::id() const
 	{
 		return mId;
 	}
@@ -157,7 +156,7 @@ namespace glabels
 	///
 	/// Selected Property Getter
 	///
-	bool LabelModelObject::isSelected() const
+	bool ModelObject::isSelected() const
 	{
 		return mSelectedFlag;
 	}
@@ -166,7 +165,7 @@ namespace glabels
 	///
 	/// Selected Property Setter
 	///
-	void LabelModelObject::select( bool value )
+	void ModelObject::select( bool value )
 	{
 		mSelectedFlag = value;
 	}
@@ -175,7 +174,7 @@ namespace glabels
 	///
 	/// Clear Selected Property Setter
 	///
-	void LabelModelObject::unselect()
+	void ModelObject::unselect()
 	{
 		mSelectedFlag = false;
 	}
@@ -184,7 +183,7 @@ namespace glabels
 	///
 	/// X0 Property Getter
 	///
-	Distance LabelModelObject::x0() const
+	Distance ModelObject::x0() const
 	{
 		return mX0;
 	}
@@ -193,7 +192,7 @@ namespace glabels
 	///
 	/// X0 Property Setter
 	///
-	void LabelModelObject::setX0( const Distance& value )
+	void ModelObject::setX0( const Distance& value )
 	{
 		if ( mX0 != value )
 		{
@@ -206,7 +205,7 @@ namespace glabels
 	///
 	/// Y0 Property Getter
 	///
-	Distance LabelModelObject::y0() const
+	Distance ModelObject::y0() const
 	{
 		return mY0;
 	}
@@ -215,7 +214,7 @@ namespace glabels
 	///
 	/// Y0 Property Setter
 	///
-	void LabelModelObject::setY0( const Distance& value )
+	void ModelObject::setY0( const Distance& value )
 	{
 		if ( mY0 != value )
 		{
@@ -228,7 +227,7 @@ namespace glabels
 	///
 	/// W (Width) Property Getter
 	///
-	Distance LabelModelObject::w() const
+	Distance ModelObject::w() const
 	{
 		return mW;
 	}
@@ -237,7 +236,7 @@ namespace glabels
 	///
 	/// W (Width) Property Setter
 	///
-	void LabelModelObject::setW( const Distance& value )
+	void ModelObject::setW( const Distance& value )
 	{
 		if ( mW != value )
 		{
@@ -251,7 +250,7 @@ namespace glabels
 	///
 	/// H (Height) Property Getter
 	///
-	Distance LabelModelObject::h() const
+	Distance ModelObject::h() const
 	{
 		return mH;
 	}
@@ -260,7 +259,7 @@ namespace glabels
 	///
 	/// H (Height) Property Setter
 	///
-	void LabelModelObject::setH( const Distance& value )
+	void ModelObject::setH( const Distance& value )
 	{
 		if ( mH != value )
 		{
@@ -274,7 +273,7 @@ namespace glabels
 	///
 	/// Matrix Property Getter
 	///
-	QMatrix LabelModelObject::matrix() const
+	QMatrix ModelObject::matrix() const
 	{
 		return mMatrix;
 	}
@@ -283,7 +282,7 @@ namespace glabels
 	///
 	/// Matrix Property Setter
 	///
-	void LabelModelObject::setMatrix( const QMatrix& value )
+	void ModelObject::setMatrix( const QMatrix& value )
 	{
 		if ( mMatrix != value )
 		{
@@ -296,7 +295,7 @@ namespace glabels
 	///
 	/// Shadow State Property Getter
 	///
-	bool LabelModelObject::shadow() const
+	bool ModelObject::shadow() const
 	{
 		return mShadowState;
 	}
@@ -305,7 +304,7 @@ namespace glabels
 	///
 	/// Shadow State Property Setter
 	///
-	void LabelModelObject::setShadow( bool value )
+	void ModelObject::setShadow( bool value )
 	{
 		if ( mShadowState != value )
 		{
@@ -318,7 +317,7 @@ namespace glabels
 	///
 	/// Shadow X Property Getter
 	///
-	Distance LabelModelObject::shadowX() const
+	Distance ModelObject::shadowX() const
 	{
 		return mShadowX;
 	}
@@ -327,7 +326,7 @@ namespace glabels
 	///
 	/// Shadow X Property Setter
 	///
-	void LabelModelObject::setShadowX( const Distance& value )
+	void ModelObject::setShadowX( const Distance& value )
 	{
 		if ( mShadowX != value )
 		{
@@ -340,7 +339,7 @@ namespace glabels
 	///
 	/// Shadow Y Property Getter
 	///
-	Distance LabelModelObject::shadowY() const
+	Distance ModelObject::shadowY() const
 	{
 		return mShadowY;
 	}
@@ -349,7 +348,7 @@ namespace glabels
 	///
 	/// Shadow Y Property Setter
 	///
-	void LabelModelObject::setShadowY( const Distance& value )
+	void ModelObject::setShadowY( const Distance& value )
 	{
 		if ( mShadowY != value )
 		{
@@ -362,7 +361,7 @@ namespace glabels
 	///
 	/// Shadow Opacity Property Getter
 	///
-	double LabelModelObject::shadowOpacity() const
+	double ModelObject::shadowOpacity() const
 	{
 		return mShadowOpacity;
 	}
@@ -371,7 +370,7 @@ namespace glabels
 	///
 	/// Shadow Opacity Property Setter
 	///
-	void LabelModelObject::setShadowOpacity( double value )
+	void ModelObject::setShadowOpacity( double value )
 	{
 		if ( mShadowOpacity != value )
 		{
@@ -384,7 +383,7 @@ namespace glabels
 	///
 	/// Shadow Color Node Property Getter
 	///
-	ColorNode LabelModelObject::shadowColorNode() const
+	ColorNode ModelObject::shadowColorNode() const
 	{
 		return mShadowColorNode;
 	}
@@ -393,7 +392,7 @@ namespace glabels
 	///
 	/// Shadow Color Node Property Setter
 	///
-	void LabelModelObject::setShadowColorNode( const ColorNode& value )
+	void ModelObject::setShadowColorNode( const ColorNode& value )
 	{
 		if ( mShadowColorNode != value )
 		{
@@ -407,7 +406,7 @@ namespace glabels
 	/// Virtual Natural Size Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	Size LabelModelObject::naturalSize() const
+	Size ModelObject::naturalSize() const
 	{
 		return Size( Distance::pt(0), Distance::pt(0) );
 	}
@@ -417,7 +416,7 @@ namespace glabels
 	/// Virtual Text Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	QString LabelModelObject::text() const
+	QString ModelObject::text() const
 	{
 		return "";
 	}
@@ -427,7 +426,7 @@ namespace glabels
 	/// Virtual Text Property Default Setter
 	/// (Overridden by concrete class)
 	///
-	void LabelModelObject::setText( const QString& value )
+	void ModelObject::setText( const QString& value )
 	{
 		// empty
 	}
@@ -437,7 +436,7 @@ namespace glabels
 	/// Virtual Font Family Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	QString LabelModelObject::fontFamily() const
+	QString ModelObject::fontFamily() const
 	{
 		return "";
 	}
@@ -447,7 +446,7 @@ namespace glabels
 	/// Virtual Font Family Property Default Setter
 	/// (Overridden by concrete class)
 	///
-	void LabelModelObject::setFontFamily( const QString& value )
+	void ModelObject::setFontFamily( const QString& value )
 	{
 		// empty
 	}
@@ -457,7 +456,7 @@ namespace glabels
 	/// Virtual Font Size Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	double LabelModelObject::fontSize() const
+	double ModelObject::fontSize() const
 	{
 		return 0;
 	}
@@ -467,7 +466,7 @@ namespace glabels
 	/// Virtual Font Size Property Default Setter
 	/// (Overridden by concrete class)
 	///
-	void LabelModelObject::setFontSize( double value )
+	void ModelObject::setFontSize( double value )
 	{
 		// empty
 	}
@@ -477,7 +476,7 @@ namespace glabels
 	/// Virtual Font Weight Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	QFont::Weight LabelModelObject::fontWeight() const
+	QFont::Weight ModelObject::fontWeight() const
 	{
 		return QFont::Normal;
 	}
@@ -487,7 +486,7 @@ namespace glabels
 	/// Virtual Font Weight Property Default Setter
 	/// (Overridden by concrete class)
 	///
-	void LabelModelObject::setFontWeight( QFont::Weight value )
+	void ModelObject::setFontWeight( QFont::Weight value )
 	{
 		// empty
 	}
@@ -497,7 +496,7 @@ namespace glabels
 	/// Virtual Font Italic Flag Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	bool LabelModelObject::fontItalicFlag() const
+	bool ModelObject::fontItalicFlag() const
 	{
 		return false;
 	}
@@ -507,7 +506,7 @@ namespace glabels
 	/// Virtual Font Italic Flag Property Default Setter
 	/// (Overridden by concrete class)
 	///
-	void LabelModelObject::setFontItalicFlag( bool value )
+	void ModelObject::setFontItalicFlag( bool value )
 	{
 		// empty
 	}
@@ -517,7 +516,7 @@ namespace glabels
 	/// Virtual Font Underline Flag Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	bool LabelModelObject::fontUnderlineFlag() const
+	bool ModelObject::fontUnderlineFlag() const
 	{
 		return false;
 	}
@@ -527,7 +526,7 @@ namespace glabels
 	/// Virtual Font Underline Flag Property Default Setter
 	/// (Overridden by concrete class)
 	///
-	void LabelModelObject::setFontUnderlineFlag( bool value )
+	void ModelObject::setFontUnderlineFlag( bool value )
 	{
 		// empty
 	}
@@ -537,7 +536,7 @@ namespace glabels
 	/// Virtual Text Color Node Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	ColorNode LabelModelObject::textColorNode() const
+	ColorNode ModelObject::textColorNode() const
 	{
 		return ColorNode( QColor::fromRgba(0x00000000) );
 	}
@@ -547,7 +546,7 @@ namespace glabels
 	/// Virtual Text Color Node Property Default Setter
 	/// (Overridden by concrete class)
 	///
-	void LabelModelObject::setTextColorNode( const ColorNode &value )
+	void ModelObject::setTextColorNode( const ColorNode &value )
 	{
 		// empty
 	}
@@ -557,7 +556,7 @@ namespace glabels
 	/// Virtual Text Horizontal Alignment Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	Qt::Alignment LabelModelObject::textHAlign() const
+	Qt::Alignment ModelObject::textHAlign() const
 	{
 		return Qt::AlignLeft;
 	}
@@ -567,7 +566,7 @@ namespace glabels
 	/// Virtual Text Horizontal Alignment Property Default Setter
 	/// (Overridden by concrete class)
 	///
-	void LabelModelObject::setTextHAlign( Qt::Alignment value )
+	void ModelObject::setTextHAlign( Qt::Alignment value )
 	{
 		// empty
 	}
@@ -577,7 +576,7 @@ namespace glabels
 	/// Virtual Text Vertical Alignment Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	Qt::Alignment LabelModelObject::textVAlign() const
+	Qt::Alignment ModelObject::textVAlign() const
 	{
 		return Qt::AlignTop;
 	}
@@ -587,7 +586,7 @@ namespace glabels
 	/// Virtual Text Vertical Alignment Property Default Setter
 	/// (Overridden by concrete class)
 	///
-	void LabelModelObject::setTextVAlign( Qt::Alignment value )
+	void ModelObject::setTextVAlign( Qt::Alignment value )
 	{
 		// empty
 	}
@@ -597,7 +596,7 @@ namespace glabels
 	/// Virtual Text Line Spacing Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	double LabelModelObject::textLineSpacing() const
+	double ModelObject::textLineSpacing() const
 	{
 		return 0;
 	}
@@ -607,7 +606,7 @@ namespace glabels
 	/// Virtual Text Line Spacing Property Default Setter
 	/// (Overridden by concrete class)
 	///
-	void LabelModelObject::setTextLineSpacing( double value )
+	void ModelObject::setTextLineSpacing( double value )
 	{
 		// empty
 	}
@@ -617,7 +616,7 @@ namespace glabels
 	/// Virtual Filename Node Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	TextNode LabelModelObject::filenameNode() const
+	TextNode ModelObject::filenameNode() const
 	{
 		return TextNode();
 	}
@@ -627,7 +626,7 @@ namespace glabels
 	/// Virtual Filename Node Property Default Setter
 	/// (Overridden by concrete class)
 	///
-	void LabelModelObject::setFilenameNode( const TextNode& value )
+	void ModelObject::setFilenameNode( const TextNode& value )
 	{
 		// empty
 	}
@@ -637,7 +636,7 @@ namespace glabels
 	/// Virtual Image Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	const QImage* LabelModelObject::image() const
+	const QImage* ModelObject::image() const
 	{
 		return nullptr;
 	}
@@ -647,7 +646,7 @@ namespace glabels
 	/// Virtual Image Property Default Setter
 	/// (Overridden by concrete class)
 	///
-	void LabelModelObject::setImage( const QImage& value )
+	void ModelObject::setImage( const QImage& value )
 	{
 		// empty
 	}
@@ -657,7 +656,7 @@ namespace glabels
 	/// Virtual Image Property Default Setter
 	/// (Overridden by concrete class)
 	///
-	void LabelModelObject::setImage( const QString& name, const QImage& value )
+	void ModelObject::setImage( const QString& name, const QImage& value )
 	{
 		// empty
 	}
@@ -667,7 +666,7 @@ namespace glabels
 	/// Virtual SVG Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	QByteArray LabelModelObject::svg() const
+	QByteArray ModelObject::svg() const
 	{
 		return QByteArray();
 	}
@@ -677,7 +676,7 @@ namespace glabels
 	/// Virtual SVG Property Default Setter
 	/// (Overridden by concrete class)
 	///
-	void LabelModelObject::setSvg( const QString& name, const QByteArray& value )
+	void ModelObject::setSvg( const QString& name, const QByteArray& value )
 	{
 		// empty
 	}
@@ -687,7 +686,7 @@ namespace glabels
 	/// Virtual Line Width Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	Distance LabelModelObject::lineWidth() const
+	Distance ModelObject::lineWidth() const
 	{
 		return 0;
 	}
@@ -697,7 +696,7 @@ namespace glabels
 	/// Virtual Line Width Property Default Setter
 	/// (Overridden by concrete class)
 	///
-	void LabelModelObject::setLineWidth( const Distance& value )
+	void ModelObject::setLineWidth( const Distance& value )
 	{
 		// empty
 	}
@@ -707,7 +706,7 @@ namespace glabels
 	/// Virtual Line Color Node Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	ColorNode LabelModelObject::lineColorNode() const
+	ColorNode ModelObject::lineColorNode() const
 	{
 		return ColorNode( QColor::fromRgba(0x00000000) );
 	}
@@ -717,7 +716,7 @@ namespace glabels
 	/// Virtual Line Color Node Property Default Setter
 	/// (Overridden by concrete class)
 	///
-	void LabelModelObject::setLineColorNode( const ColorNode &value )
+	void ModelObject::setLineColorNode( const ColorNode &value )
 	{
 		// empty
 	}
@@ -727,7 +726,7 @@ namespace glabels
 	/// Virtual Fill Color Node Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	ColorNode LabelModelObject::fillColorNode() const
+	ColorNode ModelObject::fillColorNode() const
 	{
 		return ColorNode( QColor::fromRgba(0x00000000) );
 	}
@@ -737,7 +736,7 @@ namespace glabels
 	/// Virtual Fill Color Node Property Default Setter
 	/// (Overridden by concrete class)
 	///
-	void LabelModelObject::setFillColorNode( const ColorNode &value )
+	void ModelObject::setFillColorNode( const ColorNode &value )
 	{
 		// empty
 	}
@@ -747,7 +746,7 @@ namespace glabels
 	/// Virtual Barcode Data Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	QString LabelModelObject::bcData() const
+	QString ModelObject::bcData() const
 	{
 		return QString();
 	}
@@ -757,7 +756,7 @@ namespace glabels
 	/// Virtual Barcode Data Node Property Default Setter
 	/// (Overridden by concrete class)
 	///
-	void LabelModelObject::setBcData( const QString& value )
+	void ModelObject::setBcData( const QString& value )
 	{
 		// empty
 	}
@@ -767,7 +766,7 @@ namespace glabels
 	/// Virtual Barcode Text Flag Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	bool LabelModelObject::bcTextFlag() const
+	bool ModelObject::bcTextFlag() const
 	{
 		return false;
 	}
@@ -777,7 +776,7 @@ namespace glabels
 	/// Virtual Barcode Text Flag Property Default Setter
 	/// (Overridden by concrete class)
 	///
-	void LabelModelObject::setBcTextFlag( bool value )
+	void ModelObject::setBcTextFlag( bool value )
 	{
 		// empty
 	}
@@ -787,7 +786,7 @@ namespace glabels
 	/// Virtual Barcode Checksum Flag Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	bool LabelModelObject::bcChecksumFlag() const
+	bool ModelObject::bcChecksumFlag() const
 	{
 		return false;
 	}
@@ -797,7 +796,7 @@ namespace glabels
 	/// Virtual Barcode Checksum Flag Property Default Setter
 	/// (Overridden by concrete class)
 	///
-	void LabelModelObject::setBcChecksumFlag( bool value )
+	void ModelObject::setBcChecksumFlag( bool value )
 	{
 		// empty
 	}
@@ -807,7 +806,7 @@ namespace glabels
 	/// Virtual Barcode Color Node Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	ColorNode LabelModelObject::bcColorNode() const
+	ColorNode ModelObject::bcColorNode() const
 	{
 		return ColorNode( QColor::fromRgba(0x00000000) );
 	}
@@ -817,7 +816,7 @@ namespace glabels
 	/// Virtual Barcode Color Node Property Default Setter
 	/// (Overridden by concrete class)
 	///
-	void LabelModelObject::setBcColorNode( const ColorNode &value )
+	void ModelObject::setBcColorNode( const ColorNode &value )
 	{
 		// empty
 	}
@@ -827,9 +826,9 @@ namespace glabels
 	/// Virtual Barcode Style Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	BarcodeStyle LabelModelObject::bcStyle() const
+	barcode::Style ModelObject::bcStyle() const
 	{
-		return BarcodeStyle();
+		return barcode::Style();
 	}
 
 
@@ -837,7 +836,7 @@ namespace glabels
 	/// Virtual Barcode Style Property Default Setter
 	/// (Overridden by concrete class)
 	///
-	void LabelModelObject::setBcStyle( const BarcodeStyle &value )
+	void ModelObject::setBcStyle( const barcode::Style &value )
 	{
 		// empty
 	}
@@ -847,7 +846,7 @@ namespace glabels
 	/// Virtual Barcode Format Digits Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	int LabelModelObject::bcFormatDigits() const
+	int ModelObject::bcFormatDigits() const
 	{
 		return 0;
 	}
@@ -857,7 +856,7 @@ namespace glabels
 	/// Virtual Barcode Format Digits Property Default Setter
 	/// (Overridden by concrete class)
 	///
-	void LabelModelObject::setBcFormatDigits( int value )
+	void ModelObject::setBcFormatDigits( int value )
 	{
 		// empty
 	}
@@ -867,7 +866,7 @@ namespace glabels
 	/// Virtual Can Text Capability Read-Only Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	bool LabelModelObject::canText() const
+	bool ModelObject::canText() const
 	{
 		return false;
 	}
@@ -877,7 +876,7 @@ namespace glabels
 	/// Virtual Can Fill Capability Read-Only Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	bool LabelModelObject::canFill() const
+	bool ModelObject::canFill() const
 	{
 		return false;
 	}
@@ -887,7 +886,7 @@ namespace glabels
 	/// Virtual Can Line Color Capability Read-Only Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	bool LabelModelObject::canLineColor() const
+	bool ModelObject::canLineColor() const
 	{ 
 		return false;
 	}
@@ -897,7 +896,7 @@ namespace glabels
 	/// Virtual Can Line Width Capability Read-Only Property Default Getter
 	/// (Overridden by concrete class)
 	///
-	bool LabelModelObject::canLineWidth() const
+	bool ModelObject::canLineWidth() const
 	{
 		return false;
 	}
@@ -906,8 +905,8 @@ namespace glabels
 	///
 	/// Set Absolute Position
 	///
-	void LabelModelObject::setPosition( const Distance& x0,
-	                                    const Distance& y0 )
+	void ModelObject::setPosition( const Distance& x0,
+	                               const Distance& y0 )
 	{
 		if ( ( mX0 != x0 ) || ( mY0 != y0 ) )
 		{
@@ -922,8 +921,8 @@ namespace glabels
 	///
 	/// Set Relative Position
 	///
-	void LabelModelObject::setPositionRelative( const Distance& dx,
-	                                            const Distance& dy )
+	void ModelObject::setPositionRelative( const Distance& dx,
+	                                       const Distance& dy )
 	{
 		if ( ( dx != 0 ) || ( dy != 0 ) )
 		{
@@ -938,7 +937,7 @@ namespace glabels
 	///
 	/// Get Size
 	///
-	Size LabelModelObject::size() const
+	Size ModelObject::size() const
 	{
 		return Size( mW, mH );
 	}
@@ -947,8 +946,8 @@ namespace glabels
 	///
 	/// Set Size
 	///
-	void LabelModelObject::setSize( const Distance& w,
-	                                const Distance& h )
+	void ModelObject::setSize( const Distance& w,
+	                           const Distance& h )
 	{
 		mW = w;
 		mH = h;
@@ -961,7 +960,7 @@ namespace glabels
 	///
 	/// Set Size
 	///
-	void LabelModelObject::setSize( const Size& size )
+	void ModelObject::setSize( const Size& size )
 	{
 		mW = size.w();
 		mH = size.h();
@@ -974,8 +973,8 @@ namespace glabels
 	///
 	/// Set Size (But Maintain Current Aspect Ratio)
 	///
-	void LabelModelObject::setSizeHonorAspect( const Distance& w,
-	                                           const Distance& h )
+	void ModelObject::setSizeHonorAspect( const Distance& w,
+	                                      const Distance& h )
 	{
 		double aspectRatio = mH / mW;
 		Distance wNew = w;
@@ -997,7 +996,7 @@ namespace glabels
 	///
 	/// Set Width (But Maintain Current Aspect Ratio)
 	///
-	void LabelModelObject::setWHonorAspect( const Distance& w )
+	void ModelObject::setWHonorAspect( const Distance& w )
 	{
 		double aspectRatio = mH / mW;
 		Distance h = w * aspectRatio;
@@ -1016,7 +1015,7 @@ namespace glabels
 	///
 	/// Set Height (But Maintain Current Aspect Ratio)
 	///
-	void LabelModelObject::setHHonorAspect( const Distance& h )
+	void ModelObject::setHHonorAspect( const Distance& h )
 	{
 		double aspectRatio = mH / mW;
 		Distance w = h / aspectRatio;
@@ -1035,7 +1034,7 @@ namespace glabels
 	///
 	/// Get Extent of Bounding Box
 	///
-	Region LabelModelObject::getExtent()
+	Region ModelObject::getExtent()
 	{
 		QPointF a1( (   - lineWidth()/2).pt(), (   - lineWidth()/2).pt() );
 		QPointF a2( (mW + lineWidth()/2).pt(), (   - lineWidth()/2).pt() );
@@ -1060,7 +1059,7 @@ namespace glabels
 	///
 	/// Rotate Object
 	///
-	void LabelModelObject::rotate( double thetaDegs )
+	void ModelObject::rotate( double thetaDegs )
 	{
 		if ( thetaDegs != 0 )
 		{
@@ -1076,7 +1075,7 @@ namespace glabels
 	///
 	/// Flip Object Horizontally
 	///
-	void LabelModelObject::flipHoriz()
+	void ModelObject::flipHoriz()
 	{
 		QMatrix m;
 		m.scale( -1, 1 );
@@ -1089,7 +1088,7 @@ namespace glabels
 	///
 	/// Flip Object Vertically
 	///
-	void LabelModelObject::flipVert()
+	void ModelObject::flipVert()
 	{
 		QMatrix m;
 		m.scale( 1, -1 );
@@ -1102,9 +1101,9 @@ namespace glabels
 	///
 	/// Is this object located at x,y?
 	///
-	bool LabelModelObject::isLocatedAt( double          scale,
-	                                    const Distance& x,
-	                                    const Distance& y ) const
+	bool ModelObject::isLocatedAt( double          scale,
+	                               const Distance& x,
+	                               const Distance& y ) const
 	{
 		QPointF p( x.pt(), y.pt() );
 
@@ -1133,9 +1132,9 @@ namespace glabels
 	///
 	/// Is one of this object's handles locate at x,y?  If so, return it.
 	///
-	Handle* LabelModelObject::handleAt( double          scale,
-	                                    const Distance& x,
-	                                    const Distance& y ) const
+	Handle* ModelObject::handleAt( double          scale,
+	                               const Distance& x,
+	                               const Distance& y ) const
 	{
 		if ( mSelectedFlag )
 		{
@@ -1159,7 +1158,7 @@ namespace glabels
 	///
 	/// Draw object + shadow
 	///
-	void LabelModelObject::draw( QPainter* painter, bool inEditor, merge::Record* record ) const
+	void ModelObject::draw( QPainter* painter, bool inEditor, merge::Record* record ) const
 	{
 		painter->save();
 		painter->translate( mX0.pt(), mY0.pt() );
@@ -1183,7 +1182,7 @@ namespace glabels
 	///
 	/// Draw selection highlights
 	///
-	void LabelModelObject::drawSelectionHighlight( QPainter* painter, double scale ) const
+	void ModelObject::drawSelectionHighlight( QPainter* painter, double scale ) const
 	{
 		painter->save();
 
@@ -1207,9 +1206,9 @@ namespace glabels
 	///
 	/// Default sizeUpdated implementation.
 	///
-	void LabelModelObject::sizeUpdated()
+	void ModelObject::sizeUpdated()
 	{
 		// empty
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/LabelModelObject.h b/model/ModelObject.h
similarity index 90%
rename from glabels/LabelModelObject.h
rename to model/ModelObject.h
index 2ef30b5..313886a 100644
--- a/glabels/LabelModelObject.h
+++ b/model/ModelObject.h
@@ -1,4 +1,4 @@
-/*  LabelModelObject.h
+/*  ModelObject.h
  *
  *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
  *
@@ -18,18 +18,18 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LabelModelObject_h
-#define LabelModelObject_h
+#ifndef model_ModelObject_h
+#define model_ModelObject_h
 
 
-#include "BarcodeStyle.h"
 #include "ColorNode.h"
 #include "Distance.h"
 #include "Handles.h"
 #include "Outline.h"
 #include "TextNode.h"
 
-#include "Merge/Record.h"
+#include "barcode/Style.h"
+#include "merge/Record.h"
 
 #include <QObject>
 #include <QFont>
@@ -37,7 +37,7 @@
 #include <QPainter>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	// Forward References
@@ -48,7 +48,7 @@ namespace glabels
 	///
 	/// Label Model Object Base Class
 	///
-	class LabelModelObject : public QObject
+	class ModelObject : public QObject
 	{
 		Q_OBJECT
 
@@ -56,29 +56,29 @@ namespace glabels
 		// Lifecycle Methods
 		///////////////////////////////////////////////////////////////
 	protected:
-		LabelModelObject();
+		ModelObject();
 		
-		LabelModelObject( const Distance&  x0,
-		                  const Distance&  y0,
-		                  const Distance&  w,
-		                  const Distance&  h,
-		                  const QMatrix&   matrix = QMatrix(),
-		                  bool             shadowState = false,
-		                  const Distance&  shadowX = 0,
-		                  const Distance&  shadowY = 0,
-		                  double           shadowOpacity = 1.0,
-		                  const ColorNode& shadowColorNode = ColorNode() );
+		ModelObject( const Distance&  x0,
+		             const Distance&  y0,
+		             const Distance&  w,
+		             const Distance&  h,
+		             const QMatrix&   matrix = QMatrix(),
+		             bool             shadowState = false,
+		             const Distance&  shadowX = 0,
+		             const Distance&  shadowY = 0,
+		             double           shadowOpacity = 1.0,
+		             const ColorNode& shadowColorNode = ColorNode() );
 		
-		LabelModelObject( const LabelModelObject* object );
+		ModelObject( const ModelObject* object );
 		
 	public:
-		~LabelModelObject() override;
+		~ModelObject() override;
 
 
 		///////////////////////////////////////////////////////////////
 		// Object duplication
 		///////////////////////////////////////////////////////////////
-		virtual LabelModelObject* clone() const = 0;
+		virtual ModelObject* clone() const = 0;
 
 	
 		///////////////////////////////////////////////////////////////
@@ -342,8 +342,8 @@ namespace glabels
 		//
 		// Virtual Barcode Property: bcStyle
 		//
-		virtual BarcodeStyle bcStyle() const;
-		virtual void setBcStyle( const BarcodeStyle &value );
+		virtual barcode::Style bcStyle() const;
+		virtual void setBcStyle( const barcode::Style &value );
 		
 
 		//
@@ -433,4 +433,4 @@ namespace glabels
 }
 
 
-#endif // LabelModelObject_h
+#endif // model_ModelObject_h
diff --git a/glabels/LabelModelShapeObject.cpp b/model/ModelShapeObject.cpp
similarity index 61%
rename from glabels/LabelModelShapeObject.cpp
rename to model/ModelShapeObject.cpp
index 87efb46..f359af7 100644
--- a/glabels/LabelModelShapeObject.cpp
+++ b/model/ModelShapeObject.cpp
@@ -1,4 +1,4 @@
-/*  LabelModelShapeObject.cpp
+/*  ModelShapeObject.cpp
  *
  *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
  *
@@ -18,19 +18,19 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "LabelModelShapeObject.h"
+#include "ModelShapeObject.h"
 
 #include <QBrush>
 #include <QPen>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	///
 	/// Constructor
 	///
-	LabelModelShapeObject::LabelModelShapeObject()
+	ModelShapeObject::ModelShapeObject()
 	{
 		mOutline = new Outline( this );
 
@@ -52,22 +52,22 @@ namespace glabels
 	///
 	/// Constructor
 	///
-	LabelModelShapeObject::LabelModelShapeObject( const Distance&  x0,
-	                                              const Distance&  y0,
-	                                              const Distance&  w,
-	                                              const Distance&  h,
-	                                              const Distance&  lineWidth,
-	                                              const ColorNode& lineColorNode,
-	                                              const ColorNode& fillColorNode,
-	                                              const QMatrix&   matrix,
-	                                              bool             shadowState,
-	                                              const Distance&  shadowX,
-	                                              const Distance&  shadowY,
-	                                              double           shadowOpacity,
-	                                              const ColorNode& shadowColorNode )
-	: LabelModelObject( x0, y0, w, h,
-	                    matrix,
-	                    shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
+	ModelShapeObject::ModelShapeObject( const Distance&  x0,
+	                                    const Distance&  y0,
+	                                    const Distance&  w,
+	                                    const Distance&  h,
+	                                    const Distance&  lineWidth,
+	                                    const ColorNode& lineColorNode,
+	                                    const ColorNode& fillColorNode,
+	                                    const QMatrix&   matrix,
+	                                    bool             shadowState,
+	                                    const Distance&  shadowX,
+	                                    const Distance&  shadowY,
+	                                    double           shadowOpacity,
+	                                    const ColorNode& shadowColorNode )
+	: ModelObject( x0, y0, w, h,
+	               matrix,
+	               shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
 	{
 		mOutline = new Outline( this );
 
@@ -89,7 +89,7 @@ namespace glabels
 	///
 	/// Copy constructor
 	///
-	LabelModelShapeObject::LabelModelShapeObject( const LabelModelShapeObject* object ) : LabelModelObject(object)
+	ModelShapeObject::ModelShapeObject( const ModelShapeObject* object ) : ModelObject(object)
 	{
 		mLineWidth       = object->mLineWidth;
 		mLineColorNode   = object->mLineColorNode;
@@ -100,7 +100,7 @@ namespace glabels
 	///
 	/// Destructor
 	///
-	LabelModelShapeObject::~LabelModelShapeObject()
+	ModelShapeObject::~ModelShapeObject()
 	{
 		delete mOutline;
 
@@ -115,7 +115,7 @@ namespace glabels
 	///
 	/// Line Width Property Getter
 	///
-	Distance LabelModelShapeObject::lineWidth() const
+	Distance ModelShapeObject::lineWidth() const
 	{
 		return mLineWidth;
 	}
@@ -124,7 +124,7 @@ namespace glabels
 	///
 	/// Line Width Property Setter
 	///
-	void LabelModelShapeObject::setLineWidth( const Distance& value )
+	void ModelShapeObject::setLineWidth( const Distance& value )
 	{
 		if ( mLineWidth != value )
 		{
@@ -137,7 +137,7 @@ namespace glabels
 	///
 	/// Line Color Node Property Getter
 	///
-	ColorNode LabelModelShapeObject::lineColorNode() const
+	ColorNode ModelShapeObject::lineColorNode() const
 	{
 		return mLineColorNode;
 	}
@@ -146,7 +146,7 @@ namespace glabels
 	///
 	/// Line Color Node Property Setter
 	///
-	void LabelModelShapeObject::setLineColorNode( const ColorNode& value )
+	void ModelShapeObject::setLineColorNode( const ColorNode& value )
 	{
 		if ( mLineColorNode != value )
 		{
@@ -159,7 +159,7 @@ namespace glabels
 	///
 	/// Fill Color Node Property Getter
 	///
-	ColorNode LabelModelShapeObject::fillColorNode() const
+	ColorNode ModelShapeObject::fillColorNode() const
 	{
 		return mFillColorNode;
 	}
@@ -168,7 +168,7 @@ namespace glabels
 	///
 	/// Fill Color Node Property Setter
 	///
-	void LabelModelShapeObject::setFillColorNode( const ColorNode& value )
+	void ModelShapeObject::setFillColorNode( const ColorNode& value )
 	{
 		if ( mFillColorNode != value )
 		{
@@ -181,7 +181,7 @@ namespace glabels
 	///
 	/// Can Fill Capability Implementation
 	///
-	bool LabelModelShapeObject::canFill()
+	bool ModelShapeObject::canFill()
 	{
 		return true;
 	}
@@ -190,7 +190,7 @@ namespace glabels
 	///
 	/// Can Line Color Capability Implementation
 	///
-	bool LabelModelShapeObject::canLineColor()
+	bool ModelShapeObject::canLineColor()
 	{
 		return true;
 	}
@@ -199,9 +199,9 @@ namespace glabels
 	///
 	/// Can Line Width Capability Implementation
 	///
-	bool LabelModelShapeObject::canLineWidth()
+	bool ModelShapeObject::canLineWidth()
 	{
 		return true;
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/LabelModelShapeObject.h b/model/ModelShapeObject.h
similarity index 67%
rename from glabels/LabelModelShapeObject.h
rename to model/ModelShapeObject.h
index 64cb5b3..06f2bdf 100644
--- a/glabels/LabelModelShapeObject.h
+++ b/model/ModelShapeObject.h
@@ -1,4 +1,4 @@
-/*  LabelModelShapeObject.h
+/*  ModelShapeObject.h
  *
  *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
  *
@@ -18,20 +18,20 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LabelModelShapeObject_h
-#define LabelModelShapeObject_h
+#ifndef model_ModelShapeObject_h
+#define model_ModelShapeObject_h
 
 
-#include "LabelModelObject.h"
+#include "ModelObject.h"
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	///
 	/// Label Model Shape Object (Box or Ellipse)
 	///
-	class LabelModelShapeObject : public LabelModelObject
+	class ModelShapeObject : public ModelObject
 	{
 		Q_OBJECT
 
@@ -39,25 +39,25 @@ namespace glabels
 		// Lifecycle Methods
 		///////////////////////////////////////////////////////////////
 	protected:
-		LabelModelShapeObject();
+		ModelShapeObject();
 
-		LabelModelShapeObject( const Distance&  x0,
-		                       const Distance&  y0,
-		                       const Distance&  w,
-		                       const Distance&  h,
-		                       const Distance&  lineWidth,
-		                       const ColorNode& lineColorNode,
-		                       const ColorNode& fillColorNode,
-		                       const QMatrix&   matrix,
-		                       bool             shadowState,
-		                       const Distance&  shadowX,
-		                       const Distance&  shadowY,
-		                       double           shadowOpacity,
-		                       const ColorNode& shadowColorNode );
+		ModelShapeObject( const Distance&  x0,
+		                  const Distance&  y0,
+		                  const Distance&  w,
+		                  const Distance&  h,
+		                  const Distance&  lineWidth,
+		                  const ColorNode& lineColorNode,
+		                  const ColorNode& fillColorNode,
+		                  const QMatrix&   matrix,
+		                  bool             shadowState,
+		                  const Distance&  shadowX,
+		                  const Distance&  shadowY,
+		                  double           shadowOpacity,
+		                  const ColorNode& shadowColorNode );
 
-		LabelModelShapeObject( const LabelModelShapeObject* object );
+		ModelShapeObject( const ModelShapeObject* object );
 	public:
-		~LabelModelShapeObject() override;
+		~ModelShapeObject() override;
 
 
 		///////////////////////////////////////////////////////////////
@@ -107,4 +107,4 @@ namespace glabels
 }
 
 
-#endif // LabelModelShapeObject_h
+#endif // model_ModelShapeObject_h
diff --git a/glabels/LabelModelTextObject.cpp b/model/ModelTextObject.cpp
similarity index 74%
rename from glabels/LabelModelTextObject.cpp
rename to model/ModelTextObject.cpp
index b69c84d..df02622 100644
--- a/glabels/LabelModelTextObject.cpp
+++ b/model/ModelTextObject.cpp
@@ -1,4 +1,4 @@
-/*  LabelModelTextObject.cpp
+/*  ModelTextObject.cpp
  *
  *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
  *
@@ -18,7 +18,7 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "LabelModelTextObject.h"
+#include "ModelTextObject.h"
 
 #include "Size.h"
 
@@ -30,7 +30,7 @@
 #include <QtDebug>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	//
@@ -45,7 +45,7 @@ namespace glabels
 	///
 	/// Constructor
 	///
-	LabelModelTextObject::LabelModelTextObject()
+	ModelTextObject::ModelTextObject()
 	{
 		mOutline = new Outline( this );
 
@@ -74,29 +74,29 @@ namespace glabels
 	///
 	/// Constructor
 	///
-	LabelModelTextObject::LabelModelTextObject( const Distance&  x0,
-	                                            const Distance&  y0,
-	                                            const Distance&  w,
-	                                            const Distance&  h,
-	                                            const QString&   text,
-	                                            const QString&   fontFamily,
-	                                            double           fontSize,
-	                                            QFont::Weight    fontWeight,
-	                                            bool             fontItalicFlag,
-	                                            bool             fontUnderlineFlag,
-	                                            ColorNode        textColorNode,
-	                                            Qt::Alignment    textHAlign,
-	                                            Qt::Alignment    textVAlign,
-	                                            double           textLineSpacing,
-	                                            const QMatrix&   matrix,
-	                                            bool             shadowState,
-	                                            const Distance&  shadowX,
-	                                            const Distance&  shadowY,
-	                                            double           shadowOpacity,
-	                                            const ColorNode& shadowColorNode )
-	: LabelModelObject( x0, y0, w, h,
-	                    matrix,
-	                    shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
+	ModelTextObject::ModelTextObject( const Distance&  x0,
+	                                  const Distance&  y0,
+	                                  const Distance&  w,
+	                                  const Distance&  h,
+	                                  const QString&   text,
+	                                  const QString&   fontFamily,
+	                                  double           fontSize,
+	                                  QFont::Weight    fontWeight,
+	                                  bool             fontItalicFlag,
+	                                  bool             fontUnderlineFlag,
+	                                  ColorNode        textColorNode,
+	                                  Qt::Alignment    textHAlign,
+	                                  Qt::Alignment    textVAlign,
+	                                  double           textLineSpacing,
+	                                  const QMatrix&   matrix,
+	                                  bool             shadowState,
+	                                  const Distance&  shadowX,
+	                                  const Distance&  shadowY,
+	                                  double           shadowOpacity,
+	                                  const ColorNode& shadowColorNode )
+	: ModelObject( x0, y0, w, h,
+	               matrix,
+	               shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode )
 	{
 		mOutline = new Outline( this );
 
@@ -127,8 +127,8 @@ namespace glabels
 	///
 	/// Copy constructor
 	///
-	LabelModelTextObject::LabelModelTextObject( const LabelModelTextObject* object )
-		: LabelModelObject(object)
+	ModelTextObject::ModelTextObject( const ModelTextObject* object )
+		: ModelObject(object)
 	{
 		mText              = object->mText;
 		mFontFamily        = object->mFontFamily;
@@ -148,7 +148,7 @@ namespace glabels
 	///
 	/// Destructor
 	///
-	LabelModelTextObject::~LabelModelTextObject()
+	ModelTextObject::~ModelTextObject()
 	{
 		delete mOutline;
 
@@ -163,16 +163,16 @@ namespace glabels
 	///
 	/// Clone
 	///
-	LabelModelTextObject* LabelModelTextObject::clone() const
+	ModelTextObject* ModelTextObject::clone() const
 	{
-		return new LabelModelTextObject( this );
+		return new ModelTextObject( this );
 	}
 
 
 	///
 	/// Text Property Getter
 	///
-	QString LabelModelTextObject::text() const
+	QString ModelTextObject::text() const
 	{
 		return mText.toString();
 	}
@@ -181,7 +181,7 @@ namespace glabels
 	///
 	/// Text Property Setter
 	///
-	void LabelModelTextObject::setText( const QString& value )
+	void ModelTextObject::setText( const QString& value )
 	{
 		if ( mText.toString() != value )
 		{
@@ -195,7 +195,7 @@ namespace glabels
 	///
 	/// FontFamily Property Getter
 	///
-	QString LabelModelTextObject::fontFamily() const
+	QString ModelTextObject::fontFamily() const
 	{
 		return mFontFamily;
 	}
@@ -204,7 +204,7 @@ namespace glabels
 	///
 	/// FontFamily Property Setter
 	///
-	void LabelModelTextObject::setFontFamily( const QString& value )
+	void ModelTextObject::setFontFamily( const QString& value )
 	{
 		if ( mFontFamily != value )
 		{
@@ -218,7 +218,7 @@ namespace glabels
 	///
 	/// FontSize Property Getter
 	///
-	double LabelModelTextObject::fontSize() const
+	double ModelTextObject::fontSize() const
 	{
 		return mFontSize;
 	}
@@ -227,7 +227,7 @@ namespace glabels
 	///
 	/// FontSize Property Setter
 	///
-	void LabelModelTextObject::setFontSize( double value )
+	void ModelTextObject::setFontSize( double value )
 	{
 		if ( mFontSize != value )
 		{
@@ -241,7 +241,7 @@ namespace glabels
 	///
 	/// FontWeight Property Getter
 	///
-	QFont::Weight LabelModelTextObject::fontWeight() const
+	QFont::Weight ModelTextObject::fontWeight() const
 	{
 		return mFontWeight;
 	}
@@ -250,7 +250,7 @@ namespace glabels
 	///
 	/// FontWeight Property Setter
 	///
-	void LabelModelTextObject::setFontWeight( QFont::Weight value )
+	void ModelTextObject::setFontWeight( QFont::Weight value )
 	{
 		if ( mFontWeight != value )
 		{
@@ -264,7 +264,7 @@ namespace glabels
 	///
 	/// FontItalicFlag Property Getter
 	///
-	bool LabelModelTextObject::fontItalicFlag() const
+	bool ModelTextObject::fontItalicFlag() const
 	{
 		return mFontItalicFlag;
 	}
@@ -273,7 +273,7 @@ namespace glabels
 	///
 	/// FontItalicFlag Property Setter
 	///
-	void LabelModelTextObject::setFontItalicFlag( bool value )
+	void ModelTextObject::setFontItalicFlag( bool value )
 	{
 		if ( mFontItalicFlag != value )
 		{
@@ -287,7 +287,7 @@ namespace glabels
 	///
 	/// FontUnderlineFlag Property Getter
 	///
-	bool LabelModelTextObject::fontUnderlineFlag() const
+	bool ModelTextObject::fontUnderlineFlag() const
 	{
 		return mFontUnderlineFlag;
 	}
@@ -296,7 +296,7 @@ namespace glabels
 	///
 	/// FontUnderlineFlag Property Setter
 	///
-	void LabelModelTextObject::setFontUnderlineFlag( bool value )
+	void ModelTextObject::setFontUnderlineFlag( bool value )
 	{
 		if ( mFontUnderlineFlag != value )
 		{
@@ -310,7 +310,7 @@ namespace glabels
 	///
 	/// Text Color Node Property Getter
 	///
-	ColorNode LabelModelTextObject::textColorNode() const
+	ColorNode ModelTextObject::textColorNode() const
 	{
 		return mTextColorNode;
 	}
@@ -319,7 +319,7 @@ namespace glabels
 	///
 	/// Text Color Node Property Setter
 	///
-	void LabelModelTextObject::setTextColorNode( const ColorNode& value )
+	void ModelTextObject::setTextColorNode( const ColorNode& value )
 	{
 		if ( mTextColorNode != value )
 		{
@@ -333,7 +333,7 @@ namespace glabels
 	///
 	/// TextHAlign Property Getter
 	///
-	Qt::Alignment LabelModelTextObject::textHAlign() const
+	Qt::Alignment ModelTextObject::textHAlign() const
 	{
 		return mTextHAlign;
 	}
@@ -342,7 +342,7 @@ namespace glabels
 	///
 	/// TextHAlign Property Setter
 	///
-	void LabelModelTextObject::setTextHAlign( Qt::Alignment value )
+	void ModelTextObject::setTextHAlign( Qt::Alignment value )
 	{
 		if ( mTextHAlign != value )
 		{
@@ -356,7 +356,7 @@ namespace glabels
 	///
 	/// TextVAlign Property Getter
 	///
-	Qt::Alignment LabelModelTextObject::textVAlign() const
+	Qt::Alignment ModelTextObject::textVAlign() const
 	{
 		return mTextVAlign;
 	}
@@ -365,7 +365,7 @@ namespace glabels
 	///
 	/// TextVAlign Property Setter
 	///
-	void LabelModelTextObject::setTextVAlign( Qt::Alignment value )
+	void ModelTextObject::setTextVAlign( Qt::Alignment value )
 	{
 		if ( mTextVAlign != value )
 		{
@@ -379,7 +379,7 @@ namespace glabels
 	///
 	/// TextLineSpacing Property Getter
 	///
-	double LabelModelTextObject::textLineSpacing() const
+	double ModelTextObject::textLineSpacing() const
 	{
 		return mTextLineSpacing;
 	}
@@ -388,7 +388,7 @@ namespace glabels
 	///
 	/// TextLineSpacing Property Setter
 	///
-	void LabelModelTextObject::setTextLineSpacing( double value )
+	void ModelTextObject::setTextLineSpacing( double value )
 	{
 		if ( mTextLineSpacing != value )
 		{
@@ -402,7 +402,7 @@ namespace glabels
 	///
 	/// NaturalSize Property Getter
 	///
-	Size LabelModelTextObject::naturalSize() const
+	Size ModelTextObject::naturalSize() const
 	{
 		QFont font;
 		font.setFamily( mFontFamily );
@@ -451,7 +451,7 @@ namespace glabels
 	///
 	/// Can Text Capability Implementation
 	///
-	bool LabelModelTextObject::canText()
+	bool ModelTextObject::canText()
 	{
 		return true;
 	}
@@ -460,9 +460,9 @@ namespace glabels
 	///
 	/// Draw shadow of object
 	///
-	void LabelModelTextObject::drawShadow( QPainter*      painter,
-	                                       bool           inEditor,
-	                                       merge::Record* record ) const
+	void ModelTextObject::drawShadow( QPainter*      painter,
+	                                  bool           inEditor,
+	                                  merge::Record* record ) const
 	{
 		QColor textColor = mTextColorNode.color( record );
 
@@ -486,9 +486,9 @@ namespace glabels
 	///
 	/// Draw object itself
 	///
-	void LabelModelTextObject::drawObject( QPainter*      painter,
-	                                       bool           inEditor,
-	                                       merge::Record* record ) const
+	void ModelTextObject::drawObject( QPainter*      painter,
+	                                  bool           inEditor,
+	                                  merge::Record* record ) const
 	{
 		QColor textColor = mTextColorNode.color( record );
 
@@ -506,7 +506,7 @@ namespace glabels
 	///
 	/// Path to test for hover condition
 	///
-	QPainterPath LabelModelTextObject::hoverPath( double scale ) const
+	QPainterPath ModelTextObject::hoverPath( double scale ) const
 	{
 		return mHoverPath;
 	}
@@ -515,7 +515,7 @@ namespace glabels
 	///
 	/// Size updated
 	///
-	void LabelModelTextObject::sizeUpdated()
+	void ModelTextObject::sizeUpdated()
 	{
 		update();
 	}
@@ -524,7 +524,7 @@ namespace glabels
 	///
 	/// Update cached information for editor view
 	///
-	void LabelModelTextObject::update()
+	void ModelTextObject::update()
 	{
 		QFont font;
 		font.setFamily( mFontFamily );
@@ -608,7 +608,7 @@ namespace glabels
 	///
 	/// Draw text in editor from cached information
 	///
-	void LabelModelTextObject::drawTextInEditor( QPainter* painter, const QColor& color ) const
+	void ModelTextObject::drawTextInEditor( QPainter* painter, const QColor& color ) const
 	{
 		if ( mText.isEmpty() )
 		{
@@ -632,9 +632,9 @@ namespace glabels
 	/// Draw text in final printout or preview
 	///
 	void
-	LabelModelTextObject::drawText( QPainter*      painter,
-	                                const QColor&  color,
-	                                merge::Record* record ) const
+	ModelTextObject::drawText( QPainter*      painter,
+	                           const QColor&  color,
+	                           merge::Record* record ) const
 	{
 		QFont font;
 		font.setFamily( mFontFamily );
@@ -717,4 +717,4 @@ namespace glabels
 		qDeleteAll( layouts );
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/LabelModelTextObject.h b/model/ModelTextObject.h
similarity index 75%
rename from glabels/LabelModelTextObject.h
rename to model/ModelTextObject.h
index 1ef5446..fab6753 100644
--- a/glabels/LabelModelTextObject.h
+++ b/model/ModelTextObject.h
@@ -1,4 +1,4 @@
-/*  LabelModelTextObject.h
+/*  ModelTextObject.h
  *
  *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
  *
@@ -18,23 +18,23 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LabelModelTextObject_h
-#define LabelModelTextObject_h
+#ifndef model_ModelTextObject_h
+#define model_ModelTextObject_h
 
 
-#include "LabelModelObject.h"
+#include "ModelObject.h"
 #include "RawText.h"
 
 #include <QTextLayout>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	///
 	/// Label Model Line Object
 	///
-	class LabelModelTextObject : public LabelModelObject
+	class ModelTextObject : public ModelObject
 	{
 		Q_OBJECT
 
@@ -42,38 +42,38 @@ namespace glabels
 		// Lifecycle Methods
 		///////////////////////////////////////////////////////////////
 	public:
-		LabelModelTextObject();
+		ModelTextObject();
 		
-		LabelModelTextObject( const Distance&  x0,
-		                      const Distance&  y0,
-		                      const Distance&  w,
-		                      const Distance&  h,
-		                      const QString&   text,
-		                      const QString&   fontFamily,
-		                      double           fontSize,
-		                      QFont::Weight    fontWeight,
-		                      bool             fontItalicFlag,
-		                      bool             fontUnderlineFlag,
-		                      ColorNode        textColorNode,
-		                      Qt::Alignment    textHAlign,
-		                      Qt::Alignment    textVAlign,
-		                      double           textLineSpacing,
-		                      const QMatrix&   matrix = QMatrix(),
-		                      bool             shadowState = false,
-		                      const Distance&  shadowX = 0,
-		                      const Distance&  shadowY = 0,
-		                      double           shadowOpacity = 1.0,
-		                      const ColorNode& shadowColorNode = ColorNode() );
+		ModelTextObject( const Distance&  x0,
+		                 const Distance&  y0,
+		                 const Distance&  w,
+		                 const Distance&  h,
+		                 const QString&   text,
+		                 const QString&   fontFamily,
+		                 double           fontSize,
+		                 QFont::Weight    fontWeight,
+		                 bool             fontItalicFlag,
+		                 bool             fontUnderlineFlag,
+		                 ColorNode        textColorNode,
+		                 Qt::Alignment    textHAlign,
+		                 Qt::Alignment    textVAlign,
+		                 double           textLineSpacing,
+		                 const QMatrix&   matrix = QMatrix(),
+		                 bool             shadowState = false,
+		                 const Distance&  shadowX = 0,
+		                 const Distance&  shadowY = 0,
+		                 double           shadowOpacity = 1.0,
+		                 const ColorNode& shadowColorNode = ColorNode() );
 
-		LabelModelTextObject( const LabelModelTextObject* object );
+		ModelTextObject( const ModelTextObject* object );
 		
-		~LabelModelTextObject() override;
+		~ModelTextObject() override;
 
 
 		///////////////////////////////////////////////////////////////
 		// Object duplication
 		///////////////////////////////////////////////////////////////
-		LabelModelTextObject* clone() const override;
+		ModelTextObject* clone() const override;
 
 
 		///////////////////////////////////////////////////////////////
@@ -206,4 +206,4 @@ namespace glabels
 }
 
 
-#endif // LabelModelTextObject_h
+#endif // model_ModelTextObject_h
diff --git a/glabels/Outline.cpp b/model/Outline.cpp
similarity index 91%
rename from glabels/Outline.cpp
rename to model/Outline.cpp
index 6a2db20..0727f3b 100644
--- a/glabels/Outline.cpp
+++ b/model/Outline.cpp
@@ -20,12 +20,12 @@
 
 #include "Outline.h"
 
-#include "LabelModelObject.h"
+#include "ModelObject.h"
 
 #include <QColor>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	//
@@ -45,7 +45,7 @@ namespace glabels
 	///
 	/// Outline Constructor
 	///
-	Outline::Outline( LabelModelObject* owner )
+	Outline::Outline( ModelObject* owner )
 		: mOwner(owner)
 	{
 		mDashes << dashSize << dashSize;
@@ -68,7 +68,7 @@ namespace glabels
 	///
 	/// Outline Copy constructor
 	///
-	Outline::Outline( const Outline* outline, LabelModelObject* newOwner )
+	Outline::Outline( const Outline* outline, ModelObject* newOwner )
 		: mOwner(newOwner)
 	{
 		mDashes = outline->mDashes;
@@ -89,7 +89,7 @@ namespace glabels
 	///
 	/// Clone Outline
 	///
-	Outline* Outline::clone( LabelModelObject* newOwner ) const
+	Outline* Outline::clone( ModelObject* newOwner ) const
 	{
 		return new Outline( this, newOwner );
 	}
@@ -132,4 +132,4 @@ namespace glabels
 		return path;
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/Outline.h b/model/Outline.h
similarity index 83%
rename from glabels/Outline.h
rename to model/Outline.h
index 6fa2258..ae2c596 100644
--- a/glabels/Outline.h
+++ b/model/Outline.h
@@ -18,19 +18,19 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef Outline_h
-#define Outline_h
+#ifndef model_Outline_h
+#define model_Outline_h
 
 
 #include <QPainter>
 #include <QPainterPath>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	// Forward references
-	class LabelModelObject;
+	class ModelObject;
 
 
 	///
@@ -42,15 +42,15 @@ namespace glabels
 		// Lifecycle Methods
 		////////////////////////////
 	public:
-		Outline( LabelModelObject* owner );
-		Outline( const Outline* outline, LabelModelObject* newOwner );
+		Outline( ModelObject* owner );
+		Outline( const Outline* outline, ModelObject* newOwner );
 		virtual ~Outline();
 
 	
 		////////////////////////////
 		// Duplication
 		////////////////////////////
-		Outline* clone( LabelModelObject* newOwner ) const;
+		Outline* clone( ModelObject* newOwner ) const;
 
 
 		////////////////////////////
@@ -65,7 +65,7 @@ namespace glabels
 		// Private Data
 		////////////////////////////
 	private:
-		LabelModelObject* mOwner;
+		ModelObject* mOwner;
 
 		QVector<qreal> mDashes;
 		QPen           mPen1;
@@ -76,4 +76,4 @@ namespace glabels
 }
 
 
-#endif // Outline_h
+#endif // model_Outline_h
diff --git a/glabels/PageRenderer.cpp b/model/PageRenderer.cpp
similarity index 96%
rename from glabels/PageRenderer.cpp
rename to model/PageRenderer.cpp
index 2ee1c68..29fd7db 100644
--- a/glabels/PageRenderer.cpp
+++ b/model/PageRenderer.cpp
@@ -20,16 +20,16 @@
 
 #include "PageRenderer.h"
 
-#include "LabelModel.h"
+#include "Model.h"
 
-#include "Merge/Merge.h"
-#include "Merge/None.h"
-#include "Merge/Record.h"
+#include "merge/Merge.h"
+#include "merge/None.h"
+#include "merge/Record.h"
 
 #include <QtDebug>
 
 
-namespace glabels
+namespace glabels::model
 {
 	
 	//
@@ -44,7 +44,7 @@ namespace glabels
 	}
 
 
-	PageRenderer::PageRenderer( const LabelModel* model )
+	PageRenderer::PageRenderer( const Model* model )
 		: mModel(nullptr), mNCopies(0), mStartLabel(0),
 		  mPrintOutlines(false), mPrintCropMarks(false), mPrintReverse(false),
 		  mIPage(0), mIsMerge(false), mNPages(0)
@@ -56,7 +56,7 @@ namespace glabels
 	}
 
 
-	void PageRenderer::setModel( const LabelModel* model )
+	void PageRenderer::setModel( const Model* model )
 	{
 		mModel = model;
 
@@ -66,7 +66,7 @@ namespace glabels
 	}
 
 	
-	const LabelModel* PageRenderer::model() const
+	const Model* PageRenderer::model() const
 	{
 		return mModel;
 	}
@@ -426,4 +426,4 @@ namespace glabels
 		painter->restore();
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/PageRenderer.h b/model/PageRenderer.h
similarity index 89%
rename from glabels/PageRenderer.h
rename to model/PageRenderer.h
index 8189c67..ea9694b 100644
--- a/glabels/PageRenderer.h
+++ b/model/PageRenderer.h
@@ -18,14 +18,14 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PageRenderer_h
-#define PageRenderer_h
+#ifndef model_PageRenderer_h
+#define model_PageRenderer_h
 
 
 #include "Point.h"
 
-#include "Merge/Merge.h"
-#include "Merge/Record.h"
+#include "merge/Merge.h"
+#include "merge/Record.h"
 
 #include <QPainter>
 #include <QPrinter>
@@ -33,11 +33,11 @@
 #include <QVector>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	// Forward references
-	class LabelModel;
+	class Model;
 
 
 	///
@@ -51,15 +51,15 @@ namespace glabels
 		// Life Cycle
 		/////////////////////////////////
 	public:
-		PageRenderer( const LabelModel* model = nullptr );
+		PageRenderer( const Model* model = nullptr );
 
 
 		/////////////////////////////////
 		// Public Methods
 		/////////////////////////////////
 	public:
-		void setModel( const LabelModel* model );
-		const LabelModel* model() const;
+		void setModel( const Model* model );
+		const Model* model() const;
 		void setNCopies( int nCopies );
 		void setStartLabel( int startLabel );
 		void setPrintOutlines( bool printOutlinesFlag );
@@ -105,7 +105,7 @@ namespace glabels
 		// Private Data
 		/////////////////////////////////
 	private:
-		const LabelModel*   mModel;
+		const Model*        mModel;
 		const merge::Merge* mMerge;
 	
 		int               mNCopies;
@@ -126,4 +126,4 @@ namespace glabels
 }
 
 
-#endif // PageRenderer_h
+#endif // model_PageRenderer_h
diff --git a/glabels/Paper.cpp b/model/Paper.cpp
similarity index 96%
rename from glabels/Paper.cpp
rename to model/Paper.cpp
index eebe081..b6d69ef 100644
--- a/glabels/Paper.cpp
+++ b/model/Paper.cpp
@@ -21,7 +21,7 @@
 #include "Paper.h"
 
 
-namespace glabels
+namespace glabels::model
 {
 	
 	Paper::Paper( const QString&  id,
@@ -76,4 +76,4 @@ namespace glabels
 		return mPwgSize.startsWith( "na_" );
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/Paper.h b/model/Paper.h
similarity index 93%
rename from glabels/Paper.h
rename to model/Paper.h
index 749e87e..55fb990 100644
--- a/glabels/Paper.h
+++ b/model/Paper.h
@@ -18,8 +18,8 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_Paper_h
-#define glabels_Paper_h
+#ifndef model_Paper_h
+#define model_Paper_h
 
 
 #include "Distance.h"
@@ -27,7 +27,7 @@
 #include <QString>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	class Paper
@@ -65,4 +65,4 @@ namespace glabels
 }
 
 
-#endif // glabels_Paper_h
+#endif // model_Paper_h
diff --git a/glabels/Point.cpp b/model/Point.cpp
similarity index 95%
rename from glabels/Point.cpp
rename to model/Point.cpp
index efdc75b..c24af07 100644
--- a/glabels/Point.cpp
+++ b/model/Point.cpp
@@ -21,7 +21,7 @@
 #include "Point.h"
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	Point::Point() : mX(Distance(0)), mY(Distance(0))
@@ -61,4 +61,4 @@ namespace glabels
 		return false;
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/Point.h b/model/Point.h
similarity index 91%
rename from glabels/Point.h
rename to model/Point.h
index ff23a6c..89d2ffe 100644
--- a/glabels/Point.h
+++ b/model/Point.h
@@ -18,14 +18,14 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_Point_h
-#define glabels_Point_h
+#ifndef model_Point_h
+#define model_Point_h
 
 
 #include "Distance.h"
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	class Point
@@ -49,4 +49,4 @@ namespace glabels
 }
 
 
-#endif // glabels_Point_h
+#endif // model_Point_h
diff --git a/glabels/RawText.cpp b/model/RawText.cpp
similarity index 97%
rename from glabels/RawText.cpp
rename to model/RawText.cpp
index 5e31371..e15390e 100644
--- a/glabels/RawText.cpp
+++ b/model/RawText.cpp
@@ -22,7 +22,7 @@
 
 #include <QRegularExpression>
 
-namespace glabels
+namespace glabels::model
 {
 
 	///
@@ -146,4 +146,4 @@ namespace glabels
 	}
 
 	
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/RawText.h b/model/RawText.h
similarity index 94%
rename from glabels/RawText.h
rename to model/RawText.h
index baac1ec..b747b8f 100644
--- a/glabels/RawText.h
+++ b/model/RawText.h
@@ -18,8 +18,8 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RawText_h
-#define RawText_h
+#ifndef model_RawText_h
+#define model_RawText_h
 
 
 #include "SubstitutionField.h"
@@ -27,7 +27,7 @@
 #include <QString>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	///
@@ -81,4 +81,4 @@ namespace glabels
 }
 
 
-#endif // RawText_h
+#endif // model_RawText_h
diff --git a/glabels/Region.cpp b/model/Region.cpp
similarity index 97%
rename from glabels/Region.cpp
rename to model/Region.cpp
index 1559bd9..ed5a93d 100644
--- a/glabels/Region.cpp
+++ b/model/Region.cpp
@@ -21,7 +21,7 @@
 #include "Region.h"
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	///
@@ -131,4 +131,4 @@ namespace glabels
 		return r;
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/Region.h b/model/Region.h
similarity index 95%
rename from glabels/Region.h
rename to model/Region.h
index 3af9c15..5268ad1 100644
--- a/glabels/Region.h
+++ b/model/Region.h
@@ -18,8 +18,8 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef Region_h
-#define Region_h
+#ifndef model_Region_h
+#define model_Region_h
 
 
 #include "Distance.h"
@@ -27,7 +27,7 @@
 #include <QRectF>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	///
@@ -98,4 +98,4 @@ namespace glabels
 }
 
 
-#endif // Region_h
+#endif // model_Region_h
diff --git a/glabels/Settings.cpp b/model/Settings.cpp
similarity index 98%
rename from glabels/Settings.cpp
rename to model/Settings.cpp
index 36551c3..6b84063 100644
--- a/glabels/Settings.cpp
+++ b/model/Settings.cpp
@@ -25,7 +25,7 @@
 #include <QtDebug>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	//
@@ -258,4 +258,4 @@ namespace glabels
 		emit mInstance->changed();
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/Settings.h b/model/Settings.h
similarity index 95%
rename from glabels/Settings.h
rename to model/Settings.h
index 55e2a90..f303003 100644
--- a/glabels/Settings.h
+++ b/model/Settings.h
@@ -18,8 +18,8 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef Settings_h
-#define Settings_h
+#ifndef model_Settings_h
+#define model_Settings_h
 
 
 #include "Distance.h"
@@ -28,7 +28,7 @@
 #include <QStringList>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	///
@@ -94,4 +94,4 @@ namespace glabels
 }
 
 
-#endif // Settings_h
+#endif // model_Settings_h
diff --git a/glabels/Size.cpp b/model/Size.cpp
similarity index 96%
rename from glabels/Size.cpp
rename to model/Size.cpp
index a567881..e104d77 100644
--- a/glabels/Size.cpp
+++ b/model/Size.cpp
@@ -21,7 +21,7 @@
 #include "Size.h"
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	///
@@ -91,4 +91,4 @@ namespace glabels
 		return s;
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/Size.h b/model/Size.h
similarity index 94%
rename from glabels/Size.h
rename to model/Size.h
index 761f856..db3ab8e 100644
--- a/glabels/Size.h
+++ b/model/Size.h
@@ -18,8 +18,8 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef Size_h
-#define Size_h
+#ifndef model_Size_h
+#define model_Size_h
 
 
 #include "Distance.h"
@@ -27,7 +27,7 @@
 #include <QSizeF>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	///
@@ -81,4 +81,4 @@ namespace glabels
 }
 
 
-#endif // Size_h
+#endif // model_Size_h
diff --git a/glabels/StrUtil.cpp b/model/StrUtil.cpp
similarity index 99%
rename from glabels/StrUtil.cpp
rename to model/StrUtil.cpp
index dd59323..76d2285 100644
--- a/glabels/StrUtil.cpp
+++ b/model/StrUtil.cpp
@@ -23,7 +23,7 @@
 #include <QtMath>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	//
@@ -208,4 +208,4 @@ namespace glabels
 	}
 
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/StrUtil.h b/model/StrUtil.h
similarity index 90%
rename from glabels/StrUtil.h
rename to model/StrUtil.h
index dd6ce74..3e4f3ec 100644
--- a/glabels/StrUtil.h
+++ b/model/StrUtil.h
@@ -18,14 +18,14 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_StrUtil_h
-#define glabels_StrUtil_h
+#ifndef model_StrUtil_h
+#define model_StrUtil_h
 
 
 #include <QString>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	namespace StrUtil
@@ -40,4 +40,4 @@ namespace glabels
 }
 
 
-#endif // glabels_StrUtil_h
+#endif // model_StrUtil_h
diff --git a/glabels/SubstitutionField.cpp b/model/SubstitutionField.cpp
similarity index 99%
rename from glabels/SubstitutionField.cpp
rename to model/SubstitutionField.cpp
index 5ccd03f..a1385b9 100644
--- a/glabels/SubstitutionField.cpp
+++ b/model/SubstitutionField.cpp
@@ -23,7 +23,7 @@
 #include <QTextStream>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	SubstitutionField::SubstitutionField()
@@ -328,4 +328,4 @@ namespace glabels
 	}
 	
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/SubstitutionField.h b/model/SubstitutionField.h
similarity index 93%
rename from glabels/SubstitutionField.h
rename to model/SubstitutionField.h
index dbd49e4..2f8c943 100644
--- a/glabels/SubstitutionField.h
+++ b/model/SubstitutionField.h
@@ -18,17 +18,17 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_SubstitutionField_h
-#define glabels_SubstitutionField_h
+#ifndef model_SubstitutionField_h
+#define model_SubstitutionField_h
 
 
-#include "Merge/Record.h"
+#include "merge/Record.h"
 
 #include <QString>
 #include <QStringRef>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	class SubstitutionField
@@ -74,4 +74,4 @@ namespace glabels
 }
 
 
-#endif // glabels_SubstitutionField_h
+#endif // model_SubstitutionField_h
diff --git a/glabels/Template.cpp b/model/Template.cpp
similarity index 98%
rename from glabels/Template.cpp
rename to model/Template.cpp
index 5b7d29e..52daf12 100644
--- a/glabels/Template.cpp
+++ b/model/Template.cpp
@@ -25,7 +25,7 @@
 #include <QtDebug>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	Template::Template( const QString&  brand,
@@ -285,4 +285,4 @@ namespace glabels
 	}
 
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/Template.h b/model/Template.h
similarity index 95%
rename from glabels/Template.h
rename to model/Template.h
index fbf156f..2495de5 100644
--- a/glabels/Template.h
+++ b/model/Template.h
@@ -18,13 +18,12 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_Template_h
-#define glabels_Template_h
+#ifndef model_Template_h
+#define model_Template_h
 
 
 #include "Distance.h"
 #include "Frame.h"
-#include "MiniPreviewPixmap.h"
 #include "Point.h"
 
 #include <QCoreApplication>
@@ -33,7 +32,7 @@
 #include <QList>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	class Template
@@ -115,4 +114,4 @@ namespace glabels
 }
 
 
-#endif // glabels_Template_h
+#endif // model_Template_h
diff --git a/glabels/TextNode.cpp b/model/TextNode.cpp
similarity index 97%
rename from glabels/TextNode.cpp
rename to model/TextNode.cpp
index f5c45fa..54ddf70 100644
--- a/glabels/TextNode.cpp
+++ b/model/TextNode.cpp
@@ -21,7 +21,7 @@
 #include "TextNode.h"
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	///
@@ -146,4 +146,4 @@ namespace glabels
 		return false;
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/TextNode.h b/model/TextNode.h
similarity index 93%
rename from glabels/TextNode.h
rename to model/TextNode.h
index 82e52e5..e2e2e6f 100644
--- a/glabels/TextNode.h
+++ b/model/TextNode.h
@@ -18,16 +18,16 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TextNode_h
-#define TextNode_h
+#ifndef model_TextNode_h
+#define model_TextNode_h
 
 
-#include "Merge/Record.h"
+#include "merge/Record.h"
 
 #include <QString>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	///
@@ -91,4 +91,4 @@ namespace glabels
 }
 
 
-#endif // TextNode_h
+#endif // model_TextNode_h
diff --git a/glabels/Units.cpp b/model/Units.cpp
similarity index 98%
rename from glabels/Units.cpp
rename to model/Units.cpp
index b88757b..74ce06f 100644
--- a/glabels/Units.cpp
+++ b/model/Units.cpp
@@ -24,7 +24,7 @@
 #include <QtDebug>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 
@@ -256,4 +256,4 @@ namespace glabels
 	}
 
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/Units.h b/model/Units.h
similarity index 93%
rename from glabels/Units.h
rename to model/Units.h
index c0f48d7..2d364bd 100644
--- a/glabels/Units.h
+++ b/model/Units.h
@@ -18,15 +18,15 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_Units_h
-#define glabels_Units_h
+#ifndef model_Units_h
+#define model_Units_h
 
 
 #include <QCoreApplication>
 #include <QString>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 
@@ -66,4 +66,4 @@ namespace glabels
 }
 
 
-#endif // glabels_Units_h
+#endif // model_Units_h
diff --git a/glabels/Vendor.cpp b/model/Vendor.cpp
similarity index 94%
rename from glabels/Vendor.cpp
rename to model/Vendor.cpp
index 3f9a71e..2351643 100644
--- a/glabels/Vendor.cpp
+++ b/model/Vendor.cpp
@@ -21,7 +21,7 @@
 #include "Vendor.h"
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	Vendor::Vendor( const QString &name, const QString &url ) : mName(name), mUrl(url)
@@ -41,4 +41,4 @@ namespace glabels
 		return mUrl;
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/Vendor.h b/model/Vendor.h
similarity index 91%
rename from glabels/Vendor.h
rename to model/Vendor.h
index 8e4c776..4a9a1d6 100644
--- a/glabels/Vendor.h
+++ b/model/Vendor.h
@@ -18,14 +18,14 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_Vendor_h
-#define glabels_Vendor_h
+#ifndef model_Vendor_h
+#define model_Vendor_h
 
 
 #include <QString>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	class Vendor
@@ -44,4 +44,4 @@ namespace glabels
 }
 
 
-#endif // glabels_Vendor_h
+#endif // model_Vendor_h
diff --git a/glabels/Version.h.in b/model/Version.h.in
similarity index 91%
rename from glabels/Version.h.in
rename to model/Version.h.in
index be7b2d4..69263c2 100644
--- a/glabels/Version.h.in
+++ b/model/Version.h.in
@@ -18,11 +18,11 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_Version_h
-#define glabels_Version_h
+#ifndef model_Version_h
+#define model_Version_h
 
 
-namespace glabels
+namespace glabels::model
 {
 	namespace Version
 	{
@@ -37,4 +37,4 @@ namespace glabels
 }
 
 
-#endif // glabels_Version_h
+#endif // model_Version_h
diff --git a/glabels/XmlCategoryParser.cpp b/model/XmlCategoryParser.cpp
similarity index 97%
rename from glabels/XmlCategoryParser.cpp
rename to model/XmlCategoryParser.cpp
index 838c45d..be96647 100644
--- a/glabels/XmlCategoryParser.cpp
+++ b/model/XmlCategoryParser.cpp
@@ -30,7 +30,7 @@
 #include <QtDebug>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	bool XmlCategoryParser::readFile( const QString &fileName )
@@ -100,4 +100,4 @@ namespace glabels
 		}
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/XmlCategoryParser.h b/model/XmlCategoryParser.h
similarity index 89%
rename from glabels/XmlCategoryParser.h
rename to model/XmlCategoryParser.h
index 5baa227..380bb05 100644
--- a/glabels/XmlCategoryParser.h
+++ b/model/XmlCategoryParser.h
@@ -18,15 +18,15 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_XmlCategoryParser_h
-#define glabels_XmlCategoryParser_h
+#ifndef model_XmlCategoryParser_h
+#define model_XmlCategoryParser_h
 
 
 #include <QDomElement>
 #include <QString>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	class XmlCategoryParser
@@ -44,4 +44,4 @@ namespace glabels
 }
 
 
-#endif // glabels_XmlCategoryParser_h
+#endif // model_XmlCategoryParser_h
diff --git a/glabels/XmlLabelCreator.cpp b/model/XmlLabelCreator.cpp
similarity index 85%
rename from glabels/XmlLabelCreator.cpp
rename to model/XmlLabelCreator.cpp
index 7b37685..ebfe8e4 100644
--- a/glabels/XmlLabelCreator.cpp
+++ b/model/XmlLabelCreator.cpp
@@ -20,19 +20,19 @@
 
 #include "XmlLabelCreator.h"
 
-#include "LabelModel.h"
-#include "LabelModelObject.h"
-#include "LabelModelBarcodeObject.h"
-#include "LabelModelBoxObject.h"
-#include "LabelModelEllipseObject.h"
-#include "LabelModelLineObject.h"
-#include "LabelModelImageObject.h"
-#include "LabelModelTextObject.h"
+#include "Model.h"
+#include "ModelObject.h"
+#include "ModelBarcodeObject.h"
+#include "ModelBoxObject.h"
+#include "ModelEllipseObject.h"
+#include "ModelLineObject.h"
+#include "ModelImageObject.h"
+#include "ModelTextObject.h"
 #include "DataCache.h"
 #include "XmlTemplateCreator.h"
 #include "XmlUtil.h"
 
-#include "Merge/None.h"
+#include "merge/None.h"
 
 #include <QByteArray>
 #include <QFile>
@@ -42,11 +42,11 @@
 #include <QtDebug>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	void
-	XmlLabelCreator::writeFile( const LabelModel* label, const QString& fileName )
+	XmlLabelCreator::writeFile( const Model* label, const QString& fileName )
 	{
 		QDomDocument doc;
 
@@ -66,7 +66,7 @@ namespace glabels
 
 
 	void
-	XmlLabelCreator::writeBuffer( const LabelModel* label, QByteArray& buffer )
+	XmlLabelCreator::writeBuffer( const Model* label, QByteArray& buffer )
 	{
 		QDomDocument doc;
 
@@ -76,7 +76,7 @@ namespace glabels
 
 
 	void
-	XmlLabelCreator::serializeObjects( const QList<LabelModelObject*>& objects,
+	XmlLabelCreator::serializeObjects( const QList<ModelObject*>& objects,
 	                                   QByteArray&                     buffer )
 	{
 		QDomDocument doc;
@@ -96,7 +96,7 @@ namespace glabels
 
 
 	void
-	XmlLabelCreator::createDoc( QDomDocument& doc, const LabelModel* label )
+	XmlLabelCreator::createDoc( QDomDocument& doc, const Model* label )
 	{
 		QDomNode xmlNode( doc.createProcessingInstruction( "xml", "version=\"1.0\"" ) );
 		doc.appendChild( xmlNode );
@@ -119,7 +119,7 @@ namespace glabels
 
 
 	void
-	XmlLabelCreator::createObjectsNode( QDomElement &parent, const QList<LabelModelObject*>& objects, bool rotate )
+	XmlLabelCreator::createObjectsNode( QDomElement &parent, const QList<ModelObject*>& objects, bool rotate )
 	{
 		QDomDocument doc = parent.ownerDocument();
 		QDomElement node = doc.createElement( "Objects" );
@@ -128,29 +128,29 @@ namespace glabels
 		XmlUtil::setStringAttr( node, "id", "0" );
 		XmlUtil::setBoolAttr( node, "rotate", rotate );
 
-		foreach ( LabelModelObject* object, objects )
+		foreach ( ModelObject* object, objects )
 		{
-			if ( LabelModelBoxObject* boxObject = dynamic_cast<LabelModelBoxObject*>(object) )
+			if ( ModelBoxObject* boxObject = dynamic_cast<ModelBoxObject*>(object) )
 			{
 				createObjectBoxNode( node, boxObject );
 			}
-			else if ( LabelModelEllipseObject* ellipseObject = dynamic_cast<LabelModelEllipseObject*>(object) )
+			else if ( ModelEllipseObject* ellipseObject = dynamic_cast<ModelEllipseObject*>(object) )
 			{
 				createObjectEllipseNode( node, ellipseObject );
 			}
-			else if ( LabelModelLineObject* lineObject = dynamic_cast<LabelModelLineObject*>(object) )
+			else if ( ModelLineObject* lineObject = dynamic_cast<ModelLineObject*>(object) )
 			{
 				createObjectLineNode( node, lineObject );
 			}
-			else if ( LabelModelImageObject* imageObject = dynamic_cast<LabelModelImageObject*>(object) )
+			else if ( ModelImageObject* imageObject = dynamic_cast<ModelImageObject*>(object) )
 			{
 				createObjectImageNode( node, imageObject );
 			}
-			else if ( LabelModelBarcodeObject* barcodeObject = dynamic_cast<LabelModelBarcodeObject*>(object) )
+			else if ( ModelBarcodeObject* barcodeObject = dynamic_cast<ModelBarcodeObject*>(object) )
 			{
 				createObjectBarcodeNode( node, barcodeObject );
 			}
-			else if ( LabelModelTextObject* textObject = dynamic_cast<LabelModelTextObject*>(object) )
+			else if ( ModelTextObject* textObject = dynamic_cast<ModelTextObject*>(object) )
 			{
 				createObjectTextNode( node, textObject );
 			}
@@ -163,7 +163,7 @@ namespace glabels
 
 
 	void
-	XmlLabelCreator::createObjectBoxNode( QDomElement &parent, const LabelModelBoxObject* object )
+	XmlLabelCreator::createObjectBoxNode( QDomElement &parent, const ModelBoxObject* object )
 	{
 		QDomDocument doc = parent.ownerDocument();
 		QDomElement node = doc.createElement( "Object-box" );
@@ -190,7 +190,7 @@ namespace glabels
 
 
 	void
-	XmlLabelCreator::createObjectEllipseNode( QDomElement &parent, const LabelModelEllipseObject* object )
+	XmlLabelCreator::createObjectEllipseNode( QDomElement &parent, const ModelEllipseObject* object )
 	{
 		QDomDocument doc = parent.ownerDocument();
 		QDomElement node = doc.createElement( "Object-ellipse" );
@@ -217,7 +217,7 @@ namespace glabels
 
 
 	void
-	XmlLabelCreator::createObjectLineNode( QDomElement &parent, const LabelModelLineObject* object )
+	XmlLabelCreator::createObjectLineNode( QDomElement &parent, const ModelLineObject* object )
 	{
 		QDomDocument doc = parent.ownerDocument();
 		QDomElement node = doc.createElement( "Object-line" );
@@ -242,7 +242,7 @@ namespace glabels
 
 
 	void
-	XmlLabelCreator::createObjectImageNode( QDomElement &parent, const LabelModelImageObject* object )
+	XmlLabelCreator::createObjectImageNode( QDomElement &parent, const ModelImageObject* object )
 	{
 		QDomDocument doc = parent.ownerDocument();
 		QDomElement node = doc.createElement( "Object-image" );
@@ -273,7 +273,7 @@ namespace glabels
 
 
 	void
-	XmlLabelCreator::createObjectBarcodeNode( QDomElement &parent, const LabelModelBarcodeObject* object )
+	XmlLabelCreator::createObjectBarcodeNode( QDomElement &parent, const ModelBarcodeObject* object )
 	{
 		QDomDocument doc = parent.ownerDocument();
 		QDomElement node = doc.createElement( "Object-barcode" );
@@ -306,7 +306,7 @@ namespace glabels
 
 
 	void
-	XmlLabelCreator::createObjectTextNode( QDomElement &parent, const LabelModelTextObject* object )
+	XmlLabelCreator::createObjectTextNode( QDomElement &parent, const ModelTextObject* object )
 	{
 		QDomDocument doc = parent.ownerDocument();
 		QDomElement node = doc.createElement( "Object-text" );
@@ -368,7 +368,7 @@ namespace glabels
 
 
 	void
-	XmlLabelCreator::createPositionAttrs( QDomElement &node, const LabelModelObject* object )
+	XmlLabelCreator::createPositionAttrs( QDomElement &node, const ModelObject* object )
 	{
 		XmlUtil::setLengthAttr( node, "x", object->x0() );
 		XmlUtil::setLengthAttr( node, "y", object->y0() );
@@ -376,7 +376,7 @@ namespace glabels
 
 	
 	void
-	XmlLabelCreator::createSizeAttrs( QDomElement &node, const LabelModelObject* object )
+	XmlLabelCreator::createSizeAttrs( QDomElement &node, const ModelObject* object )
 	{
 		XmlUtil::setLengthAttr( node, "w", object->w() );
 		XmlUtil::setLengthAttr( node, "h", object->h() );
@@ -384,7 +384,7 @@ namespace glabels
 
 	
 	void
-	XmlLabelCreator::createLineAttrs( QDomElement &node, const LabelModelObject* object )
+	XmlLabelCreator::createLineAttrs( QDomElement &node, const ModelObject* object )
 	{
 		XmlUtil::setLengthAttr( node, "line_width", object->lineWidth() );
 		if ( object->lineColorNode().isField() )
@@ -399,7 +399,7 @@ namespace glabels
 
 	
 	void
-	XmlLabelCreator::createFillAttrs( QDomElement &node, const LabelModelObject* object )
+	XmlLabelCreator::createFillAttrs( QDomElement &node, const ModelObject* object )
 	{
 		if ( object->fillColorNode().isField() )
 		{
@@ -413,7 +413,7 @@ namespace glabels
 
 
 	void
-	XmlLabelCreator::createAffineAttrs( QDomElement &node, const LabelModelObject* object )
+	XmlLabelCreator::createAffineAttrs( QDomElement &node, const ModelObject* object )
 	{
 		QMatrix a = object->matrix();
 	
@@ -427,7 +427,7 @@ namespace glabels
 
 
 	void
-	XmlLabelCreator::createShadowAttrs( QDomElement &node, const LabelModelObject* object )
+	XmlLabelCreator::createShadowAttrs( QDomElement &node, const ModelObject* object )
 	{
 		if ( object->shadow() )
 		{
@@ -451,7 +451,7 @@ namespace glabels
 
 
 	void
-	XmlLabelCreator::createMergeNode( QDomElement &parent, const LabelModel* label )
+	XmlLabelCreator::createMergeNode( QDomElement &parent, const Model* label )
 	{
 		QDomDocument doc = parent.ownerDocument();
 		QDomElement node = doc.createElement( "Merge" );
@@ -463,7 +463,7 @@ namespace glabels
 
 
 	void
-	XmlLabelCreator::createDataNode( QDomElement &parent, const QList<LabelModelObject*>& objects )
+	XmlLabelCreator::createDataNode( QDomElement &parent, const QList<ModelObject*>& objects )
 	{
 		QDomDocument doc = parent.ownerDocument();
 		QDomElement node = doc.createElement( "Data" );
@@ -518,4 +518,4 @@ namespace glabels
 		node.appendChild( doc.createCDATASection( QString( svg ) ) );
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/model/XmlLabelCreator.h b/model/XmlLabelCreator.h
new file mode 100644
index 0000000..0526bc0
--- /dev/null
+++ b/model/XmlLabelCreator.h
@@ -0,0 +1,82 @@
+/*  XmlLabelCreator.h
+ *
+ *  Copyright (C) 2014  Jim Evins <evins@snaught.com>
+ *
+ *  This file is part of gLabels-qt.
+ *
+ *  gLabels-qt is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  gLabels-qt 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef model_XmlLabelCreator_h
+#define model_XmlLabelCreator_h
+
+
+#include <QObject>
+#include <QDomElement>
+
+
+namespace glabels::model
+{
+
+	// Forward references
+	class Model;
+	class ModelObject;
+	class ModelBoxObject;
+	class ModelEllipseObject;
+	class ModelLineObject;
+	class ModelImageObject;
+	class ModelBarcodeObject;
+	class ModelTextObject;
+
+
+	///
+	/// XmlLabelCreator
+	///
+	class XmlLabelCreator : public QObject
+	{
+		Q_OBJECT
+
+	public:
+		static void writeFile( const Model* label, const QString& fileName );
+		static void writeBuffer( const Model* label, QByteArray& buffer );
+		static void serializeObjects( const QList<ModelObject*>& objects, QByteArray& buffer );
+
+	private:
+		static void createDoc( QDomDocument& doc, const Model* label );
+		static void createRootNode( const Model* label );
+		static void createObjectsNode( QDomElement &parent, const QList<ModelObject*>& objects, bool rotate );
+		static void createObjectBoxNode( QDomElement &parent, const ModelBoxObject* object );
+		static void createObjectEllipseNode( QDomElement &parent, const ModelEllipseObject* object );
+		static void createObjectLineNode( QDomElement &parent, const ModelLineObject* object );
+		static void createObjectImageNode( QDomElement &parent, const ModelImageObject* object );
+		static void createObjectBarcodeNode( QDomElement &parent, const ModelBarcodeObject* object );
+		static void createObjectTextNode( QDomElement &parent, const ModelTextObject* object );
+		static void createPNode( QDomElement &parent, const QString& blockText );
+		static void createPositionAttrs( QDomElement &node, const ModelObject* object );
+		static void createSizeAttrs( QDomElement &node, const ModelObject* object );
+		static void createLineAttrs( QDomElement &node, const ModelObject* object );
+		static void createFillAttrs( QDomElement &node, const ModelObject* object );
+		static void createAffineAttrs( QDomElement &node, const ModelObject* object );
+		static void createShadowAttrs( QDomElement &node, const ModelObject* object );
+		static void createMergeNode( QDomElement &parent, const Model* label );
+		static void createDataNode( QDomElement &parent, const QList<ModelObject*>& objects );
+		static void createPngFileNode( QDomElement &parent, const QString& name, const QImage& image );
+		static void createSvgFileNode( QDomElement &parent, const QString& name, const QByteArray& svg );
+
+	};
+
+}
+
+
+#endif // model_XmlLabelCreator_h
diff --git a/glabels/XmlLabelParser.cpp b/model/XmlLabelParser.cpp
similarity index 83%
rename from glabels/XmlLabelParser.cpp
rename to model/XmlLabelParser.cpp
index c0b00f9..72342a9 100644
--- a/glabels/XmlLabelParser.cpp
+++ b/model/XmlLabelParser.cpp
@@ -20,20 +20,20 @@
 
 #include "XmlLabelParser.h"
 
-#include "BarcodeBackends.h"
-#include "LabelModel.h"
-#include "LabelModelObject.h"
-#include "LabelModelBarcodeObject.h"
-#include "LabelModelBoxObject.h"
-#include "LabelModelEllipseObject.h"
-#include "LabelModelImageObject.h"
-#include "LabelModelLineObject.h"
-#include "LabelModelTextObject.h"
+#include "Model.h"
+#include "ModelObject.h"
+#include "ModelBarcodeObject.h"
+#include "ModelBoxObject.h"
+#include "ModelEllipseObject.h"
+#include "ModelImageObject.h"
+#include "ModelLineObject.h"
+#include "ModelTextObject.h"
 #include "XmlTemplateParser.h"
 #include "XmlUtil.h"
 #include "DataCache.h"
 
-#include "Merge/Factory.h"
+#include "barcode/Backends.h"
+#include "merge/Factory.h"
 
 #include <QByteArray>
 #include <QFile>
@@ -44,10 +44,10 @@
 #include <zlib.h>
 
 
-namespace glabels
+namespace glabels::model
 {
 
-	LabelModel*
+	Model*
 	XmlLabelParser::readFile( const QString& fileName )
 	{
 		QFile file( fileName );
@@ -99,7 +99,7 @@ namespace glabels
 	}
 
 
-	LabelModel*
+	Model*
 	XmlLabelParser::readBuffer( const QByteArray& buffer )
 	{
 		QDomDocument doc;
@@ -126,10 +126,10 @@ namespace glabels
 	}
 
 
-	QList<LabelModelObject*>
+	QList<ModelObject*>
 	XmlLabelParser::deserializeObjects( const QByteArray& buffer )
 	{
-		QList<LabelModelObject*> list;
+		QList<ModelObject*> list;
 	
 		QDomDocument doc;
 		QString      errorString;
@@ -223,7 +223,7 @@ namespace glabels
 	}
 
 
-	LabelModel*
+	Model*
 	XmlLabelParser::parseRootNode( const QDomElement &node )
 	{
 		QString version = XmlUtil::getStringAttr( node, "version", "" );
@@ -232,7 +232,7 @@ namespace glabels
 			qWarning() << "TODO: compatability mode.";
 		}
 
-		LabelModel* label = new LabelModel();
+		Model* label = new Model();
 
 		/* Pass 1, extract data nodes to pre-load cache. */
 		DataCache data;
@@ -263,8 +263,8 @@ namespace glabels
 			else if ( tagName == "Objects" )
 			{
 				label->setRotate( parseRotateAttr( child.toElement() ) );
-				QList<LabelModelObject*> list = parseObjectsNode( child.toElement(), data );
-				foreach ( LabelModelObject* object, list )
+				QList<ModelObject*> list = parseObjectsNode( child.toElement(), data );
+				foreach ( ModelObject* object, list )
 				{
 					label->addObject( object );
 				}
@@ -288,10 +288,10 @@ namespace glabels
 	}
 
 
-	QList<LabelModelObject*>
+	QList<ModelObject*>
 	XmlLabelParser::parseObjectsNode( const QDomElement &node, const DataCache& data )
 	{
-		QList<LabelModelObject*> list;
+		QList<ModelObject*> list;
 
 		for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
 		{
@@ -331,7 +331,7 @@ namespace glabels
 	}
 
 
-	LabelModelBoxObject*
+	ModelBoxObject*
 	XmlLabelParser::parseObjectBoxNode( const QDomElement &node )
 	{
 		/* position attrs */
@@ -376,15 +376,15 @@ namespace glabels
 		color      = XmlUtil::getUIntAttr( node, "shadow_color", 0 );
 		ColorNode shadowColorNode( field_flag, color, key );
 
-		return new LabelModelBoxObject( x0, y0, w, h,
-		                                lineWidth, lineColorNode,
-		                                fillColorNode,
-		                                QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
-		                                shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
+		return new ModelBoxObject( x0, y0, w, h,
+		                           lineWidth, lineColorNode,
+		                           fillColorNode,
+		                           QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
+		                           shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
 	}
 
 
-	LabelModelEllipseObject*
+	ModelEllipseObject*
 	XmlLabelParser::parseObjectEllipseNode( const QDomElement &node )
 	{
 		/* position attrs */
@@ -429,15 +429,15 @@ namespace glabels
 		color      = XmlUtil::getUIntAttr( node, "shadow_color", 0 );
 		ColorNode shadowColorNode( field_flag, color, key );
 
-		return new LabelModelEllipseObject( x0, y0, w, h,
-		                                    lineWidth, lineColorNode,
-		                                    fillColorNode,
-		                                    QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
-		                                    shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
+		return new ModelEllipseObject( x0, y0, w, h,
+		                               lineWidth, lineColorNode,
+		                               fillColorNode,
+		                               QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
+		                               shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
 	}
 
 
-	LabelModelLineObject*
+	ModelLineObject*
 	XmlLabelParser::parseObjectLineNode( const QDomElement &node )
 	{
 		/* position attrs */
@@ -476,14 +476,14 @@ namespace glabels
 		color      = XmlUtil::getUIntAttr( node, "shadow_color", 0 );
 		ColorNode shadowColorNode( field_flag, color, key );
 
-		return new LabelModelLineObject( x0, y0, dx, dy,
-		                                 lineWidth, lineColorNode,
-		                                 QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
-		                                 shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
+		return new ModelLineObject( x0, y0, dx, dy,
+		                            lineWidth, lineColorNode,
+		                            QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
+		                            shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
 	}
 
 
-	LabelModelImageObject*
+	ModelImageObject*
 	XmlLabelParser::parseObjectImageNode( const QDomElement &node, const DataCache& data )
 	{
 		/* position attrs */
@@ -522,40 +522,40 @@ namespace glabels
 
 		if ( filenameNode.isField() )
 		{
-			return new LabelModelImageObject( x0, y0, w, h,
-			                                  filenameNode,
-			                                  QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
-			                                  shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
+			return new ModelImageObject( x0, y0, w, h,
+			                             filenameNode,
+			                             QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
+			                             shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
 		}
 		else
 		{
 			if ( data.hasImage( filename ) )
 			{
-				return new LabelModelImageObject( x0, y0, w, h,
-				                                  filename, data.getImage( filename ),
-				                                  QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
-				                                  shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
+				return new ModelImageObject( x0, y0, w, h,
+				                             filename, data.getImage( filename ),
+				                             QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
+				                             shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
 			}
 			else if ( data.hasSvg( filename ) )
 			{
-				return new LabelModelImageObject( x0, y0, w, h,
-				                                  filename, data.getSvg( filename ),
-				                                  QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
-				                                  shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
+				return new ModelImageObject( x0, y0, w, h,
+				                             filename, data.getSvg( filename ),
+				                             QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
+				                             shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
 			}
 			else
 			{
 				qWarning() << "Embedded file" << filename << "missing. Trying actual file.";
-				return new LabelModelImageObject( x0, y0, w, h,
-				                                  filenameNode,
-				                                  QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
-				                                  shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
+				return new ModelImageObject( x0, y0, w, h,
+				                             filenameNode,
+				                             QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
+				                             shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
 			}
 		}
 	}
 
 
-	LabelModelBarcodeObject*
+	ModelBarcodeObject*
 	XmlLabelParser::parseObjectBarcodeNode( const QDomElement &node )
 	{
 		/* position attrs */
@@ -567,8 +567,8 @@ namespace glabels
 		Distance h = XmlUtil::getLengthAttr( node, "h", 0 );
 
 		/* barcode attrs */
-		BarcodeStyle bcStyle = BarcodeBackends::style( XmlUtil::getStringAttr( node, "backend", "" ),
-		                                               XmlUtil::getStringAttr( node, "style", "") );
+		barcode::Style bcStyle = barcode::Backends::style( XmlUtil::getStringAttr( node, "backend", "" ),
+		                                                   XmlUtil::getStringAttr( node, "style", "") );
 		bool bcTextFlag = XmlUtil::getBoolAttr( node, "text", true );
 		bool bcChecksumFlag = XmlUtil::getBoolAttr( node, "checksum", true );
 
@@ -588,13 +588,13 @@ namespace glabels
 		a[4] = XmlUtil::getDoubleAttr( node, "a4", 0.0 );
 		a[5] = XmlUtil::getDoubleAttr( node, "a5", 0.0 );
 
-		return new LabelModelBarcodeObject( x0, y0, w, h,
-		                                    bcStyle, bcTextFlag, bcChecksumFlag, bcData, bcColorNode,
-		                                    QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ) );
+		return new ModelBarcodeObject( x0, y0, w, h,
+		                               bcStyle, bcTextFlag, bcChecksumFlag, bcData, bcColorNode,
+		                               QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ) );
 	}
 
 
-	LabelModelTextObject*
+	ModelTextObject*
 	XmlLabelParser::parseObjectTextNode( const QDomElement &node )
 	{
 		/* position attrs */
@@ -667,12 +667,12 @@ namespace glabels
 		}
 		QString text = document.toPlainText();
 
-		return new LabelModelTextObject( x0, y0, w, h,
-		                                 text,
-		                                 fontFamily, fontSize, fontWeight, fontItalicFlag, fontUnderlineFlag,
-		                                 textColorNode, textHAlign, textVAlign, textLineSpacing,
-		                                 QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
-		                                 shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
+		return new ModelTextObject( x0, y0, w, h,
+		                            text,
+		                            fontFamily, fontSize, fontWeight, fontItalicFlag, fontUnderlineFlag,
+		                            textColorNode, textHAlign, textVAlign, textLineSpacing,
+		                            QMatrix( a[0], a[1], a[2], a[3], a[4], a[5] ),
+		                            shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
 	}
 
 
@@ -691,7 +691,7 @@ namespace glabels
 
 	
 	void
-	XmlLabelParser::parseMergeNode( const QDomElement &node, LabelModel* label )
+	XmlLabelParser::parseMergeNode( const QDomElement &node, Model* label )
 	{
 		QString type = XmlUtil::getStringAttr( node, "type", "None" );
 		QString src  = XmlUtil::getStringAttr( node, "src", "" );
@@ -751,4 +751,4 @@ namespace glabels
 		}
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/XmlLabelParser.h b/model/XmlLabelParser.h
similarity index 52%
rename from glabels/XmlLabelParser.h
rename to model/XmlLabelParser.h
index 1fa40fa..28de841 100644
--- a/glabels/XmlLabelParser.h
+++ b/model/XmlLabelParser.h
@@ -18,26 +18,26 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef XmlLabelParser_h
-#define XmlLabelParser_h
+#ifndef model_XmlLabelParser_h
+#define model_XmlLabelParser_h
 
 
 #include <QObject>
 #include <QDomElement>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	// Forward references
-	class LabelModel;
-	class LabelModelObject;
-	class LabelModelBoxObject;
-	class LabelModelEllipseObject;
-	class LabelModelLineObject;
-	class LabelModelImageObject;
-	class LabelModelBarcodeObject;
-	class LabelModelTextObject;
+	class Model;
+	class ModelObject;
+	class ModelBoxObject;
+	class ModelEllipseObject;
+	class ModelLineObject;
+	class ModelImageObject;
+	class ModelBarcodeObject;
+	class ModelTextObject;
 	class DataCache;
 
 
@@ -49,23 +49,23 @@ namespace glabels
 		Q_OBJECT
 
 	public:
-		static LabelModel* readFile( const QString& fileName );
-		static LabelModel* readBuffer( const QByteArray& buffer );
-		static QList<LabelModelObject*> deserializeObjects( const QByteArray& buffer );
+		static Model* readFile( const QString& fileName );
+		static Model* readBuffer( const QByteArray& buffer );
+		static QList<ModelObject*> deserializeObjects( const QByteArray& buffer );
 
 	private:
 		static void gunzip( const QByteArray& gzippedData, QByteArray& data );
-		static LabelModel* parseRootNode( const QDomElement &node );
-		static QList<LabelModelObject*> parseObjectsNode( const QDomElement &node, const DataCache& data );
-		static LabelModelBoxObject* parseObjectBoxNode( const QDomElement &node );
-		static LabelModelEllipseObject* parseObjectEllipseNode( const QDomElement &node );
-		static LabelModelLineObject* parseObjectLineNode( const QDomElement &node );
-		static LabelModelImageObject* parseObjectImageNode( const QDomElement &node, const DataCache& data );
-		static LabelModelBarcodeObject* parseObjectBarcodeNode( const QDomElement &node );
-		static LabelModelTextObject* parseObjectTextNode( const QDomElement &node );
+		static Model* parseRootNode( const QDomElement &node );
+		static QList<ModelObject*> parseObjectsNode( const QDomElement &node, const DataCache& data );
+		static ModelBoxObject* parseObjectBoxNode( const QDomElement &node );
+		static ModelEllipseObject* parseObjectEllipseNode( const QDomElement &node );
+		static ModelLineObject* parseObjectLineNode( const QDomElement &node );
+		static ModelImageObject* parseObjectImageNode( const QDomElement &node, const DataCache& data );
+		static ModelBarcodeObject* parseObjectBarcodeNode( const QDomElement &node );
+		static ModelTextObject* parseObjectTextNode( const QDomElement &node );
 		static QString parsePNode( const QDomElement &node );
 		static bool parseRotateAttr( const QDomElement &node );
-		static void parseMergeNode( const QDomElement &node, LabelModel* label );
+		static void parseMergeNode( const QDomElement &node, Model* label );
 		static void parseDataNode( const QDomElement &node, DataCache& data );
 		static void parsePixdataNode( const QDomElement &node, DataCache& data );
 		static void parseFileNode( const QDomElement &node, DataCache& data );
@@ -75,4 +75,4 @@ namespace glabels
 }
 
 
-#endif // XmlLabelParser_h
+#endif // model_XmlLabelParser_h
diff --git a/glabels/XmlPaperParser.cpp b/model/XmlPaperParser.cpp
similarity index 98%
rename from glabels/XmlPaperParser.cpp
rename to model/XmlPaperParser.cpp
index 5bc29c2..c3178ce 100644
--- a/glabels/XmlPaperParser.cpp
+++ b/model/XmlPaperParser.cpp
@@ -30,7 +30,7 @@
 #include <QtDebug>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	bool XmlPaperParser::readFile( const QString &fileName )
@@ -105,4 +105,4 @@ namespace glabels
 		}
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/XmlPaperParser.h b/model/XmlPaperParser.h
similarity index 89%
rename from glabels/XmlPaperParser.h
rename to model/XmlPaperParser.h
index 4432d41..7ba19ad 100644
--- a/glabels/XmlPaperParser.h
+++ b/model/XmlPaperParser.h
@@ -18,15 +18,15 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_XmlPaperParser_h
-#define glabels_XmlPaperParser_h
+#ifndef model_XmlPaperParser_h
+#define model_XmlPaperParser_h
 
 
 #include <QString>
 #include <QDomElement>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	class XmlPaperParser
@@ -44,4 +44,4 @@ namespace glabels
 }
 
 
-#endif // glabels_XmlPaperParser_h
+#endif // model_XmlPaperParser_h
diff --git a/glabels/XmlTemplateCreator.cpp b/model/XmlTemplateCreator.cpp
similarity index 99%
rename from glabels/XmlTemplateCreator.cpp
rename to model/XmlTemplateCreator.cpp
index 1ec23aa..6b7f39d 100644
--- a/glabels/XmlTemplateCreator.cpp
+++ b/model/XmlTemplateCreator.cpp
@@ -29,7 +29,7 @@
 #include <QtDebug>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	bool XmlTemplateCreator::writeTemplates( const QList<const Template*> tmplates, const QString &fileName )
@@ -330,4 +330,4 @@ namespace glabels
 		XmlUtil::setLengthAttr( node, "h",  markup->h() );
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/XmlTemplateCreator.h b/model/XmlTemplateCreator.h
similarity index 94%
rename from glabels/XmlTemplateCreator.h
rename to model/XmlTemplateCreator.h
index 688a945..ca506e2 100644
--- a/glabels/XmlTemplateCreator.h
+++ b/model/XmlTemplateCreator.h
@@ -18,8 +18,8 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_XmlTemplateCreator_h
-#define glabels_XmlTemplateCreator_h
+#ifndef model_XmlTemplateCreator_h
+#define model_XmlTemplateCreator_h
 
 
 #include "FrameCd.h"
@@ -34,7 +34,7 @@
 #include <QString>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	class XmlTemplateCreator
@@ -66,4 +66,4 @@ namespace glabels
 }
 
 
-#endif // glabels_XmlTemplateCreator_h
+#endif // model_XmlTemplateCreator_h
diff --git a/glabels/XmlTemplateParser.cpp b/model/XmlTemplateParser.cpp
similarity index 99%
rename from glabels/XmlTemplateParser.cpp
rename to model/XmlTemplateParser.cpp
index 900a090..eb7d0e0 100644
--- a/glabels/XmlTemplateParser.cpp
+++ b/model/XmlTemplateParser.cpp
@@ -36,7 +36,7 @@
 #include <QtDebug>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	bool XmlTemplateParser::readFile( const QString &fileName )
@@ -405,4 +405,4 @@ namespace glabels
 		frame->addMarkup( new MarkupEllipse( x1, y1, w, h ) );
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/XmlTemplateParser.h b/model/XmlTemplateParser.h
similarity index 93%
rename from glabels/XmlTemplateParser.h
rename to model/XmlTemplateParser.h
index ac02446..643b158 100644
--- a/glabels/XmlTemplateParser.h
+++ b/model/XmlTemplateParser.h
@@ -18,8 +18,8 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_XmlTemplateParser_h
-#define glabels_XmlTemplateParser_h
+#ifndef model_XmlTemplateParser_h
+#define model_XmlTemplateParser_h
 
 
 #include "Template.h"
@@ -28,7 +28,7 @@
 #include <QString>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	class XmlTemplateParser
@@ -59,4 +59,4 @@ namespace glabels
 }
 
 
-#endif // glabels_XmlTemplateParser_h
+#endif // model_XmlTemplateParser_h
diff --git a/glabels/XmlUtil.cpp b/model/XmlUtil.cpp
similarity index 99%
rename from glabels/XmlUtil.cpp
rename to model/XmlUtil.cpp
index 7bb30cc..9cde9b8 100644
--- a/glabels/XmlUtil.cpp
+++ b/model/XmlUtil.cpp
@@ -25,7 +25,7 @@
 #include <QtDebug>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	//
@@ -404,4 +404,4 @@ namespace glabels
 	}
 
 	
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/XmlUtil.h b/model/XmlUtil.h
similarity index 97%
rename from glabels/XmlUtil.h
rename to model/XmlUtil.h
index 9935a96..62c8c0c 100644
--- a/glabels/XmlUtil.h
+++ b/model/XmlUtil.h
@@ -18,8 +18,8 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_XmlUtil_h
-#define glabels_XmlUtil_h
+#ifndef model_XmlUtil_h
+#define model_XmlUtil_h
 
 
 #include "Distance.h"
@@ -32,7 +32,7 @@
 #include <cstdint>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	class XmlUtil
@@ -128,4 +128,4 @@ namespace glabels
 }
 
 
-#endif // glabels_XmlUtil_h
+#endif // model_XmlUtil_h
diff --git a/glabels/XmlVendorParser.cpp b/model/XmlVendorParser.cpp
similarity index 97%
rename from glabels/XmlVendorParser.cpp
rename to model/XmlVendorParser.cpp
index 2fbe56f..8463f38 100644
--- a/glabels/XmlVendorParser.cpp
+++ b/model/XmlVendorParser.cpp
@@ -30,7 +30,7 @@
 #include <QtDebug>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	bool XmlVendorParser::readFile( const QString &fileName )
@@ -100,4 +100,4 @@ namespace glabels
 		}
 	}
 
-} // namespace glabels
+} // namespace glabels::model
diff --git a/glabels/XmlVendorParser.h b/model/XmlVendorParser.h
similarity index 89%
rename from glabels/XmlVendorParser.h
rename to model/XmlVendorParser.h
index 3da96a9..63afac1 100644
--- a/glabels/XmlVendorParser.h
+++ b/model/XmlVendorParser.h
@@ -18,15 +18,15 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef glabels_XmlVendorParser_h
-#define glabels_XmlVendorParser_h
+#ifndef model_XmlVendorParser_h
+#define model_XmlVendorParser_h
 
 
 #include <QDomElement>
 #include <QString>
 
 
-namespace glabels
+namespace glabels::model
 {
 
 	class XmlVendorParser
@@ -44,4 +44,4 @@ namespace glabels
 }
 
 
-#endif // glabels_XmlVendorParser_h
+#endif // model_XmlVendorParser_h
diff --git a/glabels/unit_tests/CMakeLists.txt b/model/unit_tests/CMakeLists.txt
similarity index 77%
rename from glabels/unit_tests/CMakeLists.txt
rename to model/unit_tests/CMakeLists.txt
index e3934cd..9b7da94 100644
--- a/glabels/unit_tests/CMakeLists.txt
+++ b/model/unit_tests/CMakeLists.txt
@@ -1,13 +1,11 @@
 if (Qt5Test_FOUND)
 
-  include_directories (..)
-
   #=======================================
   # Test SubstitutionField class
   #=======================================
   qt5_wrap_cpp (TestSubstitutionField_moc_sources TestSubstitutionField.h)
   add_executable (TestSubstitutionField TestSubstitutionField.cpp ../SubstitutionField.cpp ${TestSubstitutionField_moc_sources})
-  target_link_libraries (TestSubstitutionField Merge ${Qt5Core_LIBRARIES} ${Qt5Test_LIBRARIES} )
+  target_link_libraries (TestSubstitutionField Model Qt5::Test)
   add_test (NAME SubstitutionField COMMAND TestSubstitutionField)
 
 endif (Qt5Test_FOUND)
diff --git a/glabels/unit_tests/TestSubstitutionField.cpp b/model/unit_tests/TestSubstitutionField.cpp
similarity index 75%
rename from glabels/unit_tests/TestSubstitutionField.cpp
rename to model/unit_tests/TestSubstitutionField.cpp
index a6706d5..fa9135a 100644
--- a/glabels/unit_tests/TestSubstitutionField.cpp
+++ b/model/unit_tests/TestSubstitutionField.cpp
@@ -20,7 +20,7 @@
 
 #include "TestSubstitutionField.h"
 
-#include "SubstitutionField.h"
+#include "model/SubstitutionField.h"
 
 
 QTEST_MAIN(TestSubstitutionField)
@@ -36,34 +36,34 @@ void TestSubstitutionField::parseValid()
 	QString input = "${1234}${abc:=ABC}${x:%08.2f}${y:%08.2f:=12.34}${ADDR2:n}";
 	QStringRef s = &input;
 	
-	SubstitutionField f1;
-	QCOMPARE( SubstitutionField::parse( s, f1 ), true );
+	model::SubstitutionField f1;
+	QCOMPARE( model::SubstitutionField::parse( s, f1 ), true );
 	QCOMPARE( f1.fieldName(),    QString( "1234" ) );
 	QCOMPARE( f1.newLine(),      false );
 
-	SubstitutionField f2;
-	QCOMPARE( SubstitutionField::parse( s, f2 ), true );
+	model::SubstitutionField f2;
+	QCOMPARE( model::SubstitutionField::parse( s, f2 ), true );
 	QCOMPARE( f2.fieldName(),    QString( "abc" ) );
 	QCOMPARE( f2.defaultValue(), QString( "ABC" ) );
 	QCOMPARE( f2.newLine(),      false );
 
-	SubstitutionField f3;
-	QCOMPARE( SubstitutionField::parse( s, f3 ), true );
+	model::SubstitutionField f3;
+	QCOMPARE( model::SubstitutionField::parse( s, f3 ), true );
 	QCOMPARE( f3.fieldName(),    QString( "x" ) );
 	QCOMPARE( f3.format(),       QString( "%08.2f" ) );
 	QCOMPARE( f3.formatType(),   QChar('f') );
 	QCOMPARE( f3.newLine(),      false );
 
-	SubstitutionField f4;
-	QCOMPARE( SubstitutionField::parse( s, f4 ), true );
+	model::SubstitutionField f4;
+	QCOMPARE( model::SubstitutionField::parse( s, f4 ), true );
 	QCOMPARE( f4.fieldName(),    QString( "y" ) );
 	QCOMPARE( f4.defaultValue(), QString( "12.34" ) );
 	QCOMPARE( f4.format(),       QString( "%08.2f" ) );
 	QCOMPARE( f4.formatType(),   QChar('f') );
 	QCOMPARE( f4.newLine(),      false );
 
-	SubstitutionField f5;
-	QCOMPARE( SubstitutionField::parse( s, f5 ), true );
+	model::SubstitutionField f5;
+	QCOMPARE( model::SubstitutionField::parse( s, f5 ), true );
 	QCOMPARE( f5.fieldName(),    QString( "ADDR2" ) );
 	QCOMPARE( f5.newLine(),      true );
 }
@@ -78,8 +78,8 @@ void TestSubstitutionField::parseInvalid()
 	//
 	QString input5 = "Abcdefg";
 	QStringRef s5 = &input5;
-	SubstitutionField f5;
-	QCOMPARE( SubstitutionField::parse( s5, f5 ), false );
+	model::SubstitutionField f5;
+	QCOMPARE( model::SubstitutionField::parse( s5, f5 ), false );
 	QCOMPARE( s5, QStringRef( &input5 ) ); // Should not advance string reference
 
 	//
@@ -87,27 +87,27 @@ void TestSubstitutionField::parseInvalid()
 	//
 	QString input6 = "$abc";
 	QStringRef s6 = &input6;
-	SubstitutionField f6;
-	QCOMPARE( SubstitutionField::parse( s6, f6 ), false );
+	model::SubstitutionField f6;
+	QCOMPARE( model::SubstitutionField::parse( s6, f6 ), false );
 	QCOMPARE( s6, QStringRef( &input6 ) ); // Should not advance string reference
 
 	QString input7 = "${abc";
 	QStringRef s7 = &input7;
-	SubstitutionField f7;
-	QCOMPARE( SubstitutionField::parse( s7, f7 ), false );
+	model::SubstitutionField f7;
+	QCOMPARE( model::SubstitutionField::parse( s7, f7 ), false );
 	QCOMPARE( s7, QStringRef( &input7 ) ); // Should not advance string reference
 
 	QString input8 = "${abc:}";
 	QStringRef s8 = &input8;
-	SubstitutionField f8;
-	QCOMPARE( SubstitutionField::parse( s8, f8 ), false );
+	model::SubstitutionField f8;
+	QCOMPARE( model::SubstitutionField::parse( s8, f8 ), false );
 	QCOMPARE( s8, QStringRef( &input8 ) ); // Should not advance string reference
 
 	// Even though format is invalid, let it slide.  Overall structure still good.  Format will be ignored.
 	QString input9 = "${abc:%3.2}";
 	QStringRef s9 = &input9;
-	SubstitutionField f9;
-	QCOMPARE( SubstitutionField::parse( s9, f9 ), true );
+	model::SubstitutionField f9;
+	QCOMPARE( model::SubstitutionField::parse( s9, f9 ), true );
 }
 
 
@@ -115,19 +115,19 @@ void TestSubstitutionField::construction()
 {
 	using namespace glabels;
 
-	SubstitutionField f1( "${1234}" );
+	model::SubstitutionField f1( "${1234}" );
 	QCOMPARE( f1.fieldName(),    QString( "1234" ) );
 
-	SubstitutionField f2( "${abc:=ABC}" );
+	model::SubstitutionField f2( "${abc:=ABC}" );
 	QCOMPARE( f2.fieldName(),    QString( "abc" ) );
 	QCOMPARE( f2.defaultValue(), QString( "ABC" ) );
 
-	SubstitutionField f3( "${x:%08.2f}" );
+	model::SubstitutionField f3( "${x:%08.2f}" );
 	QCOMPARE( f3.fieldName(),    QString( "x" ) );
 	QCOMPARE( f3.format(),       QString( "%08.2f" ) );
 	QCOMPARE( f3.formatType(),   QChar('f') );
 
-	SubstitutionField f4( "${y:%08.2f:=12.34}" );
+	model::SubstitutionField f4( "${y:%08.2f:=12.34}" );
 	QCOMPARE( f4.fieldName(),    QString( "y" ) );
 	QCOMPARE( f4.defaultValue(), QString( "12.34" ) );
 	QCOMPARE( f4.format(),       QString( "%08.2f" ) );
@@ -139,10 +139,10 @@ void TestSubstitutionField::simpleEvaluation()
 {
 	using namespace glabels;
 
-	SubstitutionField f1( "${1}" );
-	SubstitutionField f2( "${2}" );
-	SubstitutionField f3( "${3}" );
-	SubstitutionField f4( "${4}" );
+	model::SubstitutionField f1( "${1}" );
+	model::SubstitutionField f2( "${2}" );
+	model::SubstitutionField f3( "${3}" );
+	model::SubstitutionField f4( "${4}" );
 
 	merge::Record record1;
 	record1[ "1" ] = "Abcdefg";
@@ -172,10 +172,10 @@ void TestSubstitutionField::defaultValueEvaluation()
 {
 	using namespace glabels;
 
-	SubstitutionField f1( "${1:=foo1}" );
-	SubstitutionField f2( "${2:=foo2}" );
-	SubstitutionField f3( "${3:=foo3}" );
-	SubstitutionField f4( "${4:=foo4}" );
+	model::SubstitutionField f1( "${1:=foo1}" );
+	model::SubstitutionField f2( "${2:=foo2}" );
+	model::SubstitutionField f3( "${3:=foo3}" );
+	model::SubstitutionField f4( "${4:=foo4}" );
 
 	merge::Record record1;
 	record1[ "1" ] = "Abcdefg";
@@ -212,15 +212,15 @@ void TestSubstitutionField::formattedStringEvaluation()
 {
 	using namespace glabels;
 
-	SubstitutionField f1( "${1:%10s}" );
-	SubstitutionField f2( "${2:%10s}" );
-	SubstitutionField f3( "${3:%10s}" );
-	SubstitutionField f4( "${4:%10s}" );
+	model::SubstitutionField f1( "${1:%10s}" );
+	model::SubstitutionField f2( "${2:%10s}" );
+	model::SubstitutionField f3( "${3:%10s}" );
+	model::SubstitutionField f4( "${4:%10s}" );
 
-	SubstitutionField f5( "${5:%-10s}" );
-	SubstitutionField f6( "${6:%-10s}" );
-	SubstitutionField f7( "${7:%-10s}" );
-	SubstitutionField f8( "${8:%-10s}" );
+	model::SubstitutionField f5( "${5:%-10s}" );
+	model::SubstitutionField f6( "${6:%-10s}" );
+	model::SubstitutionField f7( "${7:%-10s}" );
+	model::SubstitutionField f8( "${8:%-10s}" );
 
 	merge::Record record1;
 	record1[ "1" ] = "0";
@@ -249,15 +249,15 @@ void TestSubstitutionField::formattedFloatEvaluation()
 {
 	using namespace glabels;
 
-	SubstitutionField f1( "${1:%+5.2f}" );
-	SubstitutionField f2( "${2:%+5.2f}" );
-	SubstitutionField f3( "${3:%+5.2f}" );
-	SubstitutionField f4( "${4:%+5.2f}" );
+	model::SubstitutionField f1( "${1:%+5.2f}" );
+	model::SubstitutionField f2( "${2:%+5.2f}" );
+	model::SubstitutionField f3( "${3:%+5.2f}" );
+	model::SubstitutionField f4( "${4:%+5.2f}" );
 
-	SubstitutionField f5( "${5:%+5.2e}" );
-	SubstitutionField f6( "${6:%+5.2e}" );
-	SubstitutionField f7( "${7:%+5.2e}" );
-	SubstitutionField f8( "${8:%+5.2e}" );
+	model::SubstitutionField f5( "${5:%+5.2e}" );
+	model::SubstitutionField f6( "${6:%+5.2e}" );
+	model::SubstitutionField f7( "${7:%+5.2e}" );
+	model::SubstitutionField f8( "${8:%+5.2e}" );
 
 	merge::Record record1;
 	record1[ "1" ] = "0";
@@ -286,15 +286,15 @@ void TestSubstitutionField::formattedIntEvaluation()
 {
 	using namespace glabels;
 
-	SubstitutionField f1( "${1:%08d}" );
-	SubstitutionField f2( "${2:%08d}" );
-	SubstitutionField f3( "${3:%08d}" );
-	SubstitutionField f4( "${4:%08d}" );
+	model::SubstitutionField f1( "${1:%08d}" );
+	model::SubstitutionField f2( "${2:%08d}" );
+	model::SubstitutionField f3( "${3:%08d}" );
+	model::SubstitutionField f4( "${4:%08d}" );
 
-	SubstitutionField f5( "${5:%08x}" );
-	SubstitutionField f6( "${6:%08x}" );
-	SubstitutionField f7( "${7:%08x}" );
-	SubstitutionField f8( "${8:%08x}" );
+	model::SubstitutionField f5( "${5:%08x}" );
+	model::SubstitutionField f6( "${6:%08x}" );
+	model::SubstitutionField f7( "${7:%08x}" );
+	model::SubstitutionField f8( "${8:%08x}" );
 
 	merge::Record record1;
 	record1[ "1" ] = "0";
@@ -323,7 +323,7 @@ void TestSubstitutionField::newLineEvaluation()
 {
 	using namespace glabels;
 
-	SubstitutionField addr2( "${ADDR2:n}" );
+	model::SubstitutionField addr2( "${ADDR2:n}" );
 	QCOMPARE( addr2.fieldName(),    QString( "ADDR2" ) );
 	QCOMPARE( addr2.newLine(),      true );
 
diff --git a/glabels/unit_tests/TestSubstitutionField.h b/model/unit_tests/TestSubstitutionField.h
similarity index 100%
rename from glabels/unit_tests/TestSubstitutionField.h
rename to model/unit_tests/TestSubstitutionField.h
diff --git a/translations/glabels_C.ts b/translations/glabels_C.ts
index c4e8a3d..01f89a5 100644
--- a/translations/glabels_C.ts
+++ b/translations/glabels_C.ts
@@ -24,94 +24,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Db</name>
-    <message>
-        <location filename="../glabels/Db.cpp" line="71"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Factory</name>
-    <message>
-        <location filename="../glabels/Merge/Factory.cpp" line="54"/>
-        <location filename="../glabels/Merge/Factory.cpp" line="148"/>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/Merge/Factory.cpp" line="59"/>
-        <source>Text: Comma Separated Values (CSV)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/Merge/Factory.cpp" line="64"/>
-        <source>Text: Comma Separated Values (CSV), keys on line 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/Merge/Factory.cpp" line="69"/>
-        <source>Text: Tab Separated Values (TSV)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/Merge/Factory.cpp" line="74"/>
-        <source>Text: Tab Separated Values (TSV), keys on line 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/Merge/Factory.cpp" line="79"/>
-        <source>Text: Colon Separated Values</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/Merge/Factory.cpp" line="84"/>
-        <source>Text: Colon Separated Values, keys on line 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/Merge/Factory.cpp" line="89"/>
-        <source>Text: Semicolon Separated Values</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/Merge/Factory.cpp" line="94"/>
-        <source>Text: Semicolon Separated Values, keys on line 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Frame</name>
-    <message>
-        <location filename="../glabels/Frame.cpp" line="122"/>
-        <source>%1 x %2 (%3 per sheet)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/Frame.cpp" line="128"/>
-        <source>%1 per sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FrameCd</name>
-    <message>
-        <location filename="../glabels/FrameCd.cpp" line="148"/>
-        <location filename="../glabels/FrameCd.cpp" line="155"/>
-        <source>diameter</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FrameRound</name>
-    <message>
-        <location filename="../glabels/FrameRound.cpp" line="87"/>
-        <location filename="../glabels/FrameRound.cpp" line="94"/>
-        <source>diameter</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>MergeView</name>
     <message>
@@ -690,34 +602,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Units</name>
-    <message>
-        <location filename="../glabels/Units.cpp" line="156"/>
-        <source>points</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/Units.cpp" line="159"/>
-        <source>inches</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/Units.cpp" line="162"/>
-        <source>mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/Units.cpp" line="165"/>
-        <source>cm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/Units.cpp" line="168"/>
-        <source>picas</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>glabels::AboutDialog</name>
     <message>
@@ -741,471 +625,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>glabels::BarcodeBackends</name>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="56"/>
-        <source>POSTNET (any)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="59"/>
-        <source>POSTNET-5 (ZIP only)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="62"/>
-        <source>POSTNET-9 (ZIP+4)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="65"/>
-        <source>POSTNET-11 (DPBC)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="68"/>
-        <source>CEPNET</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="71"/>
-        <source>USPS Intelligent Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="74"/>
-        <source>IEC16022 (DataMatrix)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="109"/>
-        <source>EAN (any)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="111"/>
-        <source>EAN-8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="113"/>
-        <source>EAN-8+2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="115"/>
-        <source>EAN-8+5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="119"/>
-        <source>EAN-13+2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="121"/>
-        <source>EAN-13+5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="123"/>
-        <source>UPC (UPC-A or UPC-E)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="127"/>
-        <source>UPC-A +2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="129"/>
-        <source>UPC-A +5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="131"/>
-        <location filename="../glabels/BarcodeBackends.cpp" line="439"/>
-        <source>UPC-E</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="133"/>
-        <source>UPC-E +2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="135"/>
-        <source>UPC-E +5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="137"/>
-        <location filename="../glabels/BarcodeBackends.cpp" line="373"/>
-        <source>ISBN</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="139"/>
-        <source>ISBN +5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="143"/>
-        <location filename="../glabels/BarcodeBackends.cpp" line="301"/>
-        <source>Code 128</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="145"/>
-        <source>Code 128C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="147"/>
-        <source>Code 128B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="149"/>
-        <location filename="../glabels/BarcodeBackends.cpp" line="370"/>
-        <source>Interleaved 2 of 5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="151"/>
-        <location filename="../glabels/BarcodeBackends.cpp" line="265"/>
-        <source>Codabar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="153"/>
-        <source>MSI</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="155"/>
-        <source>Plessey</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="157"/>
-        <location filename="../glabels/BarcodeBackends.cpp" line="298"/>
-        <source>Code 93</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="169"/>
-        <source>IEC18004 (QRCode)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="247"/>
-        <source>Austraila Post Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="250"/>
-        <source>Australia Post Reply Paid</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="253"/>
-        <source>Australia Post Route Code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="256"/>
-        <source>Australia Post Redirect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="259"/>
-        <source>Aztec Code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="262"/>
-        <source>Aztec Rune</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="268"/>
-        <source>Code One</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="271"/>
-        <source>Code 11</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="274"/>
-        <source>Code 16K</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="277"/>
-        <source>Code 2 of 5 Matrix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="280"/>
-        <source>Code 2 of 5 IATA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="283"/>
-        <source>Code 2 of 5 Data Logic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="286"/>
-        <source>Code 32 (Italian Pharmacode)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="295"/>
-        <source>Code 49</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="304"/>
-        <source>Code 128 (Mode C supression)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="307"/>
-        <source>DAFT Code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="310"/>
-        <source>Data Matrix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="313"/>
-        <source>Deutsche Post Leitcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="316"/>
-        <source>Deutsche Post Identcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="319"/>
-        <source>Dutch Post KIX Code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="322"/>
-        <source>EAN</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="325"/>
-        <source>Grid Matrix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="328"/>
-        <source>GS1-128</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="331"/>
-        <source>GS1 DataBar-14</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="340"/>
-        <source>GS1 DataBar-14 Stacked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="343"/>
-        <source>GS1 DataBar-14 Stacked Omni.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="346"/>
-        <source>GS1 DataBar Extended Stacked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="349"/>
-        <source>HIBC Code 128</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="352"/>
-        <source>HIBC Code 39</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="355"/>
-        <source>HIBC Data Matrix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="358"/>
-        <source>HIBC QR Code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="361"/>
-        <source>HIBC PDF417</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="364"/>
-        <source>HIBC Micro PDF417</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="367"/>
-        <source>HIBC Aztec Code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="376"/>
-        <source>ITF-14</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="379"/>
-        <source>Japanese Postal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="382"/>
-        <source>Korean Postal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="385"/>
-        <source>LOGMARS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="388"/>
-        <source>Maxicode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="391"/>
-        <source>Micro PDF417</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="394"/>
-        <source>Micro QR Code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="397"/>
-        <source>MSI Plessey</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="400"/>
-        <source>NVE-18</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="403"/>
-        <source>PDF417</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="406"/>
-        <source>PDF417 Truncated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="409"/>
-        <source>PLANET</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="412"/>
-        <source>PostNet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="415"/>
-        <source>Pharmacode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="418"/>
-        <source>Pharmacode 2-track</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="421"/>
-        <source>Pharmazentral Nummer (PZN)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="424"/>
-        <source>QR Code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="427"/>
-        <source>Royal Mail 4-State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="430"/>
-        <source>Telepen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="433"/>
-        <source>Telepen Numeric</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="442"/>
-        <source>USPS One Code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="445"/>
-        <source>UK Plessey</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="44"/>
-        <location filename="../glabels/BarcodeBackends.cpp" line="141"/>
-        <location filename="../glabels/BarcodeBackends.cpp" line="289"/>
-        <source>Code 39</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="47"/>
-        <location filename="../glabels/BarcodeBackends.cpp" line="292"/>
-        <source>Code 39 Extended</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="50"/>
-        <location filename="../glabels/BarcodeBackends.cpp" line="125"/>
-        <location filename="../glabels/BarcodeBackends.cpp" line="436"/>
-        <source>UPC-A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="53"/>
-        <location filename="../glabels/BarcodeBackends.cpp" line="117"/>
-        <source>EAN-13</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>glabels::ColorPaletteDialog</name>
     <message>
@@ -1448,43 +867,43 @@
 <context>
     <name>glabels::File</name>
     <message>
-        <location filename="../glabels/File.cpp" line="102"/>
+        <location filename="../glabels/File.cpp" line="103"/>
         <source>gLabels - Open Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/File.cpp" line="104"/>
-        <location filename="../glabels/File.cpp" line="185"/>
+        <location filename="../glabels/File.cpp" line="105"/>
+        <location filename="../glabels/File.cpp" line="186"/>
         <source>glabels files (*.glabels);;All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/File.cpp" line="131"/>
+        <location filename="../glabels/File.cpp" line="132"/>
         <source>Unable to open &quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/File.cpp" line="131"/>
+        <location filename="../glabels/File.cpp" line="132"/>
         <source>&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/File.cpp" line="183"/>
+        <location filename="../glabels/File.cpp" line="184"/>
         <source>gLabels - Save Project As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/File.cpp" line="196"/>
+        <location filename="../glabels/File.cpp" line="197"/>
         <source>Save Label As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/File.cpp" line="198"/>
+        <location filename="../glabels/File.cpp" line="199"/>
         <source>%1 already exists.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/File.cpp" line="199"/>
+        <location filename="../glabels/File.cpp" line="200"/>
         <source>Do you want to replace it?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1492,684 +911,654 @@
 <context>
     <name>glabels::LabelEditor</name>
     <message>
-        <location filename="../glabels/LabelEditor.cpp" line="640"/>
-        <location filename="../glabels/LabelEditor.cpp" line="940"/>
-        <location filename="../glabels/LabelEditor.cpp" line="945"/>
-        <location filename="../glabels/LabelEditor.cpp" line="950"/>
-        <location filename="../glabels/LabelEditor.cpp" line="955"/>
+        <location filename="../glabels/LabelEditor.cpp" line="641"/>
+        <location filename="../glabels/LabelEditor.cpp" line="941"/>
+        <location filename="../glabels/LabelEditor.cpp" line="946"/>
+        <location filename="../glabels/LabelEditor.cpp" line="951"/>
+        <location filename="../glabels/LabelEditor.cpp" line="956"/>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/LabelEditor.cpp" line="960"/>
+        <location filename="../glabels/LabelEditor.cpp" line="961"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>glabels::LabelModel</name>
-    <message>
-        <location filename="../glabels/LabelModel.cpp" line="276"/>
-        <source>Untitled</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>glabels::LabelModelBarcodeObject</name>
-    <message>
-        <location filename="../glabels/LabelModelBarcodeObject.cpp" line="424"/>
-        <source>No barcode data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/LabelModelBarcodeObject.cpp" line="438"/>
-        <source>Invalid barcode data</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>glabels::LabelModelTextObject</name>
-    <message>
-        <location filename="../glabels/LabelModelTextObject.cpp" line="421"/>
-        <location filename="../glabels/LabelModelTextObject.cpp" line="543"/>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>glabels::MainWindow</name>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="82"/>
+        <location filename="../glabels/MainWindow.cpp" line="83"/>
         <source>Welcome</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="88"/>
+        <location filename="../glabels/MainWindow.cpp" line="89"/>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="94"/>
+        <location filename="../glabels/MainWindow.cpp" line="95"/>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="100"/>
+        <location filename="../glabels/MainWindow.cpp" line="101"/>
         <source>Merge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="106"/>
+        <location filename="../glabels/MainWindow.cpp" line="107"/>
         <source>Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="224"/>
+        <location filename="../glabels/MainWindow.cpp" line="225"/>
         <source>&amp;New...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="227"/>
+        <location filename="../glabels/MainWindow.cpp" line="228"/>
         <source>Create a new gLabels project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="230"/>
+        <location filename="../glabels/MainWindow.cpp" line="231"/>
         <source>&amp;Open...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="233"/>
+        <location filename="../glabels/MainWindow.cpp" line="234"/>
         <source>Open an existing gLabels project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="236"/>
+        <location filename="../glabels/MainWindow.cpp" line="237"/>
         <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="239"/>
+        <location filename="../glabels/MainWindow.cpp" line="240"/>
         <source>Save current gLabels project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="242"/>
+        <location filename="../glabels/MainWindow.cpp" line="243"/>
         <source>Save &amp;As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="245"/>
+        <location filename="../glabels/MainWindow.cpp" line="246"/>
         <source>Save current gLabels project to a different name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="248"/>
+        <location filename="../glabels/MainWindow.cpp" line="249"/>
         <source>Template &amp;Designer...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="249"/>
+        <location filename="../glabels/MainWindow.cpp" line="250"/>
         <source>Create custom templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="252"/>
+        <location filename="../glabels/MainWindow.cpp" line="253"/>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="255"/>
+        <location filename="../glabels/MainWindow.cpp" line="256"/>
         <source>Close the current window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="258"/>
+        <location filename="../glabels/MainWindow.cpp" line="259"/>
         <source>E&amp;xit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="261"/>
+        <location filename="../glabels/MainWindow.cpp" line="262"/>
         <source>Exit glabels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="266"/>
-        <location filename="../glabels/MainWindow.cpp" line="269"/>
+        <location filename="../glabels/MainWindow.cpp" line="267"/>
+        <location filename="../glabels/MainWindow.cpp" line="270"/>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="272"/>
-        <location filename="../glabels/MainWindow.cpp" line="275"/>
+        <location filename="../glabels/MainWindow.cpp" line="273"/>
+        <location filename="../glabels/MainWindow.cpp" line="276"/>
         <source>Redo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="278"/>
-        <location filename="../glabels/MainWindow.cpp" line="486"/>
-        <location filename="../glabels/MainWindow.cpp" line="1082"/>
+        <location filename="../glabels/MainWindow.cpp" line="279"/>
+        <location filename="../glabels/MainWindow.cpp" line="487"/>
+        <location filename="../glabels/MainWindow.cpp" line="1083"/>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="281"/>
-        <location filename="../glabels/MainWindow.cpp" line="488"/>
+        <location filename="../glabels/MainWindow.cpp" line="282"/>
+        <location filename="../glabels/MainWindow.cpp" line="489"/>
         <source>Cut the selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="284"/>
-        <location filename="../glabels/MainWindow.cpp" line="491"/>
+        <location filename="../glabels/MainWindow.cpp" line="285"/>
+        <location filename="../glabels/MainWindow.cpp" line="492"/>
         <source>&amp;Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="287"/>
-        <location filename="../glabels/MainWindow.cpp" line="493"/>
+        <location filename="../glabels/MainWindow.cpp" line="288"/>
+        <location filename="../glabels/MainWindow.cpp" line="494"/>
         <source>Copy the selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="290"/>
-        <location filename="../glabels/MainWindow.cpp" line="496"/>
+        <location filename="../glabels/MainWindow.cpp" line="291"/>
+        <location filename="../glabels/MainWindow.cpp" line="497"/>
         <source>&amp;Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="293"/>
-        <location filename="../glabels/MainWindow.cpp" line="498"/>
+        <location filename="../glabels/MainWindow.cpp" line="294"/>
+        <location filename="../glabels/MainWindow.cpp" line="499"/>
         <source>Paste the clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="296"/>
-        <location filename="../glabels/MainWindow.cpp" line="501"/>
+        <location filename="../glabels/MainWindow.cpp" line="297"/>
+        <location filename="../glabels/MainWindow.cpp" line="502"/>
         <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="299"/>
-        <location filename="../glabels/MainWindow.cpp" line="503"/>
+        <location filename="../glabels/MainWindow.cpp" line="300"/>
+        <location filename="../glabels/MainWindow.cpp" line="504"/>
         <source>Delete the selected objects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="302"/>
+        <location filename="../glabels/MainWindow.cpp" line="303"/>
         <source>Select &amp;All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="305"/>
+        <location filename="../glabels/MainWindow.cpp" line="306"/>
         <source>Select all objects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="308"/>
+        <location filename="../glabels/MainWindow.cpp" line="309"/>
         <source>Un-select All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="310"/>
+        <location filename="../glabels/MainWindow.cpp" line="311"/>
         <source>Remove all selections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="313"/>
+        <location filename="../glabels/MainWindow.cpp" line="314"/>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="316"/>
+        <location filename="../glabels/MainWindow.cpp" line="317"/>
         <source>Configure the application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="321"/>
+        <location filename="../glabels/MainWindow.cpp" line="322"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="323"/>
+        <location filename="../glabels/MainWindow.cpp" line="324"/>
         <source>Change visibility of file toolbar in current window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="326"/>
+        <location filename="../glabels/MainWindow.cpp" line="327"/>
         <source>Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="328"/>
+        <location filename="../glabels/MainWindow.cpp" line="329"/>
         <source>Change visibility of editor toolbar in current window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="332"/>
+        <location filename="../glabels/MainWindow.cpp" line="333"/>
         <source>Grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="334"/>
+        <location filename="../glabels/MainWindow.cpp" line="335"/>
         <source>Change visibility of the grid in current window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="337"/>
+        <location filename="../glabels/MainWindow.cpp" line="338"/>
         <source>Markup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="339"/>
+        <location filename="../glabels/MainWindow.cpp" line="340"/>
         <source>Change visibility of markup lines in current window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="342"/>
+        <location filename="../glabels/MainWindow.cpp" line="343"/>
         <source>Zoom &amp;In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="345"/>
+        <location filename="../glabels/MainWindow.cpp" line="346"/>
         <source>Increase magnification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="348"/>
+        <location filename="../glabels/MainWindow.cpp" line="349"/>
         <source>Zoom &amp;Out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="351"/>
+        <location filename="../glabels/MainWindow.cpp" line="352"/>
         <source>Decrease magnification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="354"/>
+        <location filename="../glabels/MainWindow.cpp" line="355"/>
         <source>Zoom &amp;1 to 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="356"/>
+        <location filename="../glabels/MainWindow.cpp" line="357"/>
         <source>Restore scale to 100%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="359"/>
+        <location filename="../glabels/MainWindow.cpp" line="360"/>
         <source>Zoom to &amp;Fit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="361"/>
+        <location filename="../glabels/MainWindow.cpp" line="362"/>
         <source>Set scale to fit window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="366"/>
+        <location filename="../glabels/MainWindow.cpp" line="367"/>
         <source>Select Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="368"/>
+        <location filename="../glabels/MainWindow.cpp" line="369"/>
         <source>Select, move and modify objects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="371"/>
+        <location filename="../glabels/MainWindow.cpp" line="372"/>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="373"/>
+        <location filename="../glabels/MainWindow.cpp" line="374"/>
         <source>Create text object</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="376"/>
+        <location filename="../glabels/MainWindow.cpp" line="377"/>
         <source>Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="378"/>
+        <location filename="../glabels/MainWindow.cpp" line="379"/>
         <source>Create box object</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="381"/>
+        <location filename="../glabels/MainWindow.cpp" line="382"/>
         <source>Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="383"/>
+        <location filename="../glabels/MainWindow.cpp" line="384"/>
         <source>Create line object</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="386"/>
+        <location filename="../glabels/MainWindow.cpp" line="387"/>
         <source>Ellipse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="388"/>
+        <location filename="../glabels/MainWindow.cpp" line="389"/>
         <source>Create ellipse/circle object</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="391"/>
+        <location filename="../glabels/MainWindow.cpp" line="392"/>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="393"/>
+        <location filename="../glabels/MainWindow.cpp" line="394"/>
         <source>Create image object</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="396"/>
+        <location filename="../glabels/MainWindow.cpp" line="397"/>
         <source>Barcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="398"/>
+        <location filename="../glabels/MainWindow.cpp" line="399"/>
         <source>Create barcode object</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="401"/>
-        <location filename="../glabels/MainWindow.cpp" line="1291"/>
+        <location filename="../glabels/MainWindow.cpp" line="402"/>
+        <location filename="../glabels/MainWindow.cpp" line="1292"/>
         <source>Bring To Front</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="403"/>
+        <location filename="../glabels/MainWindow.cpp" line="404"/>
         <source>Raise selection to top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="406"/>
-        <location filename="../glabels/MainWindow.cpp" line="1301"/>
+        <location filename="../glabels/MainWindow.cpp" line="407"/>
+        <location filename="../glabels/MainWindow.cpp" line="1302"/>
         <source>Send To Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="408"/>
+        <location filename="../glabels/MainWindow.cpp" line="409"/>
         <source>Lower selection to bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="411"/>
-        <location filename="../glabels/MainWindow.cpp" line="1311"/>
+        <location filename="../glabels/MainWindow.cpp" line="412"/>
+        <location filename="../glabels/MainWindow.cpp" line="1312"/>
         <source>Rotate Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="413"/>
+        <location filename="../glabels/MainWindow.cpp" line="414"/>
         <source>Rotate object(s) 90 degrees counter-clockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="416"/>
-        <location filename="../glabels/MainWindow.cpp" line="1321"/>
+        <location filename="../glabels/MainWindow.cpp" line="417"/>
+        <location filename="../glabels/MainWindow.cpp" line="1322"/>
         <source>Rotate Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="418"/>
+        <location filename="../glabels/MainWindow.cpp" line="419"/>
         <source>Rotate object(s) 90 degrees clockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="421"/>
-        <location filename="../glabels/MainWindow.cpp" line="1331"/>
+        <location filename="../glabels/MainWindow.cpp" line="422"/>
+        <location filename="../glabels/MainWindow.cpp" line="1332"/>
         <source>Flip Horizontally</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="423"/>
+        <location filename="../glabels/MainWindow.cpp" line="424"/>
         <source>Flip object(s) horizontally</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="426"/>
-        <location filename="../glabels/MainWindow.cpp" line="1341"/>
+        <location filename="../glabels/MainWindow.cpp" line="427"/>
+        <location filename="../glabels/MainWindow.cpp" line="1342"/>
         <source>Flip Vertically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="428"/>
+        <location filename="../glabels/MainWindow.cpp" line="429"/>
         <source>Flip object(s) vertically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="431"/>
-        <location filename="../glabels/MainWindow.cpp" line="1351"/>
+        <location filename="../glabels/MainWindow.cpp" line="432"/>
+        <location filename="../glabels/MainWindow.cpp" line="1352"/>
         <source>Align Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="433"/>
+        <location filename="../glabels/MainWindow.cpp" line="434"/>
         <source>Align objects to left edges</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="436"/>
-        <location filename="../glabels/MainWindow.cpp" line="1361"/>
+        <location filename="../glabels/MainWindow.cpp" line="437"/>
+        <location filename="../glabels/MainWindow.cpp" line="1362"/>
         <source>Align Center</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="438"/>
+        <location filename="../glabels/MainWindow.cpp" line="439"/>
         <source>Align objects to horizontal centers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="441"/>
-        <location filename="../glabels/MainWindow.cpp" line="1371"/>
+        <location filename="../glabels/MainWindow.cpp" line="442"/>
+        <location filename="../glabels/MainWindow.cpp" line="1372"/>
         <source>Align Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="443"/>
+        <location filename="../glabels/MainWindow.cpp" line="444"/>
         <source>Align objects to right edges</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="446"/>
-        <location filename="../glabels/MainWindow.cpp" line="1381"/>
+        <location filename="../glabels/MainWindow.cpp" line="447"/>
+        <location filename="../glabels/MainWindow.cpp" line="1382"/>
         <source>Align Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="448"/>
+        <location filename="../glabels/MainWindow.cpp" line="449"/>
         <source>Align objects to top edges</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="451"/>
-        <location filename="../glabels/MainWindow.cpp" line="1391"/>
+        <location filename="../glabels/MainWindow.cpp" line="452"/>
+        <location filename="../glabels/MainWindow.cpp" line="1392"/>
         <source>Align Middle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="453"/>
+        <location filename="../glabels/MainWindow.cpp" line="454"/>
         <source>Align objects to vertical centers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="456"/>
-        <location filename="../glabels/MainWindow.cpp" line="1401"/>
+        <location filename="../glabels/MainWindow.cpp" line="457"/>
+        <location filename="../glabels/MainWindow.cpp" line="1402"/>
         <source>Align Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="458"/>
+        <location filename="../glabels/MainWindow.cpp" line="459"/>
         <source>Align objects to bottom edges</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="461"/>
-        <location filename="../glabels/MainWindow.cpp" line="1411"/>
+        <location filename="../glabels/MainWindow.cpp" line="462"/>
+        <location filename="../glabels/MainWindow.cpp" line="1412"/>
         <source>Center Horizontally</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="463"/>
+        <location filename="../glabels/MainWindow.cpp" line="464"/>
         <source>Horizontally center objects in label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="466"/>
-        <location filename="../glabels/MainWindow.cpp" line="1421"/>
+        <location filename="../glabels/MainWindow.cpp" line="467"/>
+        <location filename="../glabels/MainWindow.cpp" line="1422"/>
         <source>Center Vertically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="468"/>
+        <location filename="../glabels/MainWindow.cpp" line="469"/>
         <source>Vertically center objects in label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="473"/>
+        <location filename="../glabels/MainWindow.cpp" line="474"/>
         <source>&amp;Contents...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="476"/>
+        <location filename="../glabels/MainWindow.cpp" line="477"/>
         <source>Open gLabels manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="479"/>
+        <location filename="../glabels/MainWindow.cpp" line="480"/>
         <source>&amp;About...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="481"/>
+        <location filename="../glabels/MainWindow.cpp" line="482"/>
         <source>About gLabels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="513"/>
-        <location filename="../glabels/MainWindow.cpp" line="621"/>
+        <location filename="../glabels/MainWindow.cpp" line="514"/>
+        <location filename="../glabels/MainWindow.cpp" line="622"/>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="524"/>
+        <location filename="../glabels/MainWindow.cpp" line="525"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="538"/>
+        <location filename="../glabels/MainWindow.cpp" line="539"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="539"/>
+        <location filename="../glabels/MainWindow.cpp" line="540"/>
         <source>Toolbars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="551"/>
+        <location filename="../glabels/MainWindow.cpp" line="552"/>
         <source>&amp;Objects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="553"/>
+        <location filename="../glabels/MainWindow.cpp" line="554"/>
         <source>&amp;Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="561"/>
-        <location filename="../glabels/MainWindow.cpp" line="586"/>
+        <location filename="../glabels/MainWindow.cpp" line="562"/>
+        <location filename="../glabels/MainWindow.cpp" line="587"/>
         <source>&amp;Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="564"/>
-        <location filename="../glabels/MainWindow.cpp" line="589"/>
+        <location filename="../glabels/MainWindow.cpp" line="565"/>
+        <location filename="../glabels/MainWindow.cpp" line="590"/>
         <source>&amp;Rotate/Flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="569"/>
-        <location filename="../glabels/MainWindow.cpp" line="594"/>
+        <location filename="../glabels/MainWindow.cpp" line="570"/>
+        <location filename="../glabels/MainWindow.cpp" line="595"/>
         <source>&amp;Alignment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="577"/>
-        <location filename="../glabels/MainWindow.cpp" line="602"/>
+        <location filename="../glabels/MainWindow.cpp" line="578"/>
+        <location filename="../glabels/MainWindow.cpp" line="603"/>
         <source>Center</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="581"/>
+        <location filename="../glabels/MainWindow.cpp" line="582"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="630"/>
+        <location filename="../glabels/MainWindow.cpp" line="631"/>
         <source>&amp;Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="868"/>
+        <location filename="../glabels/MainWindow.cpp" line="869"/>
         <source>(modified)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="931"/>
+        <location filename="../glabels/MainWindow.cpp" line="932"/>
         <source>Save changes to project &quot;%1&quot; before closing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="932"/>
+        <location filename="../glabels/MainWindow.cpp" line="933"/>
         <source>Your changes will be lost if you don&apos;t save them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="935"/>
+        <location filename="../glabels/MainWindow.cpp" line="936"/>
         <source>Save project?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="1102"/>
+        <location filename="../glabels/MainWindow.cpp" line="1103"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="1112"/>
+        <location filename="../glabels/MainWindow.cpp" line="1113"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="1231"/>
+        <location filename="../glabels/MainWindow.cpp" line="1232"/>
         <source>Create Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="1241"/>
+        <location filename="../glabels/MainWindow.cpp" line="1242"/>
         <source>Create Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="1251"/>
+        <location filename="../glabels/MainWindow.cpp" line="1252"/>
         <source>Create Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="1261"/>
+        <location filename="../glabels/MainWindow.cpp" line="1262"/>
         <source>Create Ellipse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="1271"/>
+        <location filename="../glabels/MainWindow.cpp" line="1272"/>
         <source>Create Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MainWindow.cpp" line="1281"/>
+        <location filename="../glabels/MainWindow.cpp" line="1282"/>
         <source>Create Barcode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2177,17 +1566,17 @@
 <context>
     <name>glabels::MergeView</name>
     <message>
-        <location filename="../glabels/MergeView.cpp" line="43"/>
+        <location filename="../glabels/MergeView.cpp" line="41"/>
         <source>Merge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MergeView.cpp" line="194"/>
+        <location filename="../glabels/MergeView.cpp" line="192"/>
         <source>Select merge file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/MergeView.cpp" line="196"/>
+        <location filename="../glabels/MergeView.cpp" line="194"/>
         <source>All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2195,139 +1584,139 @@
 <context>
     <name>glabels::ObjectEditor</name>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="193"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="194"/>
         <source>Original size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="351"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="352"/>
         <source>Box object properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="372"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="373"/>
         <source>Ellipse object properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="393"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="394"/>
         <source>Image object properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="413"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="414"/>
         <source>Line object properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="434"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="435"/>
         <source>Text object properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="453"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="454"/>
         <source>Barcode object properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="538"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="539"/>
         <source>Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="554"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="555"/>
         <source>Fill</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="577"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="578"/>
         <source>Image files (*.png *.jpg *.jpeg *.gif *.bmp *.pbm *.pgm *.ppm *.xbm *.xpm *.svg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="578"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="579"/>
         <source>All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="579"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="580"/>
         <source>PNG - Portable Network Graphics (*.png)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="580"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="581"/>
         <source>BMP - Windows Bitmap (*.bmp)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="581"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="582"/>
         <source>GIF - Graphics Interchange Format (*.gif)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="582"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="583"/>
         <source>JPEG - Joint Photographic Experts Group (*.jpg *.jpeg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="583"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="584"/>
         <source>PBM - Portable Bitmap (*.pbm)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="584"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="585"/>
         <source>PGM - Portable Graymap (*.pgm)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="585"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="586"/>
         <source>PPM - Portable Pixmap (*.ppm)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="586"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="587"/>
         <source>SVG - Scalable Vector Graphics (*.svg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="587"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="588"/>
         <source>XBM - X11 Bitmap (*.xbm)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="588"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="589"/>
         <source>XPM - X11 Pixmap (*.xpm)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="592"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="593"/>
         <source>gLabels - Select image file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="597"/>
-        <location filename="../glabels/ObjectEditor.cpp" line="609"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="598"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="610"/>
         <source>Set image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="620"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="621"/>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="638"/>
-        <location filename="../glabels/ObjectEditor.cpp" line="672"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="639"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="673"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="691"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="692"/>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="765"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="766"/>
         <source>Shadow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2335,12 +1724,12 @@
 <context>
     <name>glabels::PrintView</name>
     <message>
-        <location filename="../glabels/PrintView.cpp" line="40"/>
+        <location filename="../glabels/PrintView.cpp" line="38"/>
         <source>Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/PrintView.cpp" line="87"/>
+        <location filename="../glabels/PrintView.cpp" line="85"/>
         <source>(Will print a total of %1 items on %2 pages.)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2374,72 +1763,12 @@
 <context>
     <name>main</name>
     <message>
-        <location filename="../glabels/glabels_main.cpp" line="79"/>
+        <location filename="../glabels/main.cpp" line="80"/>
         <source>gLabels Label Designer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/glabels-batch_main.cpp" line="82"/>
-        <source>Send output to &lt;printer&gt;. (Default=&quot;%1&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/glabels-batch_main.cpp" line="83"/>
-        <source>printer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/glabels-batch_main.cpp" line="87"/>
-        <source>Set output filename to &lt;filename&gt;. (Default=&quot;output.pdf&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/glabels-batch_main.cpp" line="88"/>
-        <source>filename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/glabels-batch_main.cpp" line="92"/>
-        <source>Set number of sheets to &lt;n&gt;. (Default=1)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/glabels-batch_main.cpp" line="96"/>
-        <source>Set number of copies to &lt;n&gt;. (Default=1)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/glabels-batch_main.cpp" line="100"/>
-        <source>Set starting label on 1st page to &lt;n&gt;. (Default=1)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/glabels-batch_main.cpp" line="104"/>
-        <source>Print label outlines.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/glabels-batch_main.cpp" line="107"/>
-        <source>Print crop marks.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/glabels-batch_main.cpp" line="110"/>
-        <source>Print in reverse (mirror image).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/glabels-batch_main.cpp" line="115"/>
-        <source>gLabels Label Designer (Batch Front-end)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/glabels-batch_main.cpp" line="120"/>
-        <source>gLabels project file to print.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/glabels_main.cpp" line="83"/>
+        <location filename="../glabels/main.cpp" line="84"/>
         <source>gLabels project files to open, optionally.</source>
         <translation type="unfinished"></translation>
     </message>