diff --git a/modules/gui/pymod/CMakeLists.txt b/modules/gui/pymod/CMakeLists.txt
index 016e6628cf277483e88ba76e372653d168666186..c56b7807dbfafecf79249569b476c0e599b7f578 100644
--- a/modules/gui/pymod/CMakeLists.txt
+++ b/modules/gui/pymod/CMakeLists.txt
@@ -13,7 +13,7 @@ set(OST_GUI_PYMOD_SOURCES
   export_sip_handler.cc
   export_scene_selection.cc
   export_main_area.cc
-  export_panel_bar.cc
+  export_panels.cc
   export_menu_bar.cc
   export_file_loader.cc
   export_file_viewer.cc
diff --git a/modules/gui/pymod/export_panel_bar.cc b/modules/gui/pymod/export_panels.cc
similarity index 74%
rename from modules/gui/pymod/export_panel_bar.cc
rename to modules/gui/pymod/export_panels.cc
index cfac8c128a7b8ea7c5d0a66abb62edaf1df4f144..580f82c5f3a9aff4602a3908dd78dc095a00fd4e 100644
--- a/modules/gui/pymod/export_panel_bar.cc
+++ b/modules/gui/pymod/export_panels.cc
@@ -18,8 +18,8 @@
 //------------------------------------------------------------------------------
 #include <boost/python.hpp>
 
-#include <ost/gui/panel_bar/panels.hh>
-#include <ost/gui/panel_bar/panel_bar.hh>
+#include <ost/gui/panels/panel_manager.hh>
+#include <ost/gui/panels/panel_bar.hh>
 #include "ost/gui/widget.hh"
 
 #include "sip_handler.hh"
@@ -31,69 +31,69 @@ using namespace ost;
 using namespace ost::gui;
 
 namespace{
-void panels_add_widget_a(Panels * panels, PanelPosition pos, const SipHandlerBase& sh, bool hidden=false)
+void panels_add_widget_a(PanelManager * panels, PanelPosition pos, const SipHandlerBase& sh, bool hidden=false)
 {
   if(Widget* widget = reinterpret_cast<Widget*>(sh.GetSipHandle())){
     panels->AddWidget(pos,widget,hidden);
   }
 }
 
-void panels_add_widget_b(Panels * panels, PanelPosition pos, Widget* widget, bool hidden=false)
+void panels_add_widget_b(PanelManager * panels, PanelPosition pos, Widget* widget, bool hidden=false)
 {
   panels->AddWidget(pos,widget,hidden);
 }
 
-void panels_add_widget_c(Panels * panels, PanelPosition pos, object py_object, bool hidden=false)
+void panels_add_widget_c(PanelManager * panels, PanelPosition pos, object py_object, bool hidden=false)
 {
   if(Widget* widget = get_cpp_qobject<Widget>(py_object)){
     panels->AddWidget(pos,widget,hidden);
   }
 }
 
-void panels_remove_widget_a(Panels * panels, Widget* w)
+void panels_remove_widget_a(PanelManager * panels, Widget* w)
 {
   panels->RemoveWidget(w);
 }
 
-void panels_remove_widget_b(Panels * panels, const SipHandlerBase& sh)
+void panels_remove_widget_b(PanelManager * panels, const SipHandlerBase& sh)
 {
   if(Widget* widget = reinterpret_cast<Widget*>(sh.GetSipHandle())){
     panels->RemoveWidget(widget);
   }
 }
 
-void panels_remove_widget_c(Panels * panels, object py_object)
+void panels_remove_widget_c(PanelManager * panels, object py_object)
 {
   if(Widget* widget = get_cpp_qobject<Widget>(py_object)){
     panels->RemoveWidget(widget);
   }
 }
 
-void panels_add_widget_to_pool_a(Panels * panels, const QString& full_name, Widget* widget)
+void panels_add_widget_to_pool_a(PanelManager * panels, const QString& full_name, Widget* widget)
 {
   panels->AddWidgetToPool(full_name,widget);
 }
 
-void panels_add_widget_to_pool_b(Panels * panels, const QString& full_name, const SipHandlerBase& sh)
+void panels_add_widget_to_pool_b(PanelManager * panels, const QString& full_name, const SipHandlerBase& sh)
 {
   if(Widget* widget = reinterpret_cast<Widget*>(sh.GetSipHandle())){
     panels->AddWidgetToPool(full_name,widget);
   }
 }
 
-void panels_add_widget_to_pool_c(Panels * panels, const QString& full_name, object py_object)
+void panels_add_widget_to_pool_c(PanelManager * panels, const QString& full_name, object py_object)
 {
   if(Widget* widget = get_cpp_qobject<Widget>(py_object)){
     panels->AddWidgetToPool(full_name,widget);
   }
 }
 
-void panels_add_widget_to_pool_d(Panels * panels, const QString& name, int limit=-1)
+void panels_add_widget_to_pool_d(PanelManager * panels, const QString& name, int limit=-1)
 {
   panels->AddWidgetToPool(name,limit);
 }
 
-object panels_get_menu(Panels* panels)
+object panels_get_menu(PanelManager* panels)
 {
   return get_py_qobject<QMenu>(panels->GetMenu());
 }
@@ -119,7 +119,7 @@ void panel_bar_add_widget_c(PanelBar * pb, object py_object, bool hidden=false)
 
 }
 
-void export_PanelBar()
+void export_Panels()
 {
   enum_<PanelPosition>("PanelPosition")
       .value("LEFT_PANEL", LEFT_PANEL)
@@ -129,11 +129,11 @@ void export_PanelBar()
       .export_values()
       ;
 
-  class_<Panels, boost::noncopyable>("Panels", no_init)
+  class_<PanelManager, boost::noncopyable>("PanelManager", no_init)
     .def("AddWidget", &panels_add_widget_a, arg("hidden")=false)
     .def("AddWidget", &panels_add_widget_b, arg("hidden")=false)
     .def("AddWidget", &panels_add_widget_c, arg("hidden")=false)
-    .def("AddWidgetByName", &Panels::AddWidgetByName)
+    .def("AddWidgetByName", &PanelManager::AddWidgetByName)
     .def("RemoveWidget", &panels_remove_widget_a)
     .def("RemoveWidget", &panels_remove_widget_b)
     .def("RemoveWidget", &panels_remove_widget_c)
@@ -142,11 +142,11 @@ void export_PanelBar()
     .def("AddWidgetToPool", &panels_add_widget_to_pool_b)
     .def("AddWidgetToPool", &panels_add_widget_to_pool_c)
     .def("AddWidgetToPool", &panels_add_widget_to_pool_d)
-    .def("Save", &Panels::Save)
-    .def("Restore", &Panels::Restore)
+    .def("Save", &PanelManager::Save)
+    .def("Restore", &PanelManager::Restore)
     .add_property("menu", &panels_get_menu)
-    .def("GetQObject",&get_py_qobject<Panels>)
-    .add_property("qobject", &get_py_qobject<Panels>)
+    .def("GetQObject",&get_py_qobject<PanelManager>)
+    .add_property("qobject", &get_py_qobject<PanelManager>)
   ;
 
   class_<PanelBar, boost::noncopyable>("PanelBar", no_init)
diff --git a/modules/gui/pymod/export_widget.cc b/modules/gui/pymod/export_widget.cc
index 0834cec320d4fbe31425328066c3ad6b66d35529..5cbf406b0a6172b3732b71f934eaef0ab3ce979d 100644
--- a/modules/gui/pymod/export_widget.cc
+++ b/modules/gui/pymod/export_widget.cc
@@ -20,14 +20,10 @@
 
 #include <boost/python.hpp>
 #include <boost/python/register_ptr_to_python.hpp>
-#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
+
 using namespace boost::python;
 
 #include <ost/gui/widget.hh>
-#include <ost/gui/widget_registry.hh>
-#include <ost/gui/gosty_app.hh>
-#include <ost/gui/perspective.hh>
-#include <ost/gui/panel_bar/panels.hh>
 
 #include "sip_handler.hh"
 
diff --git a/modules/gui/pymod/wrap_gui.cc b/modules/gui/pymod/wrap_gui.cc
index 2746c6ce7019de29a7c0040c3e2ffc8f15dbb288..5de3935fe0a97368e7207982cb00e34c938a4a63 100644
--- a/modules/gui/pymod/wrap_gui.cc
+++ b/modules/gui/pymod/wrap_gui.cc
@@ -33,7 +33,7 @@ void export_Gosty();
 void export_PyShell();
 void export_SceneWin();
 void export_SequenceViewer();
-void export_PanelBar();
+void export_Panels();
 void export_Perspective();
 void export_SipHandler();
 void export_SceneSelection();
@@ -111,7 +111,7 @@ BOOST_PYTHON_MODULE(_gui)
   export_GLWin();
   export_MainArea();
   export_PyShell();
-  export_PanelBar();
+  export_Panels();
   export_MenuBar();
   export_Perspective();  
   export_SceneWin();
diff --git a/modules/gui/src/CMakeLists.txt b/modules/gui/src/CMakeLists.txt
index e26043125535f045a95cddd5eb64eef31dd978e6..e27aa276978108fcff8a08d98d3f176815e7c8c2 100644
--- a/modules/gui/src/CMakeLists.txt
+++ b/modules/gui/src/CMakeLists.txt
@@ -1,8 +1,8 @@
 set(OST_GUI_PANEL_BAR_HEADERS
 button_bar.hh
 drop_box.hh
-panels.hh
 panel_bar.hh
+panel_manager.hh
 bottom_bar.hh
 button_box.hh
 event_button.hh
@@ -238,18 +238,18 @@ scene_selection.cc
 widget_geom_handler.cc
 file_loader.cc
 loader_manager.cc
-panel_bar/button_bar.cc
-panel_bar/drop_box.cc
-panel_bar/panel_bar.cc
-panel_bar/bottom_bar.cc
-panel_bar/button_box.cc
-panel_bar/event_button.cc
-panel_bar/panels.cc
-panel_bar/panel_widget_container.cc
-panel_bar/panel_bar_widget_holder.cc
-panel_bar/side_bar.cc
-panel_bar/splitter_panel_bar.cc
-panel_bar/tabbed_panel_bar.cc
+panels/button_bar.cc
+panels/drop_box.cc
+panels/panel_bar.cc
+panels/bottom_bar.cc
+panels/button_box.cc
+panels/event_button.cc
+panels/panel_manager.cc
+panels/panel_widget_container.cc
+panels/panel_bar_widget_holder.cc
+panels/side_bar.cc
+panels/splitter_panel_bar.cc
+panels/tabbed_panel_bar.cc
 tools/tool_option_group.cc
 tools/tool_options.cc
 tools/tool_option.cc
@@ -388,18 +388,18 @@ python_shell/state.hh
 python_shell/transition.hh
 python_shell/transition_guard.hh
 python_shell/output_redirector.hh
-panel_bar/button_bar.hh
-panel_bar/drop_box.hh
-panel_bar/panel_bar.hh
-panel_bar/panels.hh
-panel_bar/bottom_bar.hh
-panel_bar/button_box.hh
-panel_bar/event_button.hh
-panel_bar/panel_widget_container.hh
-panel_bar/panel_bar_widget_holder.hh
-panel_bar/side_bar.hh
-panel_bar/splitter_panel_bar.hh
-panel_bar/tabbed_panel_bar.hh
+panels/button_bar.hh
+panels/drop_box.hh
+panels/panel_bar.hh
+panels/panel_manager.hh
+panels/bottom_bar.hh
+panels/button_box.hh
+panels/event_button.hh
+panels/panel_widget_container.hh
+panels/panel_bar_widget_holder.hh
+panels/side_bar.hh
+panels/splitter_panel_bar.hh
+panels/tabbed_panel_bar.hh
 scene_win/context_menu.hh
 scene_win/current_selection_node.hh
 scene_win/custom_part_node.hh
@@ -475,7 +475,7 @@ module(NAME gui SOURCES ${OST_GUI_MOCS} ${OST_GUI_SOURCES}
                ${OST_GUI_PLOT_VIEWER_HEADERS} IN_DIR plot_viewer
                ${OST_GUI_SEQUENCE_VIEWER_HEADERS} IN_DIR sequence_viewer
                ${OST_GUI_PYTHON_SHELL_HEADERS} IN_DIR python_shell
-               ${OST_GUI_PANEL_BAR_HEADERS} IN_DIR panel_bar
+               ${OST_GUI_PANEL_BAR_HEADERS} IN_DIR panels
                ${OST_GUI_SCENE_WIN_HEADERS} IN_DIR scene_win
                ${OST_GUI_INPUT_HEADERS}
                ${OST_GUI_DATA_VIEWER_HEADERS}
diff --git a/modules/gui/src/file_browser.cc b/modules/gui/src/file_browser.cc
index ee0126439d98103a3efc18f2baa8c0c6c09d6965..965e3321a03e305f511fbaa720b09d8adcebed7f 100644
--- a/modules/gui/src/file_browser.cc
+++ b/modules/gui/src/file_browser.cc
@@ -39,7 +39,7 @@
 
 #include <ost/gui/gosty_app.hh>
 #include <ost/gui/perspective.hh>
-#include <ost/gui/panel_bar/panels.hh>
+#include <ost/gui/panels/panel_manager.hh>
 #include <ost/gui/file_loader.hh>
 #include <ost/gui/file_viewer.hh>
 
@@ -176,7 +176,7 @@ void FileBrowser::UpdateMenu(const QString& path){
 }
 
 void FileBrowser::Split(){
-  Panels* panels = GostyApp::Instance()->GetPerspective()->GetPanels();
+  PanelManager* panels = GostyApp::Instance()->GetPerspective()->GetPanels();
   QString current_path = model_->filePath(view_->rootIndex());
   Widget* new_file_browser = new FileBrowser(current_path);
   panels->MoveNextTo(qobject_cast<Widget*>(this), new_file_browser);
diff --git a/modules/gui/src/panel_bar/bottom_bar.cc b/modules/gui/src/panels/bottom_bar.cc
similarity index 100%
rename from modules/gui/src/panel_bar/bottom_bar.cc
rename to modules/gui/src/panels/bottom_bar.cc
diff --git a/modules/gui/src/panel_bar/bottom_bar.hh b/modules/gui/src/panels/bottom_bar.hh
similarity index 100%
rename from modules/gui/src/panel_bar/bottom_bar.hh
rename to modules/gui/src/panels/bottom_bar.hh
diff --git a/modules/gui/src/panel_bar/button_bar.cc b/modules/gui/src/panels/button_bar.cc
similarity index 100%
rename from modules/gui/src/panel_bar/button_bar.cc
rename to modules/gui/src/panels/button_bar.cc
diff --git a/modules/gui/src/panel_bar/button_bar.hh b/modules/gui/src/panels/button_bar.hh
similarity index 100%
rename from modules/gui/src/panel_bar/button_bar.hh
rename to modules/gui/src/panels/button_bar.hh
diff --git a/modules/gui/src/panel_bar/button_box.cc b/modules/gui/src/panels/button_box.cc
similarity index 100%
rename from modules/gui/src/panel_bar/button_box.cc
rename to modules/gui/src/panels/button_box.cc
diff --git a/modules/gui/src/panel_bar/button_box.hh b/modules/gui/src/panels/button_box.hh
similarity index 100%
rename from modules/gui/src/panel_bar/button_box.hh
rename to modules/gui/src/panels/button_box.hh
diff --git a/modules/gui/src/panel_bar/drop_box.cc b/modules/gui/src/panels/drop_box.cc
similarity index 100%
rename from modules/gui/src/panel_bar/drop_box.cc
rename to modules/gui/src/panels/drop_box.cc
diff --git a/modules/gui/src/panel_bar/drop_box.hh b/modules/gui/src/panels/drop_box.hh
similarity index 100%
rename from modules/gui/src/panel_bar/drop_box.hh
rename to modules/gui/src/panels/drop_box.hh
diff --git a/modules/gui/src/panel_bar/event_button.cc b/modules/gui/src/panels/event_button.cc
similarity index 100%
rename from modules/gui/src/panel_bar/event_button.cc
rename to modules/gui/src/panels/event_button.cc
diff --git a/modules/gui/src/panel_bar/event_button.hh b/modules/gui/src/panels/event_button.hh
similarity index 100%
rename from modules/gui/src/panel_bar/event_button.hh
rename to modules/gui/src/panels/event_button.hh
diff --git a/modules/gui/src/panel_bar/panel_bar.cc b/modules/gui/src/panels/panel_bar.cc
similarity index 99%
rename from modules/gui/src/panel_bar/panel_bar.cc
rename to modules/gui/src/panels/panel_bar.cc
index db90f50d33ea08f0a312b020a4f66c20c66b64af..1afbfe13818b2e730df6b0e2369c586cbef77338 100644
--- a/modules/gui/src/panel_bar/panel_bar.cc
+++ b/modules/gui/src/panels/panel_bar.cc
@@ -22,14 +22,14 @@
 
 #include <ost/gui/gosty_app.hh>
 #include <ost/gui/perspective.hh>
-#include <ost/gui/panel_bar/panels.hh>
-#include <ost/gui/panel_bar/drop_box.hh>
 #include <ost/gui/widget.hh>
 #include <ost/gui/widget_registry.hh>
 
+#include "drop_box.hh"
 #include "panel_bar.hh"
-#include "tabbed_panel_bar.hh"
+#include "panel_manager.hh"
 #include "splitter_panel_bar.hh"
+#include "tabbed_panel_bar.hh"
 
 namespace ost {
 namespace gui {
diff --git a/modules/gui/src/panel_bar/panel_bar.hh b/modules/gui/src/panels/panel_bar.hh
similarity index 100%
rename from modules/gui/src/panel_bar/panel_bar.hh
rename to modules/gui/src/panels/panel_bar.hh
diff --git a/modules/gui/src/panel_bar/panel_bar_widget_holder.cc b/modules/gui/src/panels/panel_bar_widget_holder.cc
similarity index 95%
rename from modules/gui/src/panel_bar/panel_bar_widget_holder.cc
rename to modules/gui/src/panels/panel_bar_widget_holder.cc
index d017071ccdcd72ea9048eba9ece439dd07587d95..7237ba1e49854d61e427198e39552aa9089a2bbf 100644
--- a/modules/gui/src/panel_bar/panel_bar_widget_holder.cc
+++ b/modules/gui/src/panels/panel_bar_widget_holder.cc
@@ -37,9 +37,9 @@
 #include <ost/gui/widget_registry.hh>
 #include <ost/gui/gosty_app.hh>
 #include <ost/gui/perspective.hh>
-#include <ost/gui/panel_bar/panel_bar.hh>
-#include <ost/gui/panel_bar/panels.hh>
 
+#include "panel_manager.hh"
+#include "panel_bar.hh"
 #include "panel_bar_widget_holder.hh"
 
 /*
@@ -134,7 +134,7 @@ void PanelBarWidgetHolder::SetWidget(Widget* widget)
 
 void PanelBarWidgetHolder::LabelClick(bool checked)
 {
-  Panels* panels = GostyApp::Instance()->GetPerspective()->GetPanels();
+  PanelManager* panels = GostyApp::Instance()->GetPerspective()->GetPanels();
   QMenu* m = panels->GetAvailableWidgetsMenu();
   if (QAction* a=m->exec(toolbar_->mapToGlobal(QPoint(0, 0)))) {
     QString new_class_name=a->data().toString();
@@ -172,14 +172,14 @@ void PanelBarWidgetHolder::mouseMoveEvent(QMouseEvent *event)
 
   drag->setMimeData(mime_data);
   drag->exec();
-  Panels* panels = GostyApp::Instance()->GetPerspective()->GetPanels();
+  PanelManager* panels = GostyApp::Instance()->GetPerspective()->GetPanels();
   panels->EndDrag();
 }
 
 void PanelBarWidgetHolder::dragEnterEvent(QDragEnterEvent *event)
 {
   if (event->mimeData()->hasFormat("OpenStructure/Widget")){
-    Panels* panels = GostyApp::Instance()->GetPerspective()->GetPanels();
+    PanelManager* panels = GostyApp::Instance()->GetPerspective()->GetPanels();
     panels->StartDrag();
     event->acceptProposedAction();
   }
diff --git a/modules/gui/src/panel_bar/panel_bar_widget_holder.hh b/modules/gui/src/panels/panel_bar_widget_holder.hh
similarity index 100%
rename from modules/gui/src/panel_bar/panel_bar_widget_holder.hh
rename to modules/gui/src/panels/panel_bar_widget_holder.hh
diff --git a/modules/gui/src/panel_bar/panels.cc b/modules/gui/src/panels/panel_manager.cc
similarity index 90%
rename from modules/gui/src/panel_bar/panels.cc
rename to modules/gui/src/panels/panel_manager.cc
index 3f6eedae94617bab6e4bd22284ceb4bfa3c354c7..52ccf6058a4be55bd61071cdce88ce32c7607660 100644
--- a/modules/gui/src/panel_bar/panels.cc
+++ b/modules/gui/src/panels/panel_manager.cc
@@ -25,7 +25,7 @@
 
 #include "bottom_bar.hh"
 #include "side_bar.hh"
-#include "panels.hh"
+#include "panel_manager.hh"
 #include "tabbed_panel_bar.hh"
 #include "splitter_panel_bar.hh"
 
@@ -45,7 +45,7 @@ public:
 };
 
 
-Panels::Panels(QWidget* widget):
+PanelManager::PanelManager(QWidget* widget):
  Widget(NULL, widget->parentWidget()),
      right_panel_splitter_(new ThinSplitter(Qt::Horizontal, this)),
      left_panel_splitter_(new ThinSplitter(Qt::Horizontal, this)),
@@ -97,11 +97,11 @@ Panels::Panels(QWidget* widget):
   this->acceptDrops();
 }
 
-void Panels::AddWidgetToPool(const QString& class_name, int limit){
+void PanelManager::AddWidgetToPool(const QString& class_name, int limit){
   pool_->Add(class_name, limit);
 }
 
-void Panels::AddWidgetToPool(const QString& name, Widget* widget){
+void PanelManager::AddWidgetToPool(const QString& name, Widget* widget){
   QString id = widget->metaObject()->className();
   widget->setParent(this);
   id.replace(".", "::");
@@ -110,7 +110,7 @@ void Panels::AddWidgetToPool(const QString& name, Widget* widget){
   pool_->Add(id, 1);
 }
 
-void Panels::AddWidget(PanelPosition pos, Widget* widget, bool is_hidden){
+void PanelManager::AddWidget(PanelPosition pos, Widget* widget, bool is_hidden){
   if(panels_.contains(pos) && this->GetParentPanel(widget) == NONE){
     if(pool_->IsAvailable(widget->metaObject()->className())){
       panels_[pos]->AddWidget(widget,is_hidden);
@@ -119,7 +119,7 @@ void Panels::AddWidget(PanelPosition pos, Widget* widget, bool is_hidden){
   }
 }
 
-void Panels::AddWidgetByName(PanelPosition pos, const QString& class_name, 
+void PanelManager::AddWidgetByName(PanelPosition pos, const QString& class_name,
                              bool is_hidden)
 {
   QString n=class_name;
@@ -130,7 +130,7 @@ void Panels::AddWidgetByName(PanelPosition pos, const QString& class_name,
   }
 }
 
-bool Panels::Save(const QString& prefix)
+bool PanelManager::Save(const QString& prefix)
 {
   bool saveok = true;
   QSettings settings;
@@ -172,7 +172,7 @@ bool Panels::Save(const QString& prefix)
   return saveok;
 }
 
-bool Panels::Restore(const QString& prefix)
+bool PanelManager::Restore(const QString& prefix)
 {
   QList<int> sizes = QList<int>();
   QSettings settings;
@@ -214,13 +214,13 @@ bool Panels::Restore(const QString& prefix)
   return restoreok;
 }
 
-void Panels::ToggleViewMode(PanelPosition pos){
+void PanelManager::ToggleViewMode(PanelPosition pos){
   if(panels_.contains(pos)){
    panels_[pos]->ToggleViewMode();
   }
 }
 
-void Panels::ToggleHide(){
+void PanelManager::ToggleHide(){
   QMapIterator<PanelPosition, PanelBar*> i(panels_);
   while (i.hasNext()) {
       i.next();
@@ -228,13 +228,13 @@ void Panels::ToggleHide(){
   }
 }
 
-void Panels::ToggleHide(PanelPosition pos){
+void PanelManager::ToggleHide(PanelPosition pos){
   if(panels_.contains(pos)){
    panels_[pos]->ToggleHide();
   }
 }
 
-void Panels::MoveWidget(Widget * widget, PanelPosition pos, int index){
+void PanelManager::MoveWidget(Widget * widget, PanelPosition pos, int index){
   if(panels_.contains(pos)){
     PanelPosition current_position = this->GetParentPanel(widget);
     if(current_position == pos){
@@ -253,14 +253,14 @@ void Panels::MoveWidget(Widget * widget, PanelPosition pos, int index){
   }
 }
 
-void Panels::MoveNextTo(Widget* target, Widget* widget){
+void PanelManager::MoveNextTo(Widget* target, Widget* widget){
   PanelPosition target_position =  this->GetParentPanel(target);
   if(panels_.contains(target_position)){
     this->MoveWidget(widget,target_position,panels_[target_position]->GetIndex(target));
   }
 }
 
-void Panels::ReplaceWidget(Widget* w1, Widget* w2){
+void PanelManager::ReplaceWidget(Widget* w1, Widget* w2){
   if(pool_->IsAvailable(w2->metaObject()->className())){
     PanelPosition pos_w1 = this->GetParentPanel(w1);
     PanelPosition pos_w2  = this->GetParentPanel(w2);
@@ -274,7 +274,7 @@ void Panels::ReplaceWidget(Widget* w1, Widget* w2){
   }
 }
 
-void Panels::ReplaceWidget(Widget* w1, QString& class_name){
+void PanelManager::ReplaceWidget(Widget* w1, QString& class_name){
   if(pool_->IsAvailable(class_name)){
     PanelPosition pos = this->GetParentPanel(w1);
     if(panels_.contains(pos)){
@@ -289,7 +289,7 @@ void Panels::ReplaceWidget(Widget* w1, QString& class_name){
   }
 }
 
-void Panels::RemoveWidget(Widget *widget){
+void PanelManager::RemoveWidget(Widget *widget){
   PanelPosition pos = this->GetParentPanel(widget);
   if(panels_.contains(pos)){
     panels_[pos]->RemoveWidget(widget);
@@ -297,13 +297,13 @@ void Panels::RemoveWidget(Widget *widget){
   }
 }
 
-QList<QString> Panels::GetAvailableWidgets()
+QList<QString> PanelManager::GetAvailableWidgets()
 {
   return pool_->GetAvailableWidgets();
 }
 
 
-QMenu* Panels::GetAvailableWidgetsMenu()
+QMenu* PanelManager::GetAvailableWidgetsMenu()
 {
   QMenu* m=new QMenu;
 
@@ -317,7 +317,7 @@ QMenu* Panels::GetAvailableWidgetsMenu()
   return m;
 }
 
-PanelPosition Panels::GetParentPanel(Widget* widget){
+PanelPosition PanelManager::GetParentPanel(Widget* widget){
   QMapIterator<PanelPosition, PanelBar*> i(panels_);
   while (i.hasNext()) {
       i.next();
@@ -329,7 +329,7 @@ PanelPosition Panels::GetParentPanel(Widget* widget){
   return NONE;
 }
 
-void Panels::StartDrag()
+void PanelManager::StartDrag()
 {
   QMapIterator<PanelPosition, PanelBar*> i(panels_);
   while (i.hasNext()) {
@@ -338,7 +338,7 @@ void Panels::StartDrag()
   }
 }
 
-void Panels::EndDrag()
+void PanelManager::EndDrag()
 {
   QMapIterator<PanelPosition, PanelBar*> i(panels_);
   while (i.hasNext()) {
@@ -347,7 +347,7 @@ void Panels::EndDrag()
   }
 }
 
-QMenu* Panels::GetMenu()
+QMenu* PanelManager::GetMenu()
 {
   QMenu* panel_menu = new QMenu(this);
   panel_menu->setTitle("Panels");
@@ -378,7 +378,7 @@ QMenu* Panels::GetMenu()
   return panel_menu;
 }
 
-void Panels::UpdateAddMenu(){
+void PanelManager::UpdateAddMenu(){
   add_menu_->clear();
   WidgetRegistry* wf=WidgetRegistry::Instance();
   QList<QString> available=this->GetAvailableWidgets();
@@ -389,7 +389,7 @@ void Panels::UpdateAddMenu(){
   }
 }
 
-void Panels::AddWidgetFromMenu(QAction* action){
+void PanelManager::AddWidgetFromMenu(QAction* action){
   if(action){
     QString new_class_name=action->data().toString();
     if(panels_.contains(current_menu_)){
@@ -398,7 +398,7 @@ void Panels::AddWidgetFromMenu(QAction* action){
   }
 }
 
-void Panels::UpdateCurrentMenu(){
+void PanelManager::UpdateCurrentMenu(){
   QAction* action = qobject_cast<QAction*>(this->sender());
   if(action){
     current_menu_ = PanelPosition(action->data().toInt());
diff --git a/modules/gui/src/panel_bar/panels.hh b/modules/gui/src/panels/panel_manager.hh
similarity index 94%
rename from modules/gui/src/panel_bar/panels.hh
rename to modules/gui/src/panels/panel_manager.hh
index 1dd71496431162ef92a6968c5e2cfa27b92b9741..e4e2a2d5f6da0186b36e7d1134e2cf466ade1e5a 100644
--- a/modules/gui/src/panel_bar/panels.hh
+++ b/modules/gui/src/panels/panel_manager.hh
@@ -16,8 +16,8 @@
 // along with this library; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //------------------------------------------------------------------------------
-#ifndef OST_GUI_PANEL_BAR_PANELS
-#define OST_GUI_PANEL_BAR_PANELS
+#ifndef OST_GUI_PANEL_BAR_PANEL_MANAGER
+#define OST_GUI_PANEL_BAR_PANEL_MANAGER
 
 #include <QWidget>
 #include <QString>
@@ -45,18 +45,18 @@ enum PanelPosition
 /// \brief Class which organizes all widgets which are in the side panels
 /// This class handles all side bar widgets. It can be used to display, hide or move a widget to a PaneBar. There are three Bars (left, bottom, right) which are organized by this class.
 /// Whenever a widget is being removed or added it checks first if the widget type is known and if there are available instances.
-class DLLEXPORT_OST_GUI Panels : public Widget {
+class DLLEXPORT_OST_GUI PanelManager : public Widget {
   Q_OBJECT
 public:
-  Panels(QWidget* widget);
-  ~Panels(){ }
+  PanelManager(QWidget* widget);
+  ~PanelManager(){ }
   virtual bool Save(const QString& prefix);
   virtual bool Restore(const QString& prefix);
 
   /// \brief Add a widget to the widget pool
   ///
   /// The widget must already be in the WidgetRegistry.
-  /// If you are not sure if the Widget is in the WidgetRegistry, use the \ref Panels::AddWidgetToPool(const QString& name, Widget* widget) Method instead.
+  /// If you are not sure if the Widget is in the WidgetRegistry, use the \ref PanelManager::AddWidgetToPool(const QString& name, Widget* widget) Method instead.
   /// \param class_name class name of class which should be added to WidgetRegistry.
   /// \param limit amount of parallel instances allowed (-1 if infinite)
   virtual void AddWidgetToPool(const QString& class_name, int limit=-1);
@@ -75,7 +75,7 @@ public:
   /// \param is_hidden marks if the class should be displayed in the gui. Default the widget will be shown.
   void AddWidget(PanelPosition pos, Widget* widget, bool is_hidden=false);
   /// \brief Display a Widget in a PanelBar
-  /// Same as \ref Panels::AddWidget(PanelPosition pos, Widget* widget, bool is_hidden)
+  /// Same as \ref PanelManager::AddWidget(PanelPosition pos, Widget* widget, bool is_hidden)
   /// \param pos Indicates which PanelBar is affected
   /// \param class_name the class_name of the widget you would like to add.
   /// \param is_hidden marks if the class should be displayed in the gui. Default the widget will be shown.
@@ -87,7 +87,7 @@ public:
   /// \param w1 The widget which will be replaced
   /// \param w2 The new Widget which should replace the old one.
   void ReplaceWidget(Widget* w1, Widget* w2);
-  /// Same as \ref Panels::ReplaceWidget(Widget* w1, Widget* w2)
+  /// Same as \ref PanelManager::ReplaceWidget(Widget* w1, Widget* w2)
   /// \param w1 The widget which will be replaced
   /// \param class_name The class_name which from which a instance will be created and then replaces the old one.
   void ReplaceWidget(Widget* w1, QString& class_name);
diff --git a/modules/gui/src/panel_bar/panel_widget_container.cc b/modules/gui/src/panels/panel_widget_container.cc
similarity index 100%
rename from modules/gui/src/panel_bar/panel_widget_container.cc
rename to modules/gui/src/panels/panel_widget_container.cc
diff --git a/modules/gui/src/panel_bar/panel_widget_container.hh b/modules/gui/src/panels/panel_widget_container.hh
similarity index 100%
rename from modules/gui/src/panel_bar/panel_widget_container.hh
rename to modules/gui/src/panels/panel_widget_container.hh
diff --git a/modules/gui/src/panel_bar/side_bar.cc b/modules/gui/src/panels/side_bar.cc
similarity index 100%
rename from modules/gui/src/panel_bar/side_bar.cc
rename to modules/gui/src/panels/side_bar.cc
diff --git a/modules/gui/src/panel_bar/side_bar.hh b/modules/gui/src/panels/side_bar.hh
similarity index 100%
rename from modules/gui/src/panel_bar/side_bar.hh
rename to modules/gui/src/panels/side_bar.hh
diff --git a/modules/gui/src/panel_bar/splitter_panel_bar.cc b/modules/gui/src/panels/splitter_panel_bar.cc
similarity index 99%
rename from modules/gui/src/panel_bar/splitter_panel_bar.cc
rename to modules/gui/src/panels/splitter_panel_bar.cc
index 7ba19f4fd00b708ddb82e78775d5520e6013c5e5..65476dcc388c45ab0c2817bbd670689fe196929a 100644
--- a/modules/gui/src/panel_bar/splitter_panel_bar.cc
+++ b/modules/gui/src/panels/splitter_panel_bar.cc
@@ -24,9 +24,6 @@
 
 #include "panel_widget_container.hh"
 #include "splitter_panel_bar.hh"
-#include <iostream>
-
-#include <iostream>
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/panel_bar/splitter_panel_bar.hh b/modules/gui/src/panels/splitter_panel_bar.hh
similarity index 97%
rename from modules/gui/src/panel_bar/splitter_panel_bar.hh
rename to modules/gui/src/panels/splitter_panel_bar.hh
index a08a1bf1935490433a523bb0aa5feb29194b2f26..e8d6ae256a4fb5fab58b50bc2dc321356000525e 100644
--- a/modules/gui/src/panel_bar/splitter_panel_bar.hh
+++ b/modules/gui/src/panels/splitter_panel_bar.hh
@@ -25,12 +25,12 @@
 #include <QAction>
 
 #include <ost/gui/module_config.hh>
-#include <ost/gui/panel_bar/panel_bar_widget_holder.hh>
 #include <ost/gui/widget_pool.hh>
 #include <ost/gui/widget.hh>
 #include <ost/gui/thin_splitter.hh>
 
 #include "panel_widget_container.hh"
+#include "panel_bar_widget_holder.hh"
 
 namespace ost { namespace gui {
 
diff --git a/modules/gui/src/panel_bar/tabbed_panel_bar.cc b/modules/gui/src/panels/tabbed_panel_bar.cc
similarity index 100%
rename from modules/gui/src/panel_bar/tabbed_panel_bar.cc
rename to modules/gui/src/panels/tabbed_panel_bar.cc
diff --git a/modules/gui/src/panel_bar/tabbed_panel_bar.hh b/modules/gui/src/panels/tabbed_panel_bar.hh
similarity index 100%
rename from modules/gui/src/panel_bar/tabbed_panel_bar.hh
rename to modules/gui/src/panels/tabbed_panel_bar.hh
diff --git a/modules/gui/src/perspective.cc b/modules/gui/src/perspective.cc
index 6b59bded294f6a68e70b4f2ed2a93bba01ce8da1..0ecda360e9ce366becb77678303a795e51c29513 100644
--- a/modules/gui/src/perspective.cc
+++ b/modules/gui/src/perspective.cc
@@ -54,7 +54,7 @@ Perspective::Perspective(QMainWindow* parent):
 
   status_bar_ = new QStatusBar(main_area_);
 
-  panels_ = new Panels(main_area_);
+  panels_ = new PanelManager(main_area_);
   l->addWidget(panels_,1);
   this->SetupQuickAccessBar();
   l->addWidget(quick_access_bar_, 0);
@@ -115,7 +115,7 @@ QMenu* Perspective::GetMenu(const QString& name)
   return menu;
 }
 
-Panels* Perspective::GetPanels()
+PanelManager* Perspective::GetPanels()
 {
   return panels_;
 }
diff --git a/modules/gui/src/perspective.hh b/modules/gui/src/perspective.hh
index 533b3d0f11110c384c2a03792449d51fd5f8678b..d5aa97f97abc36b4308236594ca25d67723a16b9 100644
--- a/modules/gui/src/perspective.hh
+++ b/modules/gui/src/perspective.hh
@@ -29,9 +29,9 @@
 class QMainWindow;
 class QTextEdit;
 
-#include <ost/gui/panel_bar/panels.hh>
-#include <ost/gui/panel_bar/button_bar.hh>
-#include <ost/gui/panel_bar/panel_bar.hh>
+#include <ost/gui/panels/panel_manager.hh>
+#include <ost/gui/panels/button_bar.hh>
+#include <ost/gui/panels/panel_bar.hh>
 #include <ost/gui/module_config.hh>
 
 /*
@@ -60,9 +60,9 @@ public:
   /// \return The menu with the given name. If it does not exist, it will be created and returned.
   QMenu* GetMenu(const QString& name);
   
-  /// \brief The Panels class organizes all the widgets in the side panels.
-  /// \return The Panels instance which is used in this perspective.
-  Panels* GetPanels();
+  /// \brief The PanelManager class organizes all the widgets in the side panels.
+  /// \return The PanelManager instance which is used in this perspective.
+  PanelManager* GetPanels();
 
   /// \brief Returns the MainArea
   /// \return The main area which is used in this perspective.
@@ -94,7 +94,7 @@ private:
   QMenuBar*        menu_bar_;
   QMap<QString,QMenu*> menus_;
   MainArea*       main_area_;
-  Panels*         panels_;
+  PanelManager*   panels_;
   QWidget*        quick_access_bar_;
   QStatusBar*     status_bar_;
 };