Base folder strategy abandoned due compatibility with wxCrafter

61 files changed, 202 insertions, 201 deletions

diff --git a/Project/AboutForm.h b/Project/AboutForm.h
index 0ab9d9b..945402c 100644
--- a/Project/AboutForm.h
+++ b/Project/AboutForm.h
@@ -17,7 +17,7 @@
 
 #ifndef ABOUTFORM_H
 #define ABOUTFORM_H
-#include "base/PropertiesFormBase.h"
+#include "PropertiesFormBase.h"
 
 #include <wx/textfile.h>
 #include <wx/stdpaths.h>
diff --git a/Project/BusForm.h b/Project/BusForm.h
index 14509d1..5dff2c7 100644
--- a/Project/BusForm.h
+++ b/Project/BusForm.h
@@ -18,7 +18,7 @@
 #ifndef BUSFORM_H
 #define BUSFORM_H
 
-#include "base/ElementFormBase.h"
+#include "ElementFormBase.h"
 class Bus;
 
 /**
diff --git a/Project/ChartView.cpp b/Project/ChartView.cpp
index f1fd600..03b57b9 100644
--- a/Project/ChartView.cpp
+++ b/Project/ChartView.cpp
@@ -390,6 +390,7 @@ void ChartView::OnTreeItemSelectionChanged(wxTreeEvent& event)
 
 void ChartView::BuildColourList()
 {
+    m_colourList.push_back(wxColour(60, 60, 60));
     m_colourList.push_back(wxColour(255, 0, 0));
     m_colourList.push_back(wxColour(0, 0, 255));
     m_colourList.push_back(wxColour(0, 255, 0));
diff --git a/Project/ChartView.h b/Project/ChartView.h
index b5d1766..82bb621 100644
--- a/Project/ChartView.h
+++ b/Project/ChartView.h
@@ -17,7 +17,7 @@
 
 #ifndef CHARTVIEW_H
 #define CHARTVIEW_H
-#include "base/ChartViewBase.h"
+#include "ChartViewBase.h"
 #include "wxMathPlot/mathplot.h"
 
 #include <wx/msgdlg.h>
diff --git a/Project/ChartView.wxcp b/Project/ChartView.wxcp
index 0bc8535..db8c3a2 100644
--- a/Project/ChartView.wxcp
+++ b/Project/ChartView.wxcp
@@ -1,6 +1,6 @@
 {
  "metadata": {
-  "m_generatedFilesDir": "base/",
+  "m_generatedFilesDir": ".",
   "m_objCounter": 82,
   "m_includeFiles": [],
   "m_bitmapFunction": "wxCE3EBInitBitmapResources",
diff --git a/Project/base/ChartViewBase.cpp b/Project/ChartViewBase.cpp
index 42e9beb..42e9beb 100644
--- a/Project/base/ChartViewBase.cpp
+++ b/Project/ChartViewBase.cpp
diff --git a/Project/base/ChartViewBase.h b/Project/ChartViewBase.h
index 5801081..5801081 100644
--- a/Project/base/ChartViewBase.h
+++ b/Project/ChartViewBase.h
diff --git a/Project/base/ChartViewBitmaps.cpp b/Project/ChartViewBitmaps.cpp
index ef6907a..ef6907a 100644
--- a/Project/base/ChartViewBitmaps.cpp
+++ b/Project/ChartViewBitmaps.cpp
diff --git a/Project/ConstantForm.h b/Project/ConstantForm.h
index 9f6be38..245f67a 100644
--- a/Project/ConstantForm.h
+++ b/Project/ConstantForm.h
@@ -17,7 +17,7 @@
 
 #ifndef CONSTANTFORM_H
 #define CONSTANTFORM_H
-#include "base/ElementFormBase.h"
+#include "ElementFormBase.h"
 
 class Constant;
 
diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h
index f799ca5..f77f350 100644
--- a/Project/ControlEditor.h
+++ b/Project/ControlEditor.h
@@ -18,7 +18,7 @@
 #ifndef CONTROLEDITOR_H
 #define CONTROLEDITOR_H
 
-#include "base/ControlEditorBase.h"
+#include "ControlEditorBase.h"
 #include <wx/wrapsizer.h>
 #include <wx/dcclient.h>
 #include <wx/dcscreen.h>
diff --git a/Project/ControlEditor.wxcp b/Project/ControlEditor.wxcp
index 5b811cc..d83f53c 100644
--- a/Project/ControlEditor.wxcp
+++ b/Project/ControlEditor.wxcp
@@ -1,6 +1,6 @@
 {
  "metadata": {
-  "m_generatedFilesDir": "base/",
+  "m_generatedFilesDir": ".",
   "m_objCounter": 423,
   "m_includeFiles": [],
   "m_bitmapFunction": "wxC870InitBitmapResources",
diff --git a/Project/base/ControlEditorBase.cpp b/Project/ControlEditorBase.cpp
index cf391b7..cf391b7 100644
--- a/Project/base/ControlEditorBase.cpp
+++ b/Project/ControlEditorBase.cpp
diff --git a/Project/base/ControlEditorBase.h b/Project/ControlEditorBase.h
index 6580e73..6580e73 100644
--- a/Project/base/ControlEditorBase.h
+++ b/Project/ControlEditorBase.h
diff --git a/Project/base/ControlEditorBitmaps.cpp b/Project/ControlEditorBitmaps.cpp
index b7212e1..b7212e1 100644
--- a/Project/base/ControlEditorBitmaps.cpp
+++ b/Project/ControlEditorBitmaps.cpp
diff --git a/Project/ControlSystemTest.h b/Project/ControlSystemTest.h
index 2537517..e82caac 100644
--- a/Project/ControlSystemTest.h
+++ b/Project/ControlSystemTest.h
@@ -18,7 +18,7 @@
 #ifndef CONTROLSYSTEMTEST_H
 #define CONTROLSYSTEMTEST_H
 
-#include "base/ControlEditorBase.h"
+#include "ControlEditorBase.h"
 
 class ControlEditor;
 
diff --git a/Project/DataReport.h b/Project/DataReport.h
index 854bb06..e78d4cd 100644
--- a/Project/DataReport.h
+++ b/Project/DataReport.h
@@ -18,7 +18,7 @@
 #ifndef DATAREPORT_H
 #define DATAREPORT_H
 
-#include "base/DataReportBase.h"
+#include "DataReportBase.h"
 
 class Workspace;
 class ElectricCalculation;
diff --git a/Project/DataReport.wxcp b/Project/DataReport.wxcp
index 65bd23e..4c18d3c 100644
--- a/Project/DataReport.wxcp
+++ b/Project/DataReport.wxcp
@@ -1,6 +1,6 @@
 {
  "metadata": {
-  "m_generatedFilesDir": "base/",
+  "m_generatedFilesDir": ".",
   "m_objCounter": 85,
   "m_includeFiles": [],
   "m_bitmapFunction": "wxC6A63InitBitmapResources",
diff --git a/Project/base/DataReportBase.cpp b/Project/DataReportBase.cpp
index 33bea44..33bea44 100644
--- a/Project/base/DataReportBase.cpp
+++ b/Project/DataReportBase.cpp
diff --git a/Project/base/DataReportBase.h b/Project/DataReportBase.h
index a9fba20..a9fba20 100644
--- a/Project/base/DataReportBase.h
+++ b/Project/DataReportBase.h
diff --git a/Project/base/DataReportBitmaps.cpp b/Project/DataReportBitmaps.cpp
index 5d547ad..5d547ad 100644
--- a/Project/base/DataReportBitmaps.cpp
+++ b/Project/DataReportBitmaps.cpp
diff --git a/Project/ElementForm.wxcp b/Project/ElementForm.wxcp
index a756e62..73f64ef 100644
--- a/Project/ElementForm.wxcp
+++ b/Project/ElementForm.wxcp
@@ -1,6 +1,6 @@
 {
  "metadata": {
-  "m_generatedFilesDir": "base/",
+  "m_generatedFilesDir": ".",
   "m_objCounter": 1975,
   "m_includeFiles": [],
   "m_bitmapFunction": "wxC9EE9InitBitmapResources",
diff --git a/Project/base/ElementFormBase.cpp b/Project/ElementFormBase.cpp
index a42c34d..a42c34d 100644
--- a/Project/base/ElementFormBase.cpp
+++ b/Project/ElementFormBase.cpp
diff --git a/Project/base/ElementFormBase.h b/Project/ElementFormBase.h
index 0c1ac13..0c1ac13 100644
--- a/Project/base/ElementFormBase.h
+++ b/Project/ElementFormBase.h
diff --git a/Project/base/ElementFormBitmaps.cpp b/Project/ElementFormBitmaps.cpp
index b955c05..b955c05 100644
--- a/Project/base/ElementFormBitmaps.cpp
+++ b/Project/ElementFormBitmaps.cpp
diff --git a/Project/ExponentialForm.h b/Project/ExponentialForm.h
index f911759..516156f 100644
--- a/Project/ExponentialForm.h
+++ b/Project/ExponentialForm.h
@@ -17,7 +17,7 @@
 
 #ifndef EXPONENTIALFORM_H
 #define EXPONENTIALFORM_H
-#include "base/ElementFormBase.h"
+#include "ElementFormBase.h"
 
 class Exponential;
 
diff --git a/Project/GainForm.h b/Project/GainForm.h
index fdab652..3d1ab5d 100644
--- a/Project/GainForm.h
+++ b/Project/GainForm.h
@@ -17,7 +17,7 @@
 
 #ifndef GAINFORM_H
 #define GAINFORM_H
-#include "base/ElementFormBase.h"
+#include "ElementFormBase.h"
 
 class Gain;
 
diff --git a/Project/GeneralPropertiesForm.h b/Project/GeneralPropertiesForm.h
index dae4dc9..2f5c70b 100644
--- a/Project/GeneralPropertiesForm.h
+++ b/Project/GeneralPropertiesForm.h
@@ -18,7 +18,7 @@
 #ifndef GENERALPROPERTIESFORM_H
 #define GENERALPROPERTIESFORM_H
 
-#include "base/PropertiesFormBase.h"
+#include "PropertiesFormBase.h"
 
 #include <wx/textfile.h>
 #include <wx/msgdlg.h>
diff --git a/Project/GeneratorStabForm.h b/Project/GeneratorStabForm.h
index 57d9a5c..14bcd11 100644
--- a/Project/GeneratorStabForm.h
+++ b/Project/GeneratorStabForm.h
@@ -18,7 +18,7 @@
 #ifndef GENERATORSTABFORM_H
 #define GENERATORSTABFORM_H
 
-#include "base/ElementFormBase.h"
+#include "ElementFormBase.h"
 
 class SwitchingForm;
 class SyncGenerator;
diff --git a/Project/IOControlForm.h b/Project/IOControlForm.h
index 161e793..f9489c4 100644
--- a/Project/IOControlForm.h
+++ b/Project/IOControlForm.h
@@ -18,7 +18,7 @@
 #ifndef IOCONTROLFORM_H
 #define IOCONTROLFORM_H
 
-#include "base/ElementFormBase.h"
+#include "ElementFormBase.h"
 #include "IOControl.h"
 
 /**
diff --git a/Project/ImportForm.h b/Project/ImportForm.h
index da19734..280396b 100644
--- a/Project/ImportForm.h
+++ b/Project/ImportForm.h
@@ -18,7 +18,7 @@
 #ifndef IMPORTFORM_H
 #define IMPORTFORM_H
 
-#include "base/PropertiesFormBase.h"
+#include "PropertiesFormBase.h"
 
 #include <wx/geometry.h>
 #include <wx/msgdlg.h>
diff --git a/Project/IndMotorForm.h b/Project/IndMotorForm.h
index efbe0bf..e221a8b 100644
--- a/Project/IndMotorForm.h
+++ b/Project/IndMotorForm.h
@@ -17,7 +17,7 @@
 
 #ifndef INDMOTORFORM_H
 #define INDMOTORFORM_H
-#include "base/ElementFormBase.h"
+#include "ElementFormBase.h"
 
 class IndMotor;
 
diff --git a/Project/LimiterForm.h b/Project/LimiterForm.h
index 5657cb8..8f15b80 100644
--- a/Project/LimiterForm.h
+++ b/Project/LimiterForm.h
@@ -17,7 +17,7 @@
 
 #ifndef LIMITERFORM_H
 #define LIMITERFORM_H
-#include "base/ElementFormBase.h"
+#include "ElementFormBase.h"
 
 class Limiter;
 
diff --git a/Project/LineForm.h b/Project/LineForm.h
index ab4b87e..857d31b 100644
--- a/Project/LineForm.h
+++ b/Project/LineForm.h
@@ -17,7 +17,7 @@
 
 #ifndef LINEFORM_H
 #define LINEFORM_H
-#include "base/ElementFormBase.h"
+#include "ElementFormBase.h"
 
 class Line;
 class SwitchingForm;
diff --git a/Project/LoadForm.h b/Project/LoadForm.h
index 4e50b4e..1fc103f 100644
--- a/Project/LoadForm.h
+++ b/Project/LoadForm.h
@@ -17,7 +17,7 @@
 
 #ifndef LOADFORM_H
 #define LOADFORM_H
-#include "base/ElementFormBase.h"
+#include "ElementFormBase.h"
 
 class Load;
 class SwitchingForm;
diff --git a/Project/MainFrame.h b/Project/MainFrame.h
index 5566bb7..58e4824 100644
--- a/Project/MainFrame.h
+++ b/Project/MainFrame.h
@@ -23,7 +23,7 @@
 #include <wx/filedlg.h>
 #include <wx/glcanvas.h>
 
-#include "base/MainFrameBase.h"
+#include "MainFrameBase.h"
 
 class MainFrameBase;
 class wxRibbonMetroArtProvider;
diff --git a/Project/MainFrame.wxcp b/Project/MainFrame.wxcp
index 755ff97..ef60bcc 100644
--- a/Project/MainFrame.wxcp
+++ b/Project/MainFrame.wxcp
@@ -1,6 +1,6 @@
 {
  "metadata": {
-  "m_generatedFilesDir": "base/",
+  "m_generatedFilesDir": ".",
   "m_objCounter": 151,
   "m_includeFiles": [],
   "m_bitmapFunction": "wxC9ED9InitBitmapResources",
diff --git a/Project/base/MainFrameBase.cpp b/Project/MainFrameBase.cpp
index ac91ff5..ac91ff5 100644
--- a/Project/base/MainFrameBase.cpp
+++ b/Project/MainFrameBase.cpp
diff --git a/Project/base/MainFrameBase.h b/Project/MainFrameBase.h
index cdb9a7f..0b3dc45 100644
--- a/Project/base/MainFrameBase.h
+++ b/Project/MainFrameBase.h
@@ -56,25 +56,25 @@ public:
         ID_RIBBON_DATAREPORT = 10012,
         ID_RIBBON_FIT = 10013,
         ID_RIBBON_MOVE = 10014,
-        ID_RIBBON_DRAG = 10015,
-        ID_RIBBON_ADDELEMENT = 10016,
-        ID_RIBBON_DELETE = 10017,
-        ID_RIBBON_REDO = 10018,
-        ID_RIBBON_UNDO = 10019,
-        ID_RIBBON_PASTE = 10020,
-        ID_RIBBON_ABOUT = 10021,
-        ID_RIBBON_GUIDE = 10022,
+        ID_RIBBON_SAVE = 10015,
+        ID_RIBBON_EXIT = 10016,
+        ID_RIBBON_GENSETTINGS = 10017,
+        ID_RIBBON_SAVEAS = 10018,
+        ID_RIBBON_DRAG = 10019,
+        ID_RIBBON_RESETVOLT = 10020,
+        ID_RIBBON_NEW = 10021,
+        ID_RIBBON_OPEN = 10022,
         ID_RIBBON_CLOSE = 10023,
-        ID_RIBBON_SAVEAS = 10024,
-        ID_RIBBON_SAVE = 10025,
-        ID_RIBBON_EXIT = 10026,
-        ID_RIBBON_GENSETTINGS = 10027,
-        ID_RIBBON_ROTATECC = 10028,
-        ID_RIBBON_COPY = 10029,
-        ID_RIBBON_IMPORT = 10030,
-        ID_RIBBON_OPEN = 10031,
-        ID_RIBBON_RESETVOLT = 10032,
-        ID_RIBBON_NEW = 10033,
+        ID_RIBBON_GUIDE = 10024,
+        ID_RIBBON_ABOUT = 10025,
+        ID_RIBBON_ROTATECC = 10026,
+        ID_RIBBON_IMPORT = 10027,
+        ID_RIBBON_COPY = 10028,
+        ID_RIBBON_DELETE = 10029,
+        ID_RIBBON_REDO = 10030,
+        ID_RIBBON_PASTE = 10031,
+        ID_RIBBON_UNDO = 10032,
+        ID_RIBBON_ADDELEMENT = 10033,
     };
 protected:
     wxRibbonBar* m_ribbonBar;
diff --git a/Project/base/MainFrameBitmaps.cpp b/Project/MainFrameBitmaps.cpp
index e21a35b..e21a35b 100644
--- a/Project/base/MainFrameBitmaps.cpp
+++ b/Project/MainFrameBitmaps.cpp
diff --git a/Project/MathExpressionForm.h b/Project/MathExpressionForm.h
index c0ff4b9..3c549ee 100644
--- a/Project/MathExpressionForm.h
+++ b/Project/MathExpressionForm.h
@@ -18,7 +18,7 @@
 #ifndef MATHEXPRESSIONFORM_H
 #define MATHEXPRESSIONFORM_H
 
-#include "base/ElementFormBase.h"
+#include "ElementFormBase.h"
 #include <wx/msgdlg.h>
 
 class MathExpression;
diff --git a/Project/Project.mk b/Project/Project.mk
index e92b10e..e9d73a1 100644
--- a/Project/Project.mk
+++ b/Project/Project.mk
@@ -13,7 +13,7 @@ CurrentFileName        :=
 CurrentFilePath        :=
 CurrentFileFullPath    :=
 User                   :=NDSE-69
-Date                   :=09/04/2018
+Date                   :=10/04/2018
 CodeLitePath           :="C:/Program Files/CodeLite"
 LinkerName             :=C:/TDM-GCC-64/bin/g++.exe
 SharedObjectLinkerName :=C:/TDM-GCC-64/bin/g++.exe -shared -fPIC
@@ -64,18 +64,18 @@ AS       := C:/TDM-GCC-64/bin/as.exe
 CodeLiteDir:=C:\Program Files\CodeLite
 WXWIN:=C:\wxWidgets-3.1.0
 WXCFG:=gcc_dll\mswu
-Objects0=$(IntermediateDirectory)/TransformerForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElementPlotData.cpp$(ObjectSuffix) $(IntermediateDirectory)/ChartView.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElectricCalculation.cpp$(ObjectSuffix) $(IntermediateDirectory)/GainForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/Constant.cpp$(ObjectSuffix) $(IntermediateDirectory)/Camera.cpp$(ObjectSuffix) $(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(ObjectSuffix) $(IntermediateDirectory)/XMLParser.cpp$(ObjectSuffix) $(IntermediateDirectory)/fparser_fpoptimizer.cc$(ObjectSuffix) \
-	$(IntermediateDirectory)/fparser_fparser.cc$(ObjectSuffix) $(IntermediateDirectory)/MainFrame.cpp$(ObjectSuffix) $(IntermediateDirectory)/Divider.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElementDataObject.cpp$(ObjectSuffix) $(IntermediateDirectory)/Fault.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_ChartViewBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/SumForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/PropertiesData.cpp$(ObjectSuffix) $(IntermediateDirectory)/BusFormBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_ControlEditorBase.cpp$(ObjectSuffix) \
-	$(IntermediateDirectory)/ConstantForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/IndMotorForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlElement.cpp$(ObjectSuffix) $(IntermediateDirectory)/Gain.cpp$(ObjectSuffix) $(IntermediateDirectory)/DataReport.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_MainFrameBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/SimulationsSettingsForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/MathExprParser.cpp$(ObjectSuffix) $(IntermediateDirectory)/Line.cpp$(ObjectSuffix) \
-	$(IntermediateDirectory)/Transformer.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlSystemTest.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlEditor.cpp$(ObjectSuffix) $(IntermediateDirectory)/SyncGenerator.cpp$(ObjectSuffix) $(IntermediateDirectory)/main.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_DataReportBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/win_resources.rc$(ObjectSuffix) $(IntermediateDirectory)/base_WorkspaceBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(ObjectSuffix) \
-	$(IntermediateDirectory)/ConnectionLine.cpp$(ObjectSuffix) $(IntermediateDirectory)/IOControlForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(ObjectSuffix) 
+Objects0=$(IntermediateDirectory)/WorkspaceBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/PropertiesFormBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrameBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElementFormBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlEditorBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlEditorBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/ChartViewBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/DataReportBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/DataReportBase.cpp$(ObjectSuffix) \
+	$(IntermediateDirectory)/TransformerForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElementPlotData.cpp$(ObjectSuffix) $(IntermediateDirectory)/ChartView.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElectricCalculation.cpp$(ObjectSuffix) $(IntermediateDirectory)/GainForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/Constant.cpp$(ObjectSuffix) $(IntermediateDirectory)/Camera.cpp$(ObjectSuffix) $(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(ObjectSuffix) $(IntermediateDirectory)/XMLParser.cpp$(ObjectSuffix) $(IntermediateDirectory)/fparser_fpoptimizer.cc$(ObjectSuffix) \
+	$(IntermediateDirectory)/fparser_fparser.cc$(ObjectSuffix) $(IntermediateDirectory)/ChartViewBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrame.cpp$(ObjectSuffix) $(IntermediateDirectory)/Divider.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElementDataObject.cpp$(ObjectSuffix) $(IntermediateDirectory)/Fault.cpp$(ObjectSuffix) $(IntermediateDirectory)/SumForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrameBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/PropertiesData.cpp$(ObjectSuffix) $(IntermediateDirectory)/BusFormBitmaps.cpp$(ObjectSuffix) \
+	$(IntermediateDirectory)/ConstantForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/IndMotorForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlElement.cpp$(ObjectSuffix) $(IntermediateDirectory)/Gain.cpp$(ObjectSuffix) $(IntermediateDirectory)/DataReport.cpp$(ObjectSuffix) $(IntermediateDirectory)/SimulationsSettingsForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/MathExprParser.cpp$(ObjectSuffix) $(IntermediateDirectory)/Line.cpp$(ObjectSuffix) $(IntermediateDirectory)/Transformer.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlSystemTest.cpp$(ObjectSuffix) \
+	$(IntermediateDirectory)/ControlEditor.cpp$(ObjectSuffix) $(IntermediateDirectory)/SyncGenerator.cpp$(ObjectSuffix) $(IntermediateDirectory)/main.cpp$(ObjectSuffix) 
 
-Objects1=$(IntermediateDirectory)/FileHanding.cpp$(ObjectSuffix) $(IntermediateDirectory)/PowerFlow.cpp$(ObjectSuffix) $(IntermediateDirectory)/Element.cpp$(ObjectSuffix) $(IntermediateDirectory)/RateLimiterForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/Electromechanical.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_PropertiesFormBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/Multiplier.cpp$(ObjectSuffix) \
-	$(IntermediateDirectory)/Shunt.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlElementContainer.cpp$(ObjectSuffix) $(IntermediateDirectory)/Exponential.cpp$(ObjectSuffix) $(IntermediateDirectory)/Limiter.cpp$(ObjectSuffix) $(IntermediateDirectory)/RateLimiter.cpp$(ObjectSuffix) $(IntermediateDirectory)/MathOperation.cpp$(ObjectSuffix) $(IntermediateDirectory)/MathExpression.cpp$(ObjectSuffix) $(IntermediateDirectory)/artProvider_ArtMetro.cpp$(ObjectSuffix) $(IntermediateDirectory)/Workspace.cpp$(ObjectSuffix) $(IntermediateDirectory)/GraphicalElement.cpp$(ObjectSuffix) \
-	$(IntermediateDirectory)/base_DataReportBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/TextForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/OpenGLText.cpp$(ObjectSuffix) $(IntermediateDirectory)/IndMotor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Text.cpp$(ObjectSuffix) $(IntermediateDirectory)/Branch.cpp$(ObjectSuffix) $(IntermediateDirectory)/TransferFunction.cpp$(ObjectSuffix) $(IntermediateDirectory)/Bus.cpp$(ObjectSuffix) $(IntermediateDirectory)/Inductor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Load.cpp$(ObjectSuffix) \
-	$(IntermediateDirectory)/TransferFunctionForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_ElementFormBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/Machines.cpp$(ObjectSuffix) $(IntermediateDirectory)/PowerElement.cpp$(ObjectSuffix) $(IntermediateDirectory)/IOControl.cpp$(ObjectSuffix) $(IntermediateDirectory)/SyncMotor.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/ExponentialForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ImportForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/AboutForm.cpp$(ObjectSuffix) \
-	$(IntermediateDirectory)/ControlElementSolver.cpp$(ObjectSuffix) $(IntermediateDirectory)/LimiterForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/MathExpressionForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/BusForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/GeneratorStabForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/LineForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/Capacitor.cpp$(ObjectSuffix) $(IntermediateDirectory)/LoadForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/SyncMachineForm.cpp$(ObjectSuffix) \
-	$(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/GeneralPropertiesForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/SwitchingForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/Sum.cpp$(ObjectSuffix) 
+Objects1=$(IntermediateDirectory)/win_resources.rc$(ObjectSuffix) $(IntermediateDirectory)/ConnectionLine.cpp$(ObjectSuffix) $(IntermediateDirectory)/IOControlForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/FileHanding.cpp$(ObjectSuffix) $(IntermediateDirectory)/PowerFlow.cpp$(ObjectSuffix) $(IntermediateDirectory)/Element.cpp$(ObjectSuffix) $(IntermediateDirectory)/RateLimiterForm.cpp$(ObjectSuffix) \
+	$(IntermediateDirectory)/Electromechanical.cpp$(ObjectSuffix) $(IntermediateDirectory)/Multiplier.cpp$(ObjectSuffix) $(IntermediateDirectory)/Shunt.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlElementContainer.cpp$(ObjectSuffix) $(IntermediateDirectory)/Exponential.cpp$(ObjectSuffix) $(IntermediateDirectory)/Limiter.cpp$(ObjectSuffix) $(IntermediateDirectory)/RateLimiter.cpp$(ObjectSuffix) $(IntermediateDirectory)/MathOperation.cpp$(ObjectSuffix) $(IntermediateDirectory)/MathExpression.cpp$(ObjectSuffix) $(IntermediateDirectory)/artProvider_ArtMetro.cpp$(ObjectSuffix) \
+	$(IntermediateDirectory)/Workspace.cpp$(ObjectSuffix) $(IntermediateDirectory)/GraphicalElement.cpp$(ObjectSuffix) $(IntermediateDirectory)/TextForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/WorkspaceBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/OpenGLText.cpp$(ObjectSuffix) $(IntermediateDirectory)/IndMotor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Text.cpp$(ObjectSuffix) $(IntermediateDirectory)/Branch.cpp$(ObjectSuffix) $(IntermediateDirectory)/TransferFunction.cpp$(ObjectSuffix) $(IntermediateDirectory)/Bus.cpp$(ObjectSuffix) \
+	$(IntermediateDirectory)/Inductor.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElementFormBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/Load.cpp$(ObjectSuffix) $(IntermediateDirectory)/TransferFunctionForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/Machines.cpp$(ObjectSuffix) $(IntermediateDirectory)/PowerElement.cpp$(ObjectSuffix) $(IntermediateDirectory)/IOControl.cpp$(ObjectSuffix) $(IntermediateDirectory)/SyncMotor.cpp$(ObjectSuffix) $(IntermediateDirectory)/ExponentialForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ImportForm.cpp$(ObjectSuffix) \
+	$(IntermediateDirectory)/AboutForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlElementSolver.cpp$(ObjectSuffix) $(IntermediateDirectory)/LimiterForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/MathExpressionForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/BusForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/GeneratorStabForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/LineForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/Capacitor.cpp$(ObjectSuffix) $(IntermediateDirectory)/LoadForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(ObjectSuffix) \
+	$(IntermediateDirectory)/SyncMachineForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/GeneralPropertiesForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/SwitchingForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/Sum.cpp$(ObjectSuffix) 
 
 
 
@@ -107,6 +107,86 @@ PreBuild:
 ##
 ## Objects
 ##
+$(IntermediateDirectory)/WorkspaceBase.cpp$(ObjectSuffix): WorkspaceBase.cpp $(IntermediateDirectory)/WorkspaceBase.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/WorkspaceBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/WorkspaceBase.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/WorkspaceBase.cpp$(DependSuffix): WorkspaceBase.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/WorkspaceBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/WorkspaceBase.cpp$(DependSuffix) -MM WorkspaceBase.cpp
+
+$(IntermediateDirectory)/WorkspaceBase.cpp$(PreprocessSuffix): WorkspaceBase.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/WorkspaceBase.cpp$(PreprocessSuffix) WorkspaceBase.cpp
+
+$(IntermediateDirectory)/PropertiesFormBase.cpp$(ObjectSuffix): PropertiesFormBase.cpp $(IntermediateDirectory)/PropertiesFormBase.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/PropertiesFormBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/PropertiesFormBase.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/PropertiesFormBase.cpp$(DependSuffix): PropertiesFormBase.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/PropertiesFormBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/PropertiesFormBase.cpp$(DependSuffix) -MM PropertiesFormBase.cpp
+
+$(IntermediateDirectory)/PropertiesFormBase.cpp$(PreprocessSuffix): PropertiesFormBase.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/PropertiesFormBase.cpp$(PreprocessSuffix) PropertiesFormBase.cpp
+
+$(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(ObjectSuffix): PropertiesFormBitmaps.cpp $(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/PropertiesFormBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(DependSuffix): PropertiesFormBitmaps.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(DependSuffix) -MM PropertiesFormBitmaps.cpp
+
+$(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(PreprocessSuffix): PropertiesFormBitmaps.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(PreprocessSuffix) PropertiesFormBitmaps.cpp
+
+$(IntermediateDirectory)/MainFrameBitmaps.cpp$(ObjectSuffix): MainFrameBitmaps.cpp $(IntermediateDirectory)/MainFrameBitmaps.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/MainFrameBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/MainFrameBitmaps.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/MainFrameBitmaps.cpp$(DependSuffix): MainFrameBitmaps.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/MainFrameBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/MainFrameBitmaps.cpp$(DependSuffix) -MM MainFrameBitmaps.cpp
+
+$(IntermediateDirectory)/MainFrameBitmaps.cpp$(PreprocessSuffix): MainFrameBitmaps.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/MainFrameBitmaps.cpp$(PreprocessSuffix) MainFrameBitmaps.cpp
+
+$(IntermediateDirectory)/ElementFormBase.cpp$(ObjectSuffix): ElementFormBase.cpp $(IntermediateDirectory)/ElementFormBase.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ElementFormBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ElementFormBase.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/ElementFormBase.cpp$(DependSuffix): ElementFormBase.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ElementFormBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ElementFormBase.cpp$(DependSuffix) -MM ElementFormBase.cpp
+
+$(IntermediateDirectory)/ElementFormBase.cpp$(PreprocessSuffix): ElementFormBase.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ElementFormBase.cpp$(PreprocessSuffix) ElementFormBase.cpp
+
+$(IntermediateDirectory)/ControlEditorBase.cpp$(ObjectSuffix): ControlEditorBase.cpp $(IntermediateDirectory)/ControlEditorBase.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ControlEditorBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ControlEditorBase.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/ControlEditorBase.cpp$(DependSuffix): ControlEditorBase.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ControlEditorBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ControlEditorBase.cpp$(DependSuffix) -MM ControlEditorBase.cpp
+
+$(IntermediateDirectory)/ControlEditorBase.cpp$(PreprocessSuffix): ControlEditorBase.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ControlEditorBase.cpp$(PreprocessSuffix) ControlEditorBase.cpp
+
+$(IntermediateDirectory)/ControlEditorBitmaps.cpp$(ObjectSuffix): ControlEditorBitmaps.cpp $(IntermediateDirectory)/ControlEditorBitmaps.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ControlEditorBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ControlEditorBitmaps.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/ControlEditorBitmaps.cpp$(DependSuffix): ControlEditorBitmaps.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ControlEditorBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ControlEditorBitmaps.cpp$(DependSuffix) -MM ControlEditorBitmaps.cpp
+
+$(IntermediateDirectory)/ControlEditorBitmaps.cpp$(PreprocessSuffix): ControlEditorBitmaps.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ControlEditorBitmaps.cpp$(PreprocessSuffix) ControlEditorBitmaps.cpp
+
+$(IntermediateDirectory)/ChartViewBase.cpp$(ObjectSuffix): ChartViewBase.cpp $(IntermediateDirectory)/ChartViewBase.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ChartViewBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ChartViewBase.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/ChartViewBase.cpp$(DependSuffix): ChartViewBase.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ChartViewBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ChartViewBase.cpp$(DependSuffix) -MM ChartViewBase.cpp
+
+$(IntermediateDirectory)/ChartViewBase.cpp$(PreprocessSuffix): ChartViewBase.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ChartViewBase.cpp$(PreprocessSuffix) ChartViewBase.cpp
+
+$(IntermediateDirectory)/DataReportBitmaps.cpp$(ObjectSuffix): DataReportBitmaps.cpp $(IntermediateDirectory)/DataReportBitmaps.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/DataReportBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/DataReportBitmaps.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/DataReportBitmaps.cpp$(DependSuffix): DataReportBitmaps.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/DataReportBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/DataReportBitmaps.cpp$(DependSuffix) -MM DataReportBitmaps.cpp
+
+$(IntermediateDirectory)/DataReportBitmaps.cpp$(PreprocessSuffix): DataReportBitmaps.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/DataReportBitmaps.cpp$(PreprocessSuffix) DataReportBitmaps.cpp
+
+$(IntermediateDirectory)/DataReportBase.cpp$(ObjectSuffix): DataReportBase.cpp $(IntermediateDirectory)/DataReportBase.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/DataReportBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/DataReportBase.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/DataReportBase.cpp$(DependSuffix): DataReportBase.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/DataReportBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/DataReportBase.cpp$(DependSuffix) -MM DataReportBase.cpp
+
+$(IntermediateDirectory)/DataReportBase.cpp$(PreprocessSuffix): DataReportBase.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/DataReportBase.cpp$(PreprocessSuffix) DataReportBase.cpp
+
 $(IntermediateDirectory)/TransformerForm.cpp$(ObjectSuffix): TransformerForm.cpp $(IntermediateDirectory)/TransformerForm.cpp$(DependSuffix)
 	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/TransformerForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/TransformerForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/TransformerForm.cpp$(DependSuffix): TransformerForm.cpp
@@ -195,6 +275,14 @@ $(IntermediateDirectory)/fparser_fparser.cc$(DependSuffix): fparser/fparser.cc
 $(IntermediateDirectory)/fparser_fparser.cc$(PreprocessSuffix): fparser/fparser.cc
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/fparser_fparser.cc$(PreprocessSuffix) fparser/fparser.cc
 
+$(IntermediateDirectory)/ChartViewBitmaps.cpp$(ObjectSuffix): ChartViewBitmaps.cpp $(IntermediateDirectory)/ChartViewBitmaps.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ChartViewBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ChartViewBitmaps.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/ChartViewBitmaps.cpp$(DependSuffix): ChartViewBitmaps.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ChartViewBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ChartViewBitmaps.cpp$(DependSuffix) -MM ChartViewBitmaps.cpp
+
+$(IntermediateDirectory)/ChartViewBitmaps.cpp$(PreprocessSuffix): ChartViewBitmaps.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ChartViewBitmaps.cpp$(PreprocessSuffix) ChartViewBitmaps.cpp
+
 $(IntermediateDirectory)/MainFrame.cpp$(ObjectSuffix): MainFrame.cpp $(IntermediateDirectory)/MainFrame.cpp$(DependSuffix)
 	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/MainFrame.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/MainFrame.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/MainFrame.cpp$(DependSuffix): MainFrame.cpp
@@ -227,14 +315,6 @@ $(IntermediateDirectory)/Fault.cpp$(DependSuffix): Fault.cpp
 $(IntermediateDirectory)/Fault.cpp$(PreprocessSuffix): Fault.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Fault.cpp$(PreprocessSuffix) Fault.cpp
 
-$(IntermediateDirectory)/base_ChartViewBase.cpp$(ObjectSuffix): base/ChartViewBase.cpp $(IntermediateDirectory)/base_ChartViewBase.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/ChartViewBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_ChartViewBase.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/base_ChartViewBase.cpp$(DependSuffix): base/ChartViewBase.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_ChartViewBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_ChartViewBase.cpp$(DependSuffix) -MM base/ChartViewBase.cpp
-
-$(IntermediateDirectory)/base_ChartViewBase.cpp$(PreprocessSuffix): base/ChartViewBase.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_ChartViewBase.cpp$(PreprocessSuffix) base/ChartViewBase.cpp
-
 $(IntermediateDirectory)/SumForm.cpp$(ObjectSuffix): SumForm.cpp $(IntermediateDirectory)/SumForm.cpp$(DependSuffix)
 	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/SumForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/SumForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/SumForm.cpp$(DependSuffix): SumForm.cpp
@@ -243,6 +323,14 @@ $(IntermediateDirectory)/SumForm.cpp$(DependSuffix): SumForm.cpp
 $(IntermediateDirectory)/SumForm.cpp$(PreprocessSuffix): SumForm.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/SumForm.cpp$(PreprocessSuffix) SumForm.cpp
 
+$(IntermediateDirectory)/MainFrameBase.cpp$(ObjectSuffix): MainFrameBase.cpp $(IntermediateDirectory)/MainFrameBase.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/MainFrameBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/MainFrameBase.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/MainFrameBase.cpp$(DependSuffix): MainFrameBase.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/MainFrameBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/MainFrameBase.cpp$(DependSuffix) -MM MainFrameBase.cpp
+
+$(IntermediateDirectory)/MainFrameBase.cpp$(PreprocessSuffix): MainFrameBase.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/MainFrameBase.cpp$(PreprocessSuffix) MainFrameBase.cpp
+
 $(IntermediateDirectory)/PropertiesData.cpp$(ObjectSuffix): PropertiesData.cpp $(IntermediateDirectory)/PropertiesData.cpp$(DependSuffix)
 	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/PropertiesData.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/PropertiesData.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/PropertiesData.cpp$(DependSuffix): PropertiesData.cpp
@@ -259,14 +347,6 @@ $(IntermediateDirectory)/BusFormBitmaps.cpp$(DependSuffix): BusFormBitmaps.cpp
 $(IntermediateDirectory)/BusFormBitmaps.cpp$(PreprocessSuffix): BusFormBitmaps.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/BusFormBitmaps.cpp$(PreprocessSuffix) BusFormBitmaps.cpp
 
-$(IntermediateDirectory)/base_ControlEditorBase.cpp$(ObjectSuffix): base/ControlEditorBase.cpp $(IntermediateDirectory)/base_ControlEditorBase.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/ControlEditorBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_ControlEditorBase.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/base_ControlEditorBase.cpp$(DependSuffix): base/ControlEditorBase.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_ControlEditorBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_ControlEditorBase.cpp$(DependSuffix) -MM base/ControlEditorBase.cpp
-
-$(IntermediateDirectory)/base_ControlEditorBase.cpp$(PreprocessSuffix): base/ControlEditorBase.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_ControlEditorBase.cpp$(PreprocessSuffix) base/ControlEditorBase.cpp
-
 $(IntermediateDirectory)/ConstantForm.cpp$(ObjectSuffix): ConstantForm.cpp $(IntermediateDirectory)/ConstantForm.cpp$(DependSuffix)
 	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ConstantForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ConstantForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/ConstantForm.cpp$(DependSuffix): ConstantForm.cpp
@@ -307,22 +387,6 @@ $(IntermediateDirectory)/DataReport.cpp$(DependSuffix): DataReport.cpp
 $(IntermediateDirectory)/DataReport.cpp$(PreprocessSuffix): DataReport.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/DataReport.cpp$(PreprocessSuffix) DataReport.cpp
 
-$(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(ObjectSuffix): base/PropertiesFormBitmaps.cpp $(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/PropertiesFormBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(DependSuffix): base/PropertiesFormBitmaps.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(DependSuffix) -MM base/PropertiesFormBitmaps.cpp
-
-$(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(PreprocessSuffix): base/PropertiesFormBitmaps.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(PreprocessSuffix) base/PropertiesFormBitmaps.cpp
-
-$(IntermediateDirectory)/base_MainFrameBase.cpp$(ObjectSuffix): base/MainFrameBase.cpp $(IntermediateDirectory)/base_MainFrameBase.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/MainFrameBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_MainFrameBase.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/base_MainFrameBase.cpp$(DependSuffix): base/MainFrameBase.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_MainFrameBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_MainFrameBase.cpp$(DependSuffix) -MM base/MainFrameBase.cpp
-
-$(IntermediateDirectory)/base_MainFrameBase.cpp$(PreprocessSuffix): base/MainFrameBase.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_MainFrameBase.cpp$(PreprocessSuffix) base/MainFrameBase.cpp
-
 $(IntermediateDirectory)/SimulationsSettingsForm.cpp$(ObjectSuffix): SimulationsSettingsForm.cpp $(IntermediateDirectory)/SimulationsSettingsForm.cpp$(DependSuffix)
 	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/SimulationsSettingsForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/SimulationsSettingsForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/SimulationsSettingsForm.cpp$(DependSuffix): SimulationsSettingsForm.cpp
@@ -387,40 +451,8 @@ $(IntermediateDirectory)/main.cpp$(DependSuffix): main.cpp
 $(IntermediateDirectory)/main.cpp$(PreprocessSuffix): main.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/main.cpp$(PreprocessSuffix) main.cpp
 
-$(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(ObjectSuffix): base/MainFrameBitmaps.cpp $(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/MainFrameBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(DependSuffix): base/MainFrameBitmaps.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(DependSuffix) -MM base/MainFrameBitmaps.cpp
-
-$(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(PreprocessSuffix): base/MainFrameBitmaps.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(PreprocessSuffix) base/MainFrameBitmaps.cpp
-
-$(IntermediateDirectory)/base_DataReportBase.cpp$(ObjectSuffix): base/DataReportBase.cpp $(IntermediateDirectory)/base_DataReportBase.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/DataReportBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_DataReportBase.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/base_DataReportBase.cpp$(DependSuffix): base/DataReportBase.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_DataReportBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_DataReportBase.cpp$(DependSuffix) -MM base/DataReportBase.cpp
-
-$(IntermediateDirectory)/base_DataReportBase.cpp$(PreprocessSuffix): base/DataReportBase.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_DataReportBase.cpp$(PreprocessSuffix) base/DataReportBase.cpp
-
 $(IntermediateDirectory)/win_resources.rc$(ObjectSuffix): win_resources.rc
 	$(RcCompilerName) -i "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/win_resources.rc" $(RcCmpOptions)   $(ObjectSwitch)$(IntermediateDirectory)/win_resources.rc$(ObjectSuffix) $(RcIncludePath)
-$(IntermediateDirectory)/base_WorkspaceBase.cpp$(ObjectSuffix): base/WorkspaceBase.cpp $(IntermediateDirectory)/base_WorkspaceBase.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/WorkspaceBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_WorkspaceBase.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/base_WorkspaceBase.cpp$(DependSuffix): base/WorkspaceBase.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_WorkspaceBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_WorkspaceBase.cpp$(DependSuffix) -MM base/WorkspaceBase.cpp
-
-$(IntermediateDirectory)/base_WorkspaceBase.cpp$(PreprocessSuffix): base/WorkspaceBase.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_WorkspaceBase.cpp$(PreprocessSuffix) base/WorkspaceBase.cpp
-
-$(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(ObjectSuffix): base/WorkspaceBitmaps.cpp $(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/WorkspaceBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(DependSuffix): base/WorkspaceBitmaps.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(DependSuffix) -MM base/WorkspaceBitmaps.cpp
-
-$(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(PreprocessSuffix): base/WorkspaceBitmaps.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(PreprocessSuffix) base/WorkspaceBitmaps.cpp
-
 $(IntermediateDirectory)/ConnectionLine.cpp$(ObjectSuffix): ConnectionLine.cpp $(IntermediateDirectory)/ConnectionLine.cpp$(DependSuffix)
 	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ConnectionLine.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ConnectionLine.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/ConnectionLine.cpp$(DependSuffix): ConnectionLine.cpp
@@ -437,14 +469,6 @@ $(IntermediateDirectory)/IOControlForm.cpp$(DependSuffix): IOControlForm.cpp
 $(IntermediateDirectory)/IOControlForm.cpp$(PreprocessSuffix): IOControlForm.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/IOControlForm.cpp$(PreprocessSuffix) IOControlForm.cpp
 
-$(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(ObjectSuffix): base/ControlEditorBitmaps.cpp $(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/ControlEditorBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(DependSuffix): base/ControlEditorBitmaps.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(DependSuffix) -MM base/ControlEditorBitmaps.cpp
-
-$(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(PreprocessSuffix): base/ControlEditorBitmaps.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(PreprocessSuffix) base/ControlEditorBitmaps.cpp
-
 $(IntermediateDirectory)/FileHanding.cpp$(ObjectSuffix): FileHanding.cpp $(IntermediateDirectory)/FileHanding.cpp$(DependSuffix)
 	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/FileHanding.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/FileHanding.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/FileHanding.cpp$(DependSuffix): FileHanding.cpp
@@ -485,14 +509,6 @@ $(IntermediateDirectory)/Electromechanical.cpp$(DependSuffix): Electromechanical
 $(IntermediateDirectory)/Electromechanical.cpp$(PreprocessSuffix): Electromechanical.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Electromechanical.cpp$(PreprocessSuffix) Electromechanical.cpp
 
-$(IntermediateDirectory)/base_PropertiesFormBase.cpp$(ObjectSuffix): base/PropertiesFormBase.cpp $(IntermediateDirectory)/base_PropertiesFormBase.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/PropertiesFormBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_PropertiesFormBase.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/base_PropertiesFormBase.cpp$(DependSuffix): base/PropertiesFormBase.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_PropertiesFormBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_PropertiesFormBase.cpp$(DependSuffix) -MM base/PropertiesFormBase.cpp
-
-$(IntermediateDirectory)/base_PropertiesFormBase.cpp$(PreprocessSuffix): base/PropertiesFormBase.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_PropertiesFormBase.cpp$(PreprocessSuffix) base/PropertiesFormBase.cpp
-
 $(IntermediateDirectory)/Multiplier.cpp$(ObjectSuffix): Multiplier.cpp $(IntermediateDirectory)/Multiplier.cpp$(DependSuffix)
 	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Multiplier.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Multiplier.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Multiplier.cpp$(DependSuffix): Multiplier.cpp
@@ -581,14 +597,6 @@ $(IntermediateDirectory)/GraphicalElement.cpp$(DependSuffix): GraphicalElement.c
 $(IntermediateDirectory)/GraphicalElement.cpp$(PreprocessSuffix): GraphicalElement.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/GraphicalElement.cpp$(PreprocessSuffix) GraphicalElement.cpp
 
-$(IntermediateDirectory)/base_DataReportBitmaps.cpp$(ObjectSuffix): base/DataReportBitmaps.cpp $(IntermediateDirectory)/base_DataReportBitmaps.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/DataReportBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_DataReportBitmaps.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/base_DataReportBitmaps.cpp$(DependSuffix): base/DataReportBitmaps.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_DataReportBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_DataReportBitmaps.cpp$(DependSuffix) -MM base/DataReportBitmaps.cpp
-
-$(IntermediateDirectory)/base_DataReportBitmaps.cpp$(PreprocessSuffix): base/DataReportBitmaps.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_DataReportBitmaps.cpp$(PreprocessSuffix) base/DataReportBitmaps.cpp
-
 $(IntermediateDirectory)/TextForm.cpp$(ObjectSuffix): TextForm.cpp $(IntermediateDirectory)/TextForm.cpp$(DependSuffix)
 	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/TextForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/TextForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/TextForm.cpp$(DependSuffix): TextForm.cpp
@@ -597,6 +605,14 @@ $(IntermediateDirectory)/TextForm.cpp$(DependSuffix): TextForm.cpp
 $(IntermediateDirectory)/TextForm.cpp$(PreprocessSuffix): TextForm.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/TextForm.cpp$(PreprocessSuffix) TextForm.cpp
 
+$(IntermediateDirectory)/WorkspaceBitmaps.cpp$(ObjectSuffix): WorkspaceBitmaps.cpp $(IntermediateDirectory)/WorkspaceBitmaps.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/WorkspaceBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/WorkspaceBitmaps.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/WorkspaceBitmaps.cpp$(DependSuffix): WorkspaceBitmaps.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/WorkspaceBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/WorkspaceBitmaps.cpp$(DependSuffix) -MM WorkspaceBitmaps.cpp
+
+$(IntermediateDirectory)/WorkspaceBitmaps.cpp$(PreprocessSuffix): WorkspaceBitmaps.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/WorkspaceBitmaps.cpp$(PreprocessSuffix) WorkspaceBitmaps.cpp
+
 $(IntermediateDirectory)/OpenGLText.cpp$(ObjectSuffix): OpenGLText.cpp $(IntermediateDirectory)/OpenGLText.cpp$(DependSuffix)
 	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/OpenGLText.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/OpenGLText.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/OpenGLText.cpp$(DependSuffix): OpenGLText.cpp
@@ -653,6 +669,14 @@ $(IntermediateDirectory)/Inductor.cpp$(DependSuffix): Inductor.cpp
 $(IntermediateDirectory)/Inductor.cpp$(PreprocessSuffix): Inductor.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Inductor.cpp$(PreprocessSuffix) Inductor.cpp
 
+$(IntermediateDirectory)/ElementFormBitmaps.cpp$(ObjectSuffix): ElementFormBitmaps.cpp $(IntermediateDirectory)/ElementFormBitmaps.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ElementFormBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ElementFormBitmaps.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/ElementFormBitmaps.cpp$(DependSuffix): ElementFormBitmaps.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ElementFormBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ElementFormBitmaps.cpp$(DependSuffix) -MM ElementFormBitmaps.cpp
+
+$(IntermediateDirectory)/ElementFormBitmaps.cpp$(PreprocessSuffix): ElementFormBitmaps.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ElementFormBitmaps.cpp$(PreprocessSuffix) ElementFormBitmaps.cpp
+
 $(IntermediateDirectory)/Load.cpp$(ObjectSuffix): Load.cpp $(IntermediateDirectory)/Load.cpp$(DependSuffix)
 	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Load.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Load.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Load.cpp$(DependSuffix): Load.cpp
@@ -669,14 +693,6 @@ $(IntermediateDirectory)/TransferFunctionForm.cpp$(DependSuffix): TransferFuncti
 $(IntermediateDirectory)/TransferFunctionForm.cpp$(PreprocessSuffix): TransferFunctionForm.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/TransferFunctionForm.cpp$(PreprocessSuffix) TransferFunctionForm.cpp
 
-$(IntermediateDirectory)/base_ElementFormBase.cpp$(ObjectSuffix): base/ElementFormBase.cpp $(IntermediateDirectory)/base_ElementFormBase.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/ElementFormBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_ElementFormBase.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/base_ElementFormBase.cpp$(DependSuffix): base/ElementFormBase.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_ElementFormBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_ElementFormBase.cpp$(DependSuffix) -MM base/ElementFormBase.cpp
-
-$(IntermediateDirectory)/base_ElementFormBase.cpp$(PreprocessSuffix): base/ElementFormBase.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_ElementFormBase.cpp$(PreprocessSuffix) base/ElementFormBase.cpp
-
 $(IntermediateDirectory)/Machines.cpp$(ObjectSuffix): Machines.cpp $(IntermediateDirectory)/Machines.cpp$(DependSuffix)
 	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Machines.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Machines.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Machines.cpp$(DependSuffix): Machines.cpp
@@ -709,14 +725,6 @@ $(IntermediateDirectory)/SyncMotor.cpp$(DependSuffix): SyncMotor.cpp
 $(IntermediateDirectory)/SyncMotor.cpp$(PreprocessSuffix): SyncMotor.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/SyncMotor.cpp$(PreprocessSuffix) SyncMotor.cpp
 
-$(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(ObjectSuffix): base/ChartViewBitmaps.cpp $(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/ChartViewBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(DependSuffix): base/ChartViewBitmaps.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(DependSuffix) -MM base/ChartViewBitmaps.cpp
-
-$(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(PreprocessSuffix): base/ChartViewBitmaps.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(PreprocessSuffix) base/ChartViewBitmaps.cpp
-
 $(IntermediateDirectory)/ExponentialForm.cpp$(ObjectSuffix): ExponentialForm.cpp $(IntermediateDirectory)/ExponentialForm.cpp$(DependSuffix)
 	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ExponentialForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ExponentialForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/ExponentialForm.cpp$(DependSuffix): ExponentialForm.cpp
@@ -821,14 +829,6 @@ $(IntermediateDirectory)/SyncMachineForm.cpp$(DependSuffix): SyncMachineForm.cpp
 $(IntermediateDirectory)/SyncMachineForm.cpp$(PreprocessSuffix): SyncMachineForm.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/SyncMachineForm.cpp$(PreprocessSuffix) SyncMachineForm.cpp
 
-$(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(ObjectSuffix): base/ElementFormBitmaps.cpp $(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/ElementFormBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(DependSuffix): base/ElementFormBitmaps.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(DependSuffix) -MM base/ElementFormBitmaps.cpp
-
-$(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(PreprocessSuffix): base/ElementFormBitmaps.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(PreprocessSuffix) base/ElementFormBitmaps.cpp
-
 $(IntermediateDirectory)/GeneralPropertiesForm.cpp$(ObjectSuffix): GeneralPropertiesForm.cpp $(IntermediateDirectory)/GeneralPropertiesForm.cpp$(DependSuffix)
 	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/GeneralPropertiesForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/GeneralPropertiesForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/GeneralPropertiesForm.cpp$(DependSuffix): GeneralPropertiesForm.cpp
diff --git a/Project/Project.project b/Project/Project.project
index ee5acf7..1447966 100644
--- a/Project/Project.project
+++ b/Project/Project.project
@@ -256,30 +256,30 @@
   </VirtualDirectory>
   <VirtualDirectory Name="wxcrafter">
     <VirtualDirectory Name="resources">
+      <File Name="WorkspaceBitmaps.cpp"/>
+      <File Name="PropertiesFormBitmaps.cpp"/>
+      <File Name="MainFrameBitmaps.cpp"/>
+      <File Name="ElementFormBitmaps.cpp"/>
+      <File Name="ControlEditorBitmaps.cpp"/>
+      <File Name="ChartViewBitmaps.cpp"/>
+      <File Name="DataReportBitmaps.cpp"/>
       <File Name="BusFormBitmaps.cpp"/>
-      <File Name="base/ChartViewBitmaps.cpp"/>
-      <File Name="base/ControlEditorBitmaps.cpp"/>
-      <File Name="base/DataReportBitmaps.cpp"/>
-      <File Name="base/ElementFormBitmaps.cpp"/>
-      <File Name="base/MainFrameBitmaps.cpp"/>
-      <File Name="base/PropertiesFormBitmaps.cpp"/>
-      <File Name="base/WorkspaceBitmaps.cpp"/>
     </VirtualDirectory>
     <VirtualDirectory Name="base">
-      <File Name="base/ChartViewBase.h"/>
-      <File Name="base/ChartViewBase.cpp"/>
-      <File Name="base/ControlEditorBase.h"/>
-      <File Name="base/ControlEditorBase.cpp"/>
-      <File Name="base/DataReportBase.h"/>
-      <File Name="base/DataReportBase.cpp"/>
-      <File Name="base/ElementFormBase.h"/>
-      <File Name="base/ElementFormBase.cpp"/>
-      <File Name="base/MainFrameBase.h"/>
-      <File Name="base/MainFrameBase.cpp"/>
-      <File Name="base/PropertiesFormBase.h"/>
-      <File Name="base/PropertiesFormBase.cpp"/>
-      <File Name="base/WorkspaceBase.h"/>
-      <File Name="base/WorkspaceBase.cpp"/>
+      <File Name="WorkspaceBase.cpp"/>
+      <File Name="WorkspaceBase.h"/>
+      <File Name="PropertiesFormBase.cpp"/>
+      <File Name="PropertiesFormBase.h"/>
+      <File Name="MainFrameBase.cpp"/>
+      <File Name="MainFrameBase.h"/>
+      <File Name="ElementFormBase.cpp"/>
+      <File Name="ElementFormBase.h"/>
+      <File Name="ControlEditorBase.cpp"/>
+      <File Name="ControlEditorBase.h"/>
+      <File Name="ChartViewBase.cpp"/>
+      <File Name="ChartViewBase.h"/>
+      <File Name="DataReportBase.cpp"/>
+      <File Name="DataReportBase.h"/>
     </VirtualDirectory>
     <File Name="MainFrame.wxcp"/>
     <File Name="Workspace.wxcp"/>
diff --git a/Project/Project.txt b/Project/Project.txt
index 0319782..94c583c 100644
--- a/Project/Project.txt
+++ b/Project/Project.txt
@@ -1,2 +1,2 @@
-./Release_Windows_x64/TransformerForm.cpp.o ./Release_Windows_x64/ElementPlotData.cpp.o ./Release_Windows_x64/ChartView.cpp.o ./Release_Windows_x64/ElectricCalculation.cpp.o ./Release_Windows_x64/GainForm.cpp.o ./Release_Windows_x64/Constant.cpp.o ./Release_Windows_x64/Camera.cpp.o ./Release_Windows_x64/wxMathPlot_mathplot.cpp.o ./Release_Windows_x64/XMLParser.cpp.o ./Release_Windows_x64/fparser_fpoptimizer.cc.o ./Release_Windows_x64/fparser_fparser.cc.o ./Release_Windows_x64/MainFrame.cpp.o ./Release_Windows_x64/Divider.cpp.o ./Release_Windows_x64/ElementDataObject.cpp.o ./Release_Windows_x64/Fault.cpp.o ./Release_Windows_x64/base_ChartViewBase.cpp.o ./Release_Windows_x64/SumForm.cpp.o ./Release_Windows_x64/PropertiesData.cpp.o ./Release_Windows_x64/BusFormBitmaps.cpp.o ./Release_Windows_x64/base_ControlEditorBase.cpp.o ./Release_Windows_x64/ConstantForm.cpp.o ./Release_Windows_x64/IndMotorForm.cpp.o ./Release_Windows_x64/ControlElement.cpp.o ./Release_Windows_x64/Gain.cpp.o ./Release_Windows_x64/DataReport.cpp.o ./Release_Windows_x64/base_PropertiesFormBitmaps.cpp.o ./Release_Windows_x64/base_MainFrameBase.cpp.o ./Release_Windows_x64/SimulationsSettingsForm.cpp.o ./Release_Windows_x64/MathExprParser.cpp.o ./Release_Windows_x64/Line.cpp.o ./Release_Windows_x64/Transformer.cpp.o ./Release_Windows_x64/ControlSystemTest.cpp.o ./Release_Windows_x64/ControlEditor.cpp.o ./Release_Windows_x64/SyncGenerator.cpp.o ./Release_Windows_x64/main.cpp.o ./Release_Windows_x64/base_MainFrameBitmaps.cpp.o ./Release_Windows_x64/base_DataReportBase.cpp.o ./Release_Windows_x64/win_resources.rc.o ./Release_Windows_x64/base_WorkspaceBase.cpp.o ./Release_Windows_x64/base_WorkspaceBitmaps.cpp.o ./Release_Windows_x64/ConnectionLine.cpp.o ./Release_Windows_x64/IOControlForm.cpp.o ./Release_Windows_x64/base_ControlEditorBitmaps.cpp.o   
-./Release_Windows_x64/FileHanding.cpp.o ./Release_Windows_x64/PowerFlow.cpp.o ./Release_Windows_x64/Element.cpp.o ./Release_Windows_x64/RateLimiterForm.cpp.o ./Release_Windows_x64/Electromechanical.cpp.o ./Release_Windows_x64/base_PropertiesFormBase.cpp.o ./Release_Windows_x64/Multiplier.cpp.o ./Release_Windows_x64/Shunt.cpp.o ./Release_Windows_x64/ControlElementContainer.cpp.o ./Release_Windows_x64/Exponential.cpp.o ./Release_Windows_x64/Limiter.cpp.o ./Release_Windows_x64/RateLimiter.cpp.o ./Release_Windows_x64/MathOperation.cpp.o ./Release_Windows_x64/MathExpression.cpp.o ./Release_Windows_x64/artProvider_ArtMetro.cpp.o ./Release_Windows_x64/Workspace.cpp.o ./Release_Windows_x64/GraphicalElement.cpp.o ./Release_Windows_x64/base_DataReportBitmaps.cpp.o ./Release_Windows_x64/TextForm.cpp.o ./Release_Windows_x64/OpenGLText.cpp.o ./Release_Windows_x64/IndMotor.cpp.o ./Release_Windows_x64/Text.cpp.o ./Release_Windows_x64/Branch.cpp.o ./Release_Windows_x64/TransferFunction.cpp.o ./Release_Windows_x64/Bus.cpp.o ./Release_Windows_x64/Inductor.cpp.o ./Release_Windows_x64/Load.cpp.o ./Release_Windows_x64/TransferFunctionForm.cpp.o ./Release_Windows_x64/base_ElementFormBase.cpp.o ./Release_Windows_x64/Machines.cpp.o ./Release_Windows_x64/PowerElement.cpp.o ./Release_Windows_x64/IOControl.cpp.o ./Release_Windows_x64/SyncMotor.cpp.o ./Release_Windows_x64/base_ChartViewBitmaps.cpp.o ./Release_Windows_x64/ExponentialForm.cpp.o ./Release_Windows_x64/ImportForm.cpp.o ./Release_Windows_x64/AboutForm.cpp.o ./Release_Windows_x64/ControlElementSolver.cpp.o ./Release_Windows_x64/LimiterForm.cpp.o ./Release_Windows_x64/MathExpressionForm.cpp.o ./Release_Windows_x64/BusForm.cpp.o ./Release_Windows_x64/GeneratorStabForm.cpp.o ./Release_Windows_x64/LineForm.cpp.o ./Release_Windows_x64/Capacitor.cpp.o ./Release_Windows_x64/LoadForm.cpp.o ./Release_Windows_x64/ReactiveShuntElementForm.cpp.o ./Release_Windows_x64/SyncMachineForm.cpp.o ./Release_Windows_x64/base_ElementFormBitmaps.cpp.o ./Release_Windows_x64/GeneralPropertiesForm.cpp.o ./Release_Windows_x64/SwitchingForm.cpp.o ./Release_Windows_x64/Sum.cpp.o  
+./Release_Windows_x64/WorkspaceBase.cpp.o ./Release_Windows_x64/PropertiesFormBase.cpp.o ./Release_Windows_x64/PropertiesFormBitmaps.cpp.o ./Release_Windows_x64/MainFrameBitmaps.cpp.o ./Release_Windows_x64/ElementFormBase.cpp.o ./Release_Windows_x64/ControlEditorBase.cpp.o ./Release_Windows_x64/ControlEditorBitmaps.cpp.o ./Release_Windows_x64/ChartViewBase.cpp.o ./Release_Windows_x64/DataReportBitmaps.cpp.o ./Release_Windows_x64/DataReportBase.cpp.o ./Release_Windows_x64/TransformerForm.cpp.o ./Release_Windows_x64/ElementPlotData.cpp.o ./Release_Windows_x64/ChartView.cpp.o ./Release_Windows_x64/ElectricCalculation.cpp.o ./Release_Windows_x64/GainForm.cpp.o ./Release_Windows_x64/Constant.cpp.o ./Release_Windows_x64/Camera.cpp.o ./Release_Windows_x64/wxMathPlot_mathplot.cpp.o ./Release_Windows_x64/XMLParser.cpp.o ./Release_Windows_x64/fparser_fpoptimizer.cc.o ./Release_Windows_x64/fparser_fparser.cc.o ./Release_Windows_x64/ChartViewBitmaps.cpp.o ./Release_Windows_x64/MainFrame.cpp.o ./Release_Windows_x64/Divider.cpp.o ./Release_Windows_x64/ElementDataObject.cpp.o ./Release_Windows_x64/Fault.cpp.o ./Release_Windows_x64/SumForm.cpp.o ./Release_Windows_x64/MainFrameBase.cpp.o ./Release_Windows_x64/PropertiesData.cpp.o ./Release_Windows_x64/BusFormBitmaps.cpp.o ./Release_Windows_x64/ConstantForm.cpp.o ./Release_Windows_x64/IndMotorForm.cpp.o ./Release_Windows_x64/ControlElement.cpp.o ./Release_Windows_x64/Gain.cpp.o ./Release_Windows_x64/DataReport.cpp.o ./Release_Windows_x64/SimulationsSettingsForm.cpp.o ./Release_Windows_x64/MathExprParser.cpp.o ./Release_Windows_x64/Line.cpp.o ./Release_Windows_x64/Transformer.cpp.o ./Release_Windows_x64/ControlSystemTest.cpp.o ./Release_Windows_x64/ControlEditor.cpp.o ./Release_Windows_x64/SyncGenerator.cpp.o ./Release_Windows_x64/main.cpp.o   
+./Release_Windows_x64/win_resources.rc.o ./Release_Windows_x64/ConnectionLine.cpp.o ./Release_Windows_x64/IOControlForm.cpp.o ./Release_Windows_x64/FileHanding.cpp.o ./Release_Windows_x64/PowerFlow.cpp.o ./Release_Windows_x64/Element.cpp.o ./Release_Windows_x64/RateLimiterForm.cpp.o ./Release_Windows_x64/Electromechanical.cpp.o ./Release_Windows_x64/Multiplier.cpp.o ./Release_Windows_x64/Shunt.cpp.o ./Release_Windows_x64/ControlElementContainer.cpp.o ./Release_Windows_x64/Exponential.cpp.o ./Release_Windows_x64/Limiter.cpp.o ./Release_Windows_x64/RateLimiter.cpp.o ./Release_Windows_x64/MathOperation.cpp.o ./Release_Windows_x64/MathExpression.cpp.o ./Release_Windows_x64/artProvider_ArtMetro.cpp.o ./Release_Windows_x64/Workspace.cpp.o ./Release_Windows_x64/GraphicalElement.cpp.o ./Release_Windows_x64/TextForm.cpp.o ./Release_Windows_x64/WorkspaceBitmaps.cpp.o ./Release_Windows_x64/OpenGLText.cpp.o ./Release_Windows_x64/IndMotor.cpp.o ./Release_Windows_x64/Text.cpp.o ./Release_Windows_x64/Branch.cpp.o ./Release_Windows_x64/TransferFunction.cpp.o ./Release_Windows_x64/Bus.cpp.o ./Release_Windows_x64/Inductor.cpp.o ./Release_Windows_x64/ElementFormBitmaps.cpp.o ./Release_Windows_x64/Load.cpp.o ./Release_Windows_x64/TransferFunctionForm.cpp.o ./Release_Windows_x64/Machines.cpp.o ./Release_Windows_x64/PowerElement.cpp.o ./Release_Windows_x64/IOControl.cpp.o ./Release_Windows_x64/SyncMotor.cpp.o ./Release_Windows_x64/ExponentialForm.cpp.o ./Release_Windows_x64/ImportForm.cpp.o ./Release_Windows_x64/AboutForm.cpp.o ./Release_Windows_x64/ControlElementSolver.cpp.o ./Release_Windows_x64/LimiterForm.cpp.o ./Release_Windows_x64/MathExpressionForm.cpp.o ./Release_Windows_x64/BusForm.cpp.o ./Release_Windows_x64/GeneratorStabForm.cpp.o ./Release_Windows_x64/LineForm.cpp.o ./Release_Windows_x64/Capacitor.cpp.o ./Release_Windows_x64/LoadForm.cpp.o ./Release_Windows_x64/ReactiveShuntElementForm.cpp.o ./Release_Windows_x64/SyncMachineForm.cpp.o ./Release_Windows_x64/GeneralPropertiesForm.cpp.o ./Release_Windows_x64/SwitchingForm.cpp.o ./Release_Windows_x64/Sum.cpp.o  
diff --git a/Project/PropertiesForm.wxcp b/Project/PropertiesForm.wxcp
index 5802092..583ea53 100644
--- a/Project/PropertiesForm.wxcp
+++ b/Project/PropertiesForm.wxcp
@@ -1,6 +1,6 @@
 {
  "metadata": {
-  "m_generatedFilesDir": "base/",
+  "m_generatedFilesDir": ".",
   "m_objCounter": 791,
   "m_includeFiles": [],
   "m_bitmapFunction": "wxCDAD0InitBitmapResources",
diff --git a/Project/base/PropertiesFormBase.cpp b/Project/PropertiesFormBase.cpp
index 60ae2a0..60ae2a0 100644
--- a/Project/base/PropertiesFormBase.cpp
+++ b/Project/PropertiesFormBase.cpp
diff --git a/Project/base/PropertiesFormBase.h b/Project/PropertiesFormBase.h
index f498e1e..f498e1e 100644
--- a/Project/base/PropertiesFormBase.h
+++ b/Project/PropertiesFormBase.h
diff --git a/Project/base/PropertiesFormBitmaps.cpp b/Project/PropertiesFormBitmaps.cpp
index 9a7a6c3..9a7a6c3 100644
--- a/Project/base/PropertiesFormBitmaps.cpp
+++ b/Project/PropertiesFormBitmaps.cpp
diff --git a/Project/RateLimiterForm.h b/Project/RateLimiterForm.h
index b0ce57a..aa930db 100644
--- a/Project/RateLimiterForm.h
+++ b/Project/RateLimiterForm.h
@@ -17,7 +17,7 @@
 
 #ifndef RATELIMITERFORM_H
 #define RATELIMITERFORM_H
-#include "base/ElementFormBase.h"
+#include "ElementFormBase.h"
 
 class RateLimiter;
 
diff --git a/Project/ReactiveShuntElementForm.h b/Project/ReactiveShuntElementForm.h
index 4972fb3..7e571be 100644
--- a/Project/ReactiveShuntElementForm.h
+++ b/Project/ReactiveShuntElementForm.h
@@ -17,7 +17,7 @@
 
 #ifndef REACTIVESHUNTELEMENTFORM_H
 #define REACTIVESHUNTELEMENTFORM_H
-#include "base/ElementFormBase.h"
+#include "ElementFormBase.h"
 #include <wx/log.h>
 
 class Capacitor;
diff --git a/Project/SimulationsSettingsForm.h b/Project/SimulationsSettingsForm.h
index c99ab3c..72a0bf8 100644
--- a/Project/SimulationsSettingsForm.h
+++ b/Project/SimulationsSettingsForm.h
@@ -18,7 +18,7 @@
 #ifndef SIMULATIONSSETTINGSFORM_H
 #define SIMULATIONSSETTINGSFORM_H
 
-#include "base/PropertiesFormBase.h"
+#include "PropertiesFormBase.h"
 
 class PropertiesData;
 
diff --git a/Project/SumForm.h b/Project/SumForm.h
index 34193d8..f1d1270 100644
--- a/Project/SumForm.h
+++ b/Project/SumForm.h
@@ -18,7 +18,7 @@
 #ifndef SUMFORM_H
 #define SUMFORM_H
 
-#include "base/ElementFormBase.h"
+#include "ElementFormBase.h"
 
 class Sum;
 
diff --git a/Project/SwitchingForm.h b/Project/SwitchingForm.h
index 34344af..df539e6 100644
--- a/Project/SwitchingForm.h
+++ b/Project/SwitchingForm.h
@@ -18,7 +18,7 @@
 #ifndef SWITCHINGFORM_H
 #define SWITCHINGFORM_H
 
-#include "base/ElementFormBase.h"
+#include "ElementFormBase.h"
 
 class PowerElement;
 
diff --git a/Project/SyncMachineForm.h b/Project/SyncMachineForm.h
index c56c8c1..793ca79 100644
--- a/Project/SyncMachineForm.h
+++ b/Project/SyncMachineForm.h
@@ -18,7 +18,7 @@
 #ifndef SYNCMACHINEFORM_H
 #define SYNCMACHINEFORM_H
 
-#include "base/ElementFormBase.h"
+#include "ElementFormBase.h"
 
 class GeneratorStabForm;
 class SyncGenerator;
diff --git a/Project/TextForm.h b/Project/TextForm.h
index 80e7fe7..eda2322 100644
--- a/Project/TextForm.h
+++ b/Project/TextForm.h
@@ -17,7 +17,7 @@
 
 #ifndef TEXTFORM_H
 #define TEXTFORM_H
-#include "base/ElementFormBase.h"
+#include "ElementFormBase.h"
 
 #include "Text.h"
 #include "ElectricCalculation.h"
diff --git a/Project/TransferFunctionForm.h b/Project/TransferFunctionForm.h
index fffd362..7ae478a 100644
--- a/Project/TransferFunctionForm.h
+++ b/Project/TransferFunctionForm.h
@@ -18,7 +18,7 @@
 #ifndef TRANSFERFUNCTIONFORM_H
 #define TRANSFERFUNCTIONFORM_H
 
-#include "base/ElementFormBase.h"
+#include "ElementFormBase.h"
 
 class TransferFunction;
 
diff --git a/Project/TransformerForm.h b/Project/TransformerForm.h
index 6b76bf4..1cb0db2 100644
--- a/Project/TransformerForm.h
+++ b/Project/TransformerForm.h
@@ -18,7 +18,7 @@
 #ifndef TRANSFORMERFORM_H
 #define TRANSFORMERFORM_H
 
-#include "base/ElementFormBase.h"
+#include "ElementFormBase.h"
 
 class SwitchingForm;
 class Transformer;
diff --git a/Project/Workspace.h b/Project/Workspace.h
index 4c9bde6..83b64e6 100644
--- a/Project/Workspace.h
+++ b/Project/Workspace.h
@@ -26,7 +26,7 @@
 #include <wx/clipbrd.h>
 #include <wx/tipwin.h>
 
-#include "base/WorkspaceBase.h"
+#include "WorkspaceBase.h"
 #include "Bus.h"
 
 #include "ControlEditor.h"
diff --git a/Project/Workspace.wxcp b/Project/Workspace.wxcp
index f30cd9d..bebedf1 100644
--- a/Project/Workspace.wxcp
+++ b/Project/Workspace.wxcp
@@ -1,6 +1,6 @@
 {
  "metadata": {
-  "m_generatedFilesDir": "base/",
+  "m_generatedFilesDir": ".",
   "m_objCounter": 6,
   "m_includeFiles": [],
   "m_bitmapFunction": "wxC52C4InitBitmapResources",
diff --git a/Project/base/WorkspaceBase.cpp b/Project/WorkspaceBase.cpp
index 6fc2b79..6fc2b79 100644
--- a/Project/base/WorkspaceBase.cpp
+++ b/Project/WorkspaceBase.cpp
diff --git a/Project/base/WorkspaceBase.h b/Project/WorkspaceBase.h
index 2ceed20..2ceed20 100644
--- a/Project/base/WorkspaceBase.h
+++ b/Project/WorkspaceBase.h
diff --git a/Project/base/WorkspaceBitmaps.cpp b/Project/WorkspaceBitmaps.cpp
index b370872..b370872 100644
--- a/Project/base/WorkspaceBitmaps.cpp
+++ b/Project/WorkspaceBitmaps.cpp