diff --git a/CMakeLists.txt b/CMakeLists.txt
index 343b0cc9abf2ec6ec63b8c78ce15cdc647e4167a..3de39658a79985897c58bc97ab73aec4c11a5a5e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ if(APPLE)
 endif()
 
 openflipper_plugin (INSTALLDATA Icons  
-                    DIRS OpenMesh OpenVolumeMesh Widgets ScriptObjects
+                    DIRS OpenMesh OpenVolumeMesh Widgets ScriptObjects Toolbars
                     DEPS OpenMesh 
                     OPTDEPS OpenVolumeMesh
                     OPT_TYPES SKELETON BSPLINECURVE POLYHEDRALMESH HEXAHEDRALMESH TETRAHEDRALMESH
diff --git a/PropertyVisPlugin.hh b/PropertyVisPlugin.hh
index 529261c271fa7a3fe38d519e27f87eeb74d8ff6f..4522abc019c88ddb988ada09c9566a5b74d953c0 100644
--- a/PropertyVisPlugin.hh
+++ b/PropertyVisPlugin.hh
@@ -77,7 +77,7 @@
 #include <OpenFlipper/BasePlugin/ScriptInterface.hh>
 #include <OpenFlipper/BasePlugin/LoggingInterface.hh>
 
-#include "PropertyVisToolbar.hh"
+#include "Toolbars/PropertyVisToolbar.hh"
 #include "ObjectListItemModel.hh"
 
 #include "PropertyModel.hh"
diff --git a/PropertyVisToolbar.hh b/Toolbars/PropertyVisToolbar.hh
similarity index 99%
rename from PropertyVisToolbar.hh
rename to Toolbars/PropertyVisToolbar.hh
index d19f0df9343a70d6da30da5b39a790b5db7eb5cd..572d69bd5e0b8629fd5ba28e1b04706a9d7a3a82 100644
--- a/PropertyVisToolbar.hh
+++ b/Toolbars/PropertyVisToolbar.hh
@@ -49,7 +49,7 @@
 
 #include "ui_PropertyVisToolbarBase.hh"
 
-  #include <QtWidgets>
+#include <QtWidgets>
 
 
 class PropertyVisToolbar : public QWidget, public Ui::PropertyVisToolbarBase
diff --git a/PropertyVisToolbarBase.ui b/Toolbars/PropertyVisToolbarBase.ui
similarity index 100%
rename from PropertyVisToolbarBase.ui
rename to Toolbars/PropertyVisToolbarBase.ui