diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5a769e1bd..f2ab34624 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -59,20 +59,20 @@ set(keepassx_SOURCES
     gui/DatabaseWidget.cpp
     gui/DialogyWidget.cpp
     gui/DragTabBar.cpp
-    gui/EditEntryWidget.cpp
-    gui/EditGroupWidget.cpp
     gui/EditWidget.cpp
     gui/EditWidgetIcons.cpp
-    gui/EntryAttachmentsModel.cpp
-    gui/EntryAttributesModel.cpp
-    gui/EntryModel.cpp
-    gui/EntryView.cpp
     gui/FileDialog.cpp
-    gui/GroupModel.cpp
-    gui/GroupView.cpp
     gui/IconModels.cpp
     gui/KeePass1OpenDialog.cpp
     gui/MainWindow.cpp
+    gui/entry/EditEntryWidget.cpp
+    gui/entry/EntryAttachmentsModel.cpp
+    gui/entry/EntryAttributesModel.cpp
+    gui/entry/EntryModel.cpp
+    gui/entry/EntryView.cpp
+    gui/group/EditGroupWidget.cpp
+    gui/group/GroupModel.cpp
+    gui/group/GroupView.cpp
     keys/CompositeKey.cpp
     keys/FileKey.cpp
     keys/Key.h
@@ -98,18 +98,18 @@ set(keepassx_MOC
     gui/DatabaseWidget.h
     gui/DialogyWidget.h
     gui/DragTabBar.h
-    gui/EditEntryWidget.h
-    gui/EditGroupWidget.h
     gui/EditWidget.h
     gui/EditWidgetIcons.h
-    gui/EntryAttachmentsModel.h
-    gui/EntryAttributesModel.h
-    gui/EntryModel.h
-    gui/EntryView.h
-    gui/GroupModel.h
-    gui/GroupView.h
     gui/IconModels.h
     gui/MainWindow.h
+    gui/entry/EditEntryWidget.h
+    gui/entry/EntryAttachmentsModel.h
+    gui/entry/EntryAttributesModel.h
+    gui/entry/EntryModel.h
+    gui/entry/EntryView.h
+    gui/group/EditGroupWidget.h
+    gui/group/GroupModel.h
+    gui/group/GroupView.h
     keys/CompositeKey_p.h
     streams/HashedBlockStream.h
     streams/LayeredStream.h
@@ -122,13 +122,13 @@ set(keepassx_FORMS
     gui/ChangeMasterKeyWidget.ui
     gui/DatabaseOpenDialog.ui
     gui/DatabaseSettingsWidget.ui
-    gui/EditEntryWidgetAdvanced.ui
-    gui/EditEntryWidgetMain.ui
-    gui/EditEntryWidgetNotes.ui
-    gui/EditGroupWidgetMain.ui
     gui/EditWidget.ui
     gui/EditWidgetIcons.ui
     gui/MainWindow.ui
+    gui/entry/EditEntryWidgetAdvanced.ui
+    gui/entry/EditEntryWidgetMain.ui
+    gui/entry/EditEntryWidgetNotes.ui
+    gui/group/EditGroupWidgetMain.ui
 )
 
 qt4_wrap_ui(keepassx_SOURCES ${keepassx_FORMS})
diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp
index 8e474f0b1..92430dea0 100644
--- a/src/gui/DatabaseTabWidget.cpp
+++ b/src/gui/DatabaseTabWidget.cpp
@@ -27,10 +27,10 @@
 #include "gui/DatabaseOpenDialog.h"
 #include "gui/DatabaseWidget.h"
 #include "gui/DragTabBar.h"
-#include "gui/EntryView.h"
 #include "gui/FileDialog.h"
-#include "gui/GroupView.h"
 #include "gui/KeePass1OpenDialog.h"
+#include "gui/entry/EntryView.h"
+#include "gui/group/GroupView.h"
 
 DatabaseManagerStruct::DatabaseManagerStruct()
     : file(0)
diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index 272478fdb..c5bb3b66c 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -27,10 +27,10 @@
 #include "core/Tools.h"
 #include "gui/ChangeMasterKeyWidget.h"
 #include "gui/DatabaseSettingsWidget.h"
-#include "gui/EditEntryWidget.h"
-#include "gui/EditGroupWidget.h"
-#include "gui/EntryView.h"
-#include "gui/GroupView.h"
+#include "gui/entry/EditEntryWidget.h"
+#include "gui/entry/EntryView.h"
+#include "gui/group/EditGroupWidget.h"
+#include "gui/group/GroupView.h"
 
 DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
     : QStackedWidget(parent)
diff --git a/src/gui/EditWidget.ui b/src/gui/EditWidget.ui
index 5231e5095..73885f0f0 100644
--- a/src/gui/EditWidget.ui
+++ b/src/gui/EditWidget.ui
@@ -61,7 +61,7 @@
   <customwidget>
    <class>CategoryListWidget</class>
    <extends>QListWidget</extends>
-   <header>gui/EditEntryWidget_p.h</header>
+   <header>gui/entry/EditEntryWidget_p.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 3f5006a5c..adddb51ec 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -25,7 +25,7 @@
 #include "core/Metadata.h"
 #include "gui/AboutDialog.h"
 #include "gui/DatabaseWidget.h"
-#include "gui/EntryView.h"
+#include "gui/entry/EntryView.h"
 
 MainWindow::MainWindow()
     : m_ui(new Ui::MainWindow())
diff --git a/src/gui/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp
similarity index 99%
rename from src/gui/EditEntryWidget.cpp
rename to src/gui/entry/EditEntryWidget.cpp
index dbcd300d3..5c31487c3 100644
--- a/src/gui/EditEntryWidget.cpp
+++ b/src/gui/entry/EditEntryWidget.cpp
@@ -30,9 +30,9 @@
 #include "core/Metadata.h"
 #include "core/Tools.h"
 #include "gui/EditWidgetIcons.h"
-#include "gui/EntryAttachmentsModel.h"
-#include "gui/EntryAttributesModel.h"
 #include "gui/FileDialog.h"
+#include "gui/entry/EntryAttachmentsModel.h"
+#include "gui/entry/EntryAttributesModel.h"
 
 EditEntryWidget::EditEntryWidget(QWidget* parent)
     : EditWidget(parent)
diff --git a/src/gui/EditEntryWidget.h b/src/gui/entry/EditEntryWidget.h
similarity index 100%
rename from src/gui/EditEntryWidget.h
rename to src/gui/entry/EditEntryWidget.h
diff --git a/src/gui/EditEntryWidgetAdvanced.ui b/src/gui/entry/EditEntryWidgetAdvanced.ui
similarity index 98%
rename from src/gui/EditEntryWidgetAdvanced.ui
rename to src/gui/entry/EditEntryWidgetAdvanced.ui
index b6a280a8b..cc4dd2242 100644
--- a/src/gui/EditEntryWidgetAdvanced.ui
+++ b/src/gui/entry/EditEntryWidgetAdvanced.ui
@@ -137,7 +137,7 @@
   <customwidget>
    <class>AttributesListView</class>
    <extends>QListView</extends>
-   <header>gui/EditEntryWidget_p.h</header>
+   <header>gui/entry/EditEntryWidget_p.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/gui/EditEntryWidgetMain.ui b/src/gui/entry/EditEntryWidgetMain.ui
similarity index 100%
rename from src/gui/EditEntryWidgetMain.ui
rename to src/gui/entry/EditEntryWidgetMain.ui
diff --git a/src/gui/EditEntryWidgetNotes.ui b/src/gui/entry/EditEntryWidgetNotes.ui
similarity index 100%
rename from src/gui/EditEntryWidgetNotes.ui
rename to src/gui/entry/EditEntryWidgetNotes.ui
diff --git a/src/gui/EditEntryWidget_p.h b/src/gui/entry/EditEntryWidget_p.h
similarity index 100%
rename from src/gui/EditEntryWidget_p.h
rename to src/gui/entry/EditEntryWidget_p.h
diff --git a/src/gui/EntryAttachmentsModel.cpp b/src/gui/entry/EntryAttachmentsModel.cpp
similarity index 100%
rename from src/gui/EntryAttachmentsModel.cpp
rename to src/gui/entry/EntryAttachmentsModel.cpp
diff --git a/src/gui/EntryAttachmentsModel.h b/src/gui/entry/EntryAttachmentsModel.h
similarity index 100%
rename from src/gui/EntryAttachmentsModel.h
rename to src/gui/entry/EntryAttachmentsModel.h
diff --git a/src/gui/EntryAttributesModel.cpp b/src/gui/entry/EntryAttributesModel.cpp
similarity index 100%
rename from src/gui/EntryAttributesModel.cpp
rename to src/gui/entry/EntryAttributesModel.cpp
diff --git a/src/gui/EntryAttributesModel.h b/src/gui/entry/EntryAttributesModel.h
similarity index 100%
rename from src/gui/EntryAttributesModel.h
rename to src/gui/entry/EntryAttributesModel.h
diff --git a/src/gui/EntryModel.cpp b/src/gui/entry/EntryModel.cpp
similarity index 100%
rename from src/gui/EntryModel.cpp
rename to src/gui/entry/EntryModel.cpp
diff --git a/src/gui/EntryModel.h b/src/gui/entry/EntryModel.h
similarity index 100%
rename from src/gui/EntryModel.h
rename to src/gui/entry/EntryModel.h
diff --git a/src/gui/EntryView.cpp b/src/gui/entry/EntryView.cpp
similarity index 98%
rename from src/gui/EntryView.cpp
rename to src/gui/entry/EntryView.cpp
index 4076a9c9f..5850b4a23 100644
--- a/src/gui/EntryView.cpp
+++ b/src/gui/entry/EntryView.cpp
@@ -19,7 +19,7 @@
 
 #include <QtGui/QSortFilterProxyModel>
 
-#include "gui/EntryModel.h"
+#include "gui/entry/EntryModel.h"
 
 EntryView::EntryView(QWidget* parent)
     : QTreeView(parent)
diff --git a/src/gui/EntryView.h b/src/gui/entry/EntryView.h
similarity index 100%
rename from src/gui/EntryView.h
rename to src/gui/entry/EntryView.h
diff --git a/src/gui/EditGroupWidget.cpp b/src/gui/group/EditGroupWidget.cpp
similarity index 100%
rename from src/gui/EditGroupWidget.cpp
rename to src/gui/group/EditGroupWidget.cpp
diff --git a/src/gui/EditGroupWidget.h b/src/gui/group/EditGroupWidget.h
similarity index 100%
rename from src/gui/EditGroupWidget.h
rename to src/gui/group/EditGroupWidget.h
diff --git a/src/gui/EditGroupWidgetMain.ui b/src/gui/group/EditGroupWidgetMain.ui
similarity index 100%
rename from src/gui/EditGroupWidgetMain.ui
rename to src/gui/group/EditGroupWidgetMain.ui
diff --git a/src/gui/GroupModel.cpp b/src/gui/group/GroupModel.cpp
similarity index 100%
rename from src/gui/GroupModel.cpp
rename to src/gui/group/GroupModel.cpp
diff --git a/src/gui/GroupModel.h b/src/gui/group/GroupModel.h
similarity index 100%
rename from src/gui/GroupModel.h
rename to src/gui/group/GroupModel.h
diff --git a/src/gui/GroupView.cpp b/src/gui/group/GroupView.cpp
similarity index 99%
rename from src/gui/GroupView.cpp
rename to src/gui/group/GroupView.cpp
index 012f3ab86..6d9715771 100644
--- a/src/gui/GroupView.cpp
+++ b/src/gui/group/GroupView.cpp
@@ -22,7 +22,7 @@
 
 #include "core/Database.h"
 #include "core/Group.h"
-#include "gui/GroupModel.h"
+#include "gui/group/GroupModel.h"
 
 GroupView::GroupView(Database* db, QWidget* parent)
     : QTreeView(parent)
diff --git a/src/gui/GroupView.h b/src/gui/group/GroupView.h
similarity index 100%
rename from src/gui/GroupView.h
rename to src/gui/group/GroupView.h
diff --git a/tests/TestEntryModel.cpp b/tests/TestEntryModel.cpp
index fad81aec5..53d5bc71a 100644
--- a/tests/TestEntryModel.cpp
+++ b/tests/TestEntryModel.cpp
@@ -26,10 +26,10 @@
 #include "core/Entry.h"
 #include "core/Group.h"
 #include "crypto/Crypto.h"
-#include "gui/EntryModel.h"
-#include "gui/EntryAttachmentsModel.h"
-#include "gui/EntryAttributesModel.h"
 #include "gui/IconModels.h"
+#include "gui/entry/EntryModel.h"
+#include "gui/entry/EntryAttachmentsModel.h"
+#include "gui/entry/EntryAttributesModel.h"
 
 void TestEntryModel::initTestCase()
 {
diff --git a/tests/TestGroupModel.cpp b/tests/TestGroupModel.cpp
index 5daf2a611..abf727f84 100644
--- a/tests/TestGroupModel.cpp
+++ b/tests/TestGroupModel.cpp
@@ -25,7 +25,7 @@
 #include "core/Database.h"
 #include "core/Group.h"
 #include "crypto/Crypto.h"
-#include "gui/GroupModel.h"
+#include "gui/group/GroupModel.h"
 
 void TestGroupModel::initTestCase()
 {
diff --git a/tests/gui/TestGui.cpp b/tests/gui/TestGui.cpp
index 680e51311..9647e70e7 100644
--- a/tests/gui/TestGui.cpp
+++ b/tests/gui/TestGui.cpp
@@ -31,10 +31,10 @@
 #include "core/Entry.h"
 #include "gui/DatabaseTabWidget.h"
 #include "gui/DatabaseWidget.h"
-#include "gui/EditEntryWidget.h"
-#include "gui/EntryView.h"
 #include "gui/FileDialog.h"
 #include "gui/MainWindow.h"
+#include "gui/entry/EditEntryWidget.h"
+#include "gui/entry/EntryView.h"
 
 void TestGui::initTestCase()
 {