diff --git a/src/src/QDicomViewer.cpp b/src/src/UI/Window/QDicomViewer.cpp
similarity index 99%
rename from src/src/QDicomViewer.cpp
rename to src/src/UI/Window/QDicomViewer.cpp
index e689843..14feeb3 100644
--- a/src/src/QDicomViewer.cpp
+++ b/src/src/UI/Window/QDicomViewer.cpp
@@ -1,15 +1,10 @@
 #include "QDicomViewer.h"
-#include "base/SeriesImageSet.h"
 #include "UI/Widget/gridpopwidget.h"
-#include "view/ViewContainerWidget.h"
-#include "IO/DICOM/DicomLoader.h"
 
 #include <QFileDialog>
 #include <QDebug>
-#include <QInputDialog> 
 #include <QMenu>
 #include <QButtonGroup>
-#include <QRect>
 
 #include "cine/pqVCRToolbar.h"
 
diff --git a/src/src/QDicomViewer.h b/src/src/UI/Window/QDicomViewer.h
similarity index 99%
rename from src/src/QDicomViewer.h
rename to src/src/UI/Window/QDicomViewer.h
index b938547..bf99ca2 100644
--- a/src/src/QDicomViewer.h
+++ b/src/src/UI/Window/QDicomViewer.h
@@ -4,7 +4,7 @@
 #include "UI/Widget/importwidget.h"
 #include <QSettings>
 #include "export/exportdialog.h"
-#include "Customwindow.h"
+#include "customwindow.h"
 #include "measure/pqFontPropertyWidget.h"
 
 /**
diff --git a/src/src/QDicomViewer.ui b/src/src/UI/Window/QDicomViewer.ui
similarity index 100%
rename from src/src/QDicomViewer.ui
rename to src/src/UI/Window/QDicomViewer.ui
diff --git a/src/src/view/subview/customwindow.cpp b/src/src/UI/Window/customwindow.cpp
similarity index 95%
rename from src/src/view/subview/customwindow.cpp
rename to src/src/UI/Window/customwindow.cpp
index 8117dc4..0c99d95 100644
--- a/src/src/view/subview/customwindow.cpp
+++ b/src/src/UI/Window/customwindow.cpp
@@ -1,4 +1,4 @@
-#include "view/subview/customwindow.h"
+#include "customwindow.h"
 #include "view/dicomimageview.h"
 
 Customwindow::Customwindow(QWidget *parent)
diff --git a/src/src/view/subview/customwindow.h b/src/src/UI/Window/customwindow.h
similarity index 100%
rename from src/src/view/subview/customwindow.h
rename to src/src/UI/Window/customwindow.h
diff --git a/src/src/view/subview/metaDataWindow.cpp b/src/src/UI/Window/metaDataWindow.cpp
similarity index 100%
rename from src/src/view/subview/metaDataWindow.cpp
rename to src/src/UI/Window/metaDataWindow.cpp
diff --git a/src/src/view/subview/metaDataWindow.h b/src/src/UI/Window/metaDataWindow.h
similarity index 100%
rename from src/src/view/subview/metaDataWindow.h
rename to src/src/UI/Window/metaDataWindow.h
diff --git a/src/src/main.cpp b/src/src/main.cpp
index 23aeaf0..ff1c418 100644
--- a/src/src/main.cpp
+++ b/src/src/main.cpp
@@ -1,5 +1,5 @@
 #include <vtkAutoInit.h>
-#include "QDicomViewer.h"
+#include "UI/Window/QDicomViewer.h"
 #include <QtWidgets/QApplication>
 #include <QSurfaceFormat>
 #include "QVTKOpenGLNativeWidget.h"
diff --git a/src/src/view/dicomimageview.cpp b/src/src/view/dicomimageview.cpp
index cff5421..48a8db8 100644
--- a/src/src/view/dicomimageview.cpp
+++ b/src/src/view/dicomimageview.cpp
@@ -14,7 +14,7 @@
 #include "cine/pqVCRController.h"
 #include "cine/pqVCRToolbar.h"
 #include "vtkDiscretizableColorTransferFunction.h"
-#include "metaDataWindow.h"
+#include "UI/Window/metaDataWindow.h"
 #include "dcmtk/dcmdata/dcfilefo.h"
 
 //-----------------------------------------------------------------------------