Restructuring directory layout. Move towards "Modern CMake" usage.

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;