diff --git a/lcUI/CMakeLists.txt b/lcUI/CMakeLists.txt
index ef1d6f967..4d08d02cd 100644
--- a/lcUI/CMakeLists.txt
+++ b/lcUI/CMakeLists.txt
@@ -23,8 +23,6 @@ SET(QT_USE_QTDESIGNER ON)
 set(UI_hdrs
 cadmdichild.h
 const.h
-imainwindow.h
-testform.h
 luainterface.h
 operations/circlecreateoperation.h
 operations/groupoperations.h
@@ -34,33 +32,28 @@ operations/linecreateoperation.h
 operations/operationmanager.h
 operations/qsnappedstate.h
 operations/trimoperation.h
-ui/clicommand.h
-ui/lcmaintoolbar.h
-ui/luascript.h
+widgets/clicommand.h
+widgets/luascript.h
 lua/qtbridge.h
 lua/luaqobject.h)
 
 set(UI_srcs
 cadmdichild.cpp
 main.cpp
-testform.cpp
 luainterface.cpp
 operations/circlecreateoperation.cpp
 operations/linecreateoperation.cpp
 operations/operationmanager.cpp
 operations/qsnappedstate.cpp
 operations/trimoperation.cpp
-ui/clicommand.cpp
-ui/lcmaintoolbar.cpp
-ui/luascript.cpp
+widgets/clicommand.cpp
+widgets/luascript.cpp
 lua/qtbridge.cpp
 lua/luaqobject.cpp)
 
 QT5_WRAP_UI(UI_HEADERS
-testform.ui
-ui/clicommand.ui
-ui/lcmaintoolbar.ui
-ui/luascript.ui)
+widgets/clicommand.ui
+widgets/luascript.ui)
 
 qt5_add_resources(UI_RESOURCES
 ui/resource.qrc)
diff --git a/lcUI/cadmdichild.cpp b/lcUI/cadmdichild.cpp
index 0c1604fe6..e18159cae 100644
--- a/lcUI/cadmdichild.cpp
+++ b/lcUI/cadmdichild.cpp
@@ -21,7 +21,6 @@
 #include "cad/interface/snapable.h"
 
 #include "cadmdichild.h"
-#include "testform.h"
 #include <QFileDialog>
 #include <cad/operations/builder.h>
 #include <QMessageBox>
diff --git a/lcUI/imainwindow.h b/lcUI/imainwindow.h
deleted file mode 100644
index 518c479f7..000000000
--- a/lcUI/imainwindow.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include <QMainWindow>
-
-#include "operations/operationmanager.h"
-#include "cadmdichild.h"
-
-class IMainWindow : public QMainWindow {
-        Q_OBJECT
-    public:
-        IMainWindow(QWidget* parent) : QMainWindow(parent) {
-        }
-
-        virtual CadMdiChild* activeMdiChild() const = 0;
-};
diff --git a/lcUI/lua/qtbridge.h b/lcUI/lua/qtbridge.h
index 46a8bc683..2aa48232e 100644
--- a/lcUI/lua/qtbridge.h
+++ b/lcUI/lua/qtbridge.h
@@ -25,7 +25,7 @@ extern "C"
 #include "cadmdichild.h"
 #include "documentcanvas.h"
 #include "lcadviewer.h"
-#include "ui/luascript.h"
+#include "widgets/luascript.h"
 
 #include "luainterface.h"
 #include "luaqobject.h"
diff --git a/lcUI/testform.cpp b/lcUI/testform.cpp
deleted file mode 100644
index c16d8eaff..000000000
--- a/lcUI/testform.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "testform.h"
-#include "ui_testform.h"
-
-testForm::testForm(QWidget* parent) :
-    QWidget(parent),
-    ui(new Ui::testForm) {
-    ui->setupUi(this);
-}
-
-testForm::~testForm() {
-    delete ui;
-}
diff --git a/lcUI/testform.h b/lcUI/testform.h
deleted file mode 100644
index 73c61358a..000000000
--- a/lcUI/testform.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include <QWidget>
-
-namespace Ui {
-    class testForm;
-}
-
-class testForm : public QWidget {
-        Q_OBJECT
-
-    public:
-        explicit testForm(QWidget* parent = 0);
-        ~testForm();
-
-    private:
-        Ui::testForm* ui;
-};
diff --git a/lcUI/testform.ui b/lcUI/testform.ui
deleted file mode 100644
index be701737f..000000000
--- a/lcUI/testform.ui
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>testForm</class>
- <widget class="QWidget" name="testForm">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>793</width>
-    <height>578</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item row="1" column="0">
-    <widget class="QScrollBar" name="horizontalScrollBar">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <widget class="QScrollBar" name="verticalScrollBar">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <widget class="QWidget" name="widget" native="true"/>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/lcUI/ui/lcmaintoolbar.cpp b/lcUI/ui/lcmaintoolbar.cpp
deleted file mode 100644
index 464177876..000000000
--- a/lcUI/ui/lcmaintoolbar.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-#include "lcmaintoolbar.h"
-#include "ui_lcmaintoolbar.h"
-
-#include "../operations/linecreateoperation.h"
-#include "../operations/circlecreateoperation.h"
-#include "../operations/trimoperation.h"
-#include "../operations/operationmanager.h"
-
-#include <cad/operations/builder.h>
-
-LCMainToolbar::LCMainToolbar(IMainWindow* parent) :
-    QWidget(parent),
-    ui(new Ui::LCMainToolbar),
-    _parent(parent) {
-    ui->setupUi(this);
-}
-
-LCMainToolbar::~LCMainToolbar() {
-    delete ui;
-}
-
-void LCMainToolbar::on_toolButton_clicked() {
-    auto layer = _parent->activeMdiChild()->storageManager()->layerByName("0");
-    //GuiOperation_SPtr lo = GuiOperation_SPtr(new LineCreateOperation(_parent->activeMdiChild()->document(), _parent->activeMdiChild()->storageManager(), layer, _parent->activeMdiChild()->view(), _parent->activeMdiChild()->snapManager()));
-    //_parent->activeMdiChild()->operationManager()->startOperation(lo);
-}
-
-void LCMainToolbar::on_toolButton_2_clicked() {
-    auto layer = _parent->activeMdiChild()->storageManager()->layerByName("0");
-    //auto lo = GuiOperation_SPtr(new CircleCreateOperation(_parent->activeMdiChild()->document(), _parent->activeMdiChild()->storageManager(), layer,  _parent->activeMdiChild()->view(), _parent->activeMdiChild()->snapManager()));
-    //_parent->activeMdiChild()->operationManager()->startOperation(lo);
-}
-
-void LCMainToolbar::on_toolButton_3_clicked() {
-    auto layer = _parent->activeMdiChild()->storageManager()->layerByName("0");
-    //  GuiOperation_SPtr lo = GuiOperation_SPtr(new TrimOperation(_parent->activeMdiChild()->document(), _parent->activeMdiChild()->storageManager(), _parent->activeMdiChild()->view(), _parent->activeMdiChild()->snapManager(), _parent->activeMdiChild()->selectionManager()));
-    //   _parent->activeMdiChild()->operationManager()->startOperation(lo);
-
-}
-
-
-
-void LCMainToolbar::on_tb_builderTest_clicked() {
-    auto layer = _parent->activeMdiChild()->storageManager()->layerByName("0");
-
-    auto l = std::make_shared<lc::entity::Line>(lc::geo::Coordinate(0., 0.), lc::geo::Coordinate(0., 100), layer);
-
-    auto builder = std::make_shared<lc::operation::Builder>(_parent->activeMdiChild()->document());
-    builder->append(l);
-    builder->execute();
-
-}
-
-void LCMainToolbar::on_tb_snapGrid_clicked() {
-    auto sm = std::dynamic_pointer_cast<LCViewer::SnapManagerImpl>(_parent->activeMdiChild()->snapManager());
-    if (sm->isGridSnappable()) {
-        sm->setGridSnappable(false);
-    } else {
-        sm->setGridSnappable(true);
-    }
-}
-
-void LCMainToolbar::on_tb_snapIntersections_clicked() {
-    auto sm = std::dynamic_pointer_cast<LCViewer::SnapManagerImpl>(_parent->activeMdiChild()->snapManager());
-    if (sm->snapIntersections()) {
-        sm->snapIntersections(false);
-    } else {
-        sm->snapIntersections(true);
-    }
-}
-
-void LCMainToolbar::on_tb_snapEntity_clicked() {
-    auto smi =  std::dynamic_pointer_cast<LCViewer::SnapManagerImpl>(_parent->activeMdiChild()->snapManager());
-    lc::SimpleSnapConstrain ssc = smi->snapConstrain();
-
-    if (lc::SimpleSnapConstrain::ON_ENTITY & ssc.constrain()) {
-          smi->snapConstrain(ssc.disableConstrain(lc::SimpleSnapConstrain::ON_ENTITY));
-    } else {
-        smi->snapConstrain(ssc.enableConstrain(lc::SimpleSnapConstrain::ON_ENTITY));
-    }
-}
-
-void LCMainToolbar::on_tb_snapEntityPath_clicked() {
-    auto smi =  std::dynamic_pointer_cast<LCViewer::SnapManagerImpl>(_parent->activeMdiChild()->snapManager());
-    lc::SimpleSnapConstrain ssc = smi->snapConstrain();
-
-    if (lc::SimpleSnapConstrain::ON_ENTITYPATH & ssc.constrain()) {
-        smi->snapConstrain(ssc.disableConstrain(lc::SimpleSnapConstrain::ON_ENTITYPATH));
-    } else {
-        smi->snapConstrain(ssc.enableConstrain(lc::SimpleSnapConstrain::ON_ENTITYPATH));
-    }
-}
-
-void LCMainToolbar::on_tb_snapLogical_clicked() {
-    auto smi =  std::dynamic_pointer_cast<LCViewer::SnapManagerImpl>(_parent->activeMdiChild()->snapManager());
-    lc::SimpleSnapConstrain ssc = smi->snapConstrain();
-
-    if (lc::SimpleSnapConstrain::LOGICAL & ssc.constrain()) {
-        smi->snapConstrain(ssc.disableConstrain(lc::SimpleSnapConstrain::LOGICAL));
-    } else {
-        smi->snapConstrain(ssc.enableConstrain(lc::SimpleSnapConstrain::LOGICAL));
-    }
-}
diff --git a/lcUI/ui/lcmaintoolbar.h b/lcUI/ui/lcmaintoolbar.h
deleted file mode 100644
index e42f5ae6b..000000000
--- a/lcUI/ui/lcmaintoolbar.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-
-#include <QWidget>
-
-#include "../imainwindow.h"
-
-namespace Ui {
-    class LCMainToolbar;
-}
-
-class LCMainToolbar : public QWidget {
-Q_OBJECT
-
-public:
-    explicit LCMainToolbar(IMainWindow *parent = 0);
-
-    ~LCMainToolbar();
-
-private slots:
-
-    void on_toolButton_clicked();
-
-    void on_toolButton_2_clicked();
-
-    void on_toolButton_3_clicked();
-
-    void on_tb_builderTest_clicked();
-
-
-    void on_tb_snapGrid_clicked();
-
-    void on_tb_snapEntity_clicked();
-    void on_tb_snapEntityPath_clicked();
-
-    void on_tb_snapLogical_clicked();
-    void on_tb_snapIntersections_clicked();
-
-private:
-    Ui::LCMainToolbar *ui;
-    IMainWindow *_parent;
-};
-
-// LCMAINTOOLBAR_H
diff --git a/lcUI/ui/clicommand.cpp b/lcUI/widgets/clicommand.cpp
similarity index 100%
rename from lcUI/ui/clicommand.cpp
rename to lcUI/widgets/clicommand.cpp
diff --git a/lcUI/ui/clicommand.h b/lcUI/widgets/clicommand.h
similarity index 100%
rename from lcUI/ui/clicommand.h
rename to lcUI/widgets/clicommand.h
diff --git a/lcUI/ui/clicommand.ui b/lcUI/widgets/clicommand.ui
similarity index 100%
rename from lcUI/ui/clicommand.ui
rename to lcUI/widgets/clicommand.ui
diff --git a/lcUI/ui/luascript.cpp b/lcUI/widgets/luascript.cpp
similarity index 100%
rename from lcUI/ui/luascript.cpp
rename to lcUI/widgets/luascript.cpp
diff --git a/lcUI/ui/luascript.h b/lcUI/widgets/luascript.h
similarity index 94%
rename from lcUI/ui/luascript.h
rename to lcUI/widgets/luascript.h
index 3df53ef2a..b20fd6460 100644
--- a/lcUI/ui/luascript.h
+++ b/lcUI/widgets/luascript.h
@@ -3,7 +3,7 @@
 #include <QDockWidget>
 #include <QMdiArea>
 #include <QMdiSubWindow>
-#include <imainwindow.h>
+#include "cadmdichild.h"
 
 namespace Ui {
     class LuaScript;
diff --git a/lcUI/ui/luascript.ui b/lcUI/widgets/luascript.ui
similarity index 100%
rename from lcUI/ui/luascript.ui
rename to lcUI/widgets/luascript.ui