diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75e23938..d37f4026 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@ SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 IF(BUILD_BINARIES)
 
   add_executable(DyssolC
-      ${CMAKE_SOURCE_DIR}/DyssolConsole/main.cpp
+      ${CMAKE_SOURCE_DIR}/DyssolCLI/main.cpp
   )
 
   set(libdyssolnames
@@ -109,7 +109,7 @@ IF(BUILD_BINARIES)
     INCLUDE_DIRECTORIES(${Graphviz_INCLUDE_DIR})
   ENDIF(Graphviz_FOUND)
 
-  CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/DyssolMainWindow/config.ini.in" "${CMAKE_BINARY_DIR}/config.ini")
+  CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/DyssolGUI/config.ini.in" "${CMAKE_BINARY_DIR}/config.ini")
   INSTALL(FILES "${CMAKE_BINARY_DIR}/config.ini" DESTINATION ${INSTALL_CONFIG_PATH})
   INSTALL(FILES "${CMAKE_SOURCE_DIR}/Materials.dmdb" DESTINATION ${INSTALL_MATERIALDB_PATH})
 
@@ -119,7 +119,7 @@ IF(BUILD_BINARIES)
 
   ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/Units")
   ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/Solvers")
-  ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/DyssolMainWindow")
+  ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/DyssolGUI")
 
   SET(INSTALL_DOCS_PATH  ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/Dyssol/docs)
 
diff --git a/Dyssol.sln b/Dyssol.sln
index 8fd5ce2f..f5173991 100644
--- a/Dyssol.sln
+++ b/Dyssol.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.10.35013.160
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dyssol", "DyssolMainWindow\DyssolMainWindow.vcxproj", "{06FC09C8-3DBA-40B5-A5D2-5A33CD23F917}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dyssol", "DyssolGUI\DyssolGUI.vcxproj", "{06FC09C8-3DBA-40B5-A5D2-5A33CD23F917}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CacheHandler", "CacheHandler\CacheHandler.vcxproj", "{55AD8231-176F-4282-88FA-A0A0E71A51C6}"
 EndProject
@@ -84,7 +84,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Release", "Release", "{37D9
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Unit_Agglomerator", "Units\Agglomerator\Agglomerator.vcxproj", "{1BE27265-F358-42F3-B550-ADCAF0CB9FCC}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DyssolC", "DyssolConsole\DyssolConsole.vcxproj", "{1641EA84-6364-4CAF-AB4F-8BFB995C0B48}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DyssolC", "DyssolCLI\DyssolCLI.vcxproj", "{1641EA84-6364-4CAF-AB4F-8BFB995C0B48}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Unit_HeatExchanger", "Units\HeatExchanger\HeatExchanger.vcxproj", "{A9D881A3-3E9A-46C4-B743-85C71BAE7BC9}"
 EndProject
diff --git a/DyssolConsole/DyssolConsole.vcxproj b/DyssolCLI/DyssolCLI.vcxproj
similarity index 100%
rename from DyssolConsole/DyssolConsole.vcxproj
rename to DyssolCLI/DyssolCLI.vcxproj
diff --git a/DyssolConsole/DyssolConsole.vcxproj.filters b/DyssolCLI/DyssolCLI.vcxproj.filters
similarity index 100%
rename from DyssolConsole/DyssolConsole.vcxproj.filters
rename to DyssolCLI/DyssolCLI.vcxproj.filters
diff --git a/DyssolConsole/main.cpp b/DyssolCLI/main.cpp
similarity index 100%
rename from DyssolConsole/main.cpp
rename to DyssolCLI/main.cpp
diff --git a/DyssolMainWindow/AboutWindow.cpp b/DyssolGUI/AboutWindow.cpp
similarity index 100%
rename from DyssolMainWindow/AboutWindow.cpp
rename to DyssolGUI/AboutWindow.cpp
diff --git a/DyssolMainWindow/AboutWindow.h b/DyssolGUI/AboutWindow.h
similarity index 100%
rename from DyssolMainWindow/AboutWindow.h
rename to DyssolGUI/AboutWindow.h
diff --git a/DyssolMainWindow/AboutWindow.ui b/DyssolGUI/AboutWindow.ui
similarity index 100%
rename from DyssolMainWindow/AboutWindow.ui
rename to DyssolGUI/AboutWindow.ui
diff --git a/DyssolMainWindow/CMakeLists.txt b/DyssolGUI/CMakeLists.txt
similarity index 99%
rename from DyssolMainWindow/CMakeLists.txt
rename to DyssolGUI/CMakeLists.txt
index 3b88b929..73bdd9b7 100644
--- a/DyssolMainWindow/CMakeLists.txt
+++ b/DyssolGUI/CMakeLists.txt
@@ -21,7 +21,7 @@ MACRO(SUBDIRLIST result curdir)
 ENDMACRO()
 
 set(DyssolGUInames
-	"DyssolMainWindow"
+	"DyssolGUI"
 	"GUIDialogs"
 	"GUIWidgets"
 )
diff --git a/DyssolMainWindow/Dyssol.cpp b/DyssolGUI/Dyssol.cpp
similarity index 100%
rename from DyssolMainWindow/Dyssol.cpp
rename to DyssolGUI/Dyssol.cpp
diff --git a/DyssolMainWindow/Dyssol.h b/DyssolGUI/Dyssol.h
similarity index 100%
rename from DyssolMainWindow/Dyssol.h
rename to DyssolGUI/Dyssol.h
diff --git a/DyssolMainWindow/Dyssol.rc b/DyssolGUI/Dyssol.rc
similarity index 100%
rename from DyssolMainWindow/Dyssol.rc
rename to DyssolGUI/Dyssol.rc
diff --git a/DyssolMainWindow/Dyssol.ui b/DyssolGUI/Dyssol.ui
similarity index 100%
rename from DyssolMainWindow/Dyssol.ui
rename to DyssolGUI/Dyssol.ui
diff --git a/DyssolMainWindow/DyssolMainWindow.vcxproj b/DyssolGUI/DyssolGUI.vcxproj
similarity index 100%
rename from DyssolMainWindow/DyssolMainWindow.vcxproj
rename to DyssolGUI/DyssolGUI.vcxproj
diff --git a/DyssolMainWindow/DyssolMainWindow.vcxproj.filters b/DyssolGUI/DyssolGUI.vcxproj.filters
similarity index 100%
rename from DyssolMainWindow/DyssolMainWindow.vcxproj.filters
rename to DyssolGUI/DyssolGUI.vcxproj.filters
diff --git a/DyssolMainWindow/DyssolMainWindow.vcxproj.user b/DyssolGUI/DyssolGUI.vcxproj.user
similarity index 100%
rename from DyssolMainWindow/DyssolMainWindow.vcxproj.user
rename to DyssolGUI/DyssolGUI.vcxproj.user
diff --git a/DyssolMainWindow/Resources.qrc b/DyssolGUI/Resources.qrc
similarity index 100%
rename from DyssolMainWindow/Resources.qrc
rename to DyssolGUI/Resources.qrc
diff --git a/DyssolMainWindow/Resources/Icon.ico b/DyssolGUI/Resources/Icon.ico
similarity index 100%
rename from DyssolMainWindow/Resources/Icon.ico
rename to DyssolGUI/Resources/Icon.ico
diff --git a/DyssolMainWindow/Resources/WinIcon.png b/DyssolGUI/Resources/WinIcon.png
similarity index 100%
rename from DyssolMainWindow/Resources/WinIcon.png
rename to DyssolGUI/Resources/WinIcon.png
diff --git a/DyssolMainWindow/SaveLoadThread.cpp b/DyssolGUI/SaveLoadThread.cpp
similarity index 100%
rename from DyssolMainWindow/SaveLoadThread.cpp
rename to DyssolGUI/SaveLoadThread.cpp
diff --git a/DyssolMainWindow/SaveLoadThread.h b/DyssolGUI/SaveLoadThread.h
similarity index 100%
rename from DyssolMainWindow/SaveLoadThread.h
rename to DyssolGUI/SaveLoadThread.h
diff --git a/DyssolMainWindow/config.ini b/DyssolGUI/config.ini
similarity index 100%
rename from DyssolMainWindow/config.ini
rename to DyssolGUI/config.ini
diff --git a/DyssolMainWindow/config.ini.in b/DyssolGUI/config.ini.in
similarity index 100%
rename from DyssolMainWindow/config.ini.in
rename to DyssolGUI/config.ini.in
diff --git a/DyssolMainWindow/main.cpp b/DyssolGUI/main.cpp
similarity index 100%
rename from DyssolMainWindow/main.cpp
rename to DyssolGUI/main.cpp
diff --git a/DyssolMainWindow/resource.h b/DyssolGUI/resource.h
similarity index 100%
rename from DyssolMainWindow/resource.h
rename to DyssolGUI/resource.h
diff --git a/DyssolInstallers/Scripts/Main.iss b/DyssolInstallers/Scripts/Main.iss
index f984b7b5..6e60fc2e 100644
--- a/DyssolInstallers/Scripts/Main.iss
+++ b/DyssolInstallers/Scripts/Main.iss
@@ -50,7 +50,7 @@ OutputBaseFilename={#MyAppName} {#MyAppVersion} setup
 #endif
 OutputDir={#SolutionDir}\DyssolInstallers\Installers
 LicenseFile={#SolutionDir}\LICENSE
-SetupIconFile={#SolutionDir}\DyssolMainWindow\Resources\Icon.ico
+SetupIconFile={#SolutionDir}\DyssolGUI\Resources\Icon.ico
 WizardImageFile={#SolutionDir}\DyssolInstallers\Data\WizardImageFile.bmp
 WizardSmallImageFile={#SolutionDir}\DyssolInstallers\Data\WizardSmallImageFile.bmp
 DisableStartupPrompt=False
diff --git a/GUIDialogs/CalculationSequenceEditor/CalculationSequenceEditor.ui b/GUIDialogs/CalculationSequenceEditor/CalculationSequenceEditor.ui
index ec4a2147..e8ef8580 100644
--- a/GUIDialogs/CalculationSequenceEditor/CalculationSequenceEditor.ui
+++ b/GUIDialogs/CalculationSequenceEditor/CalculationSequenceEditor.ui
@@ -14,7 +14,7 @@
       <string>Calculation sequence</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QVBoxLayout" name="verticalLayout">
@@ -204,7 +204,7 @@
     <tabstop>buttonOk</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections>
     <connection>
diff --git a/GUIDialogs/CompoundsManager/CompoundsManager.ui b/GUIDialogs/CompoundsManager/CompoundsManager.ui
index bc213ff4..c6d88de4 100644
--- a/GUIDialogs/CompoundsManager/CompoundsManager.ui
+++ b/GUIDialogs/CompoundsManager/CompoundsManager.ui
@@ -14,7 +14,7 @@
       <string>Used compounds</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <property name="autoFillBackground">
@@ -237,7 +237,7 @@
     <tabstop>pushButtonCancel</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
\ No newline at end of file
diff --git a/GUIDialogs/DustFormationTesterTab/DustFormationTesterTab.ui b/GUIDialogs/DustFormationTesterTab/DustFormationTesterTab.ui
index 7613d5d7..719a3df5 100644
--- a/GUIDialogs/DustFormationTesterTab/DustFormationTesterTab.ui
+++ b/GUIDialogs/DustFormationTesterTab/DustFormationTesterTab.ui
@@ -14,7 +14,7 @@
    <string>Dust formation tendency</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../DyssolMainWindow/Resources.qrc">
+   <iconset resource="../../DyssolGUI/Resources.qrc">
     <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout" columnstretch="1,4">
@@ -348,7 +348,7 @@ Wet bulk</string>
   <tabstop>listWidgetUnits</tabstop>
  </tabstops>
  <resources>
-  <include location="../../DyssolMainWindow/Resources.qrc"/>
+  <include location="../../DyssolGUI/Resources.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/GUIDialogs/FlowsheetEditor/FlowsheetEditor.ui b/GUIDialogs/FlowsheetEditor/FlowsheetEditor.ui
index e74ebd04..fa63a8bf 100644
--- a/GUIDialogs/FlowsheetEditor/FlowsheetEditor.ui
+++ b/GUIDialogs/FlowsheetEditor/FlowsheetEditor.ui
@@ -14,7 +14,7 @@
       <string>CFlowsheetEditor</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QHBoxLayout" name="horizontalLayout">
@@ -661,7 +661,7 @@
     <tabstop>buttonRemoveListValue</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
\ No newline at end of file
diff --git a/GUIDialogs/FlowsheetEditor/FlowsheetViewer.ui b/GUIDialogs/FlowsheetEditor/FlowsheetViewer.ui
index 195692a2..db88ee74 100644
--- a/GUIDialogs/FlowsheetEditor/FlowsheetViewer.ui
+++ b/GUIDialogs/FlowsheetEditor/FlowsheetViewer.ui
@@ -14,7 +14,7 @@
    <string>Flowsheet</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../DyssolMainWindow/Resources.qrc">
+   <iconset resource="../../DyssolGUI/Resources.qrc">
     <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
   </property>
   <layout class="QGridLayout" name="mainLayout">
@@ -132,7 +132,7 @@
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>
-  <include location="../../DyssolMainWindow/Resources.qrc"/>
+  <include location="../../DyssolGUI/Resources.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/GUIDialogs/GridEditor/DimensionParameters.ui b/GUIDialogs/GridEditor/DimensionParameters.ui
index 9f409b10..1f3c9653 100644
--- a/GUIDialogs/GridEditor/DimensionParameters.ui
+++ b/GUIDialogs/GridEditor/DimensionParameters.ui
@@ -14,7 +14,7 @@
       <string>CDimensionParameters</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,1">
@@ -304,7 +304,7 @@
     <tabstop>tableGrid</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
\ No newline at end of file
diff --git a/GUIDialogs/GridEditor/GridEditor.ui b/GUIDialogs/GridEditor/GridEditor.ui
index 34344708..0d7a1db9 100644
--- a/GUIDialogs/GridEditor/GridEditor.ui
+++ b/GUIDialogs/GridEditor/GridEditor.ui
@@ -14,7 +14,7 @@
       <string>Grid specification</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QGridLayout" name="gridLayout">
@@ -171,7 +171,7 @@
     <tabstop>listDims</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
\ No newline at end of file
diff --git a/GUIDialogs/HoldupsEditor/HoldupsEditor.ui b/GUIDialogs/HoldupsEditor/HoldupsEditor.ui
index 980ad0ad..9f027156 100644
--- a/GUIDialogs/HoldupsEditor/HoldupsEditor.ui
+++ b/GUIDialogs/HoldupsEditor/HoldupsEditor.ui
@@ -14,7 +14,7 @@
       <string>Holdups editor</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QVBoxLayout" name="verticalLayout" stretch="1,4">
@@ -134,7 +134,7 @@
     <tabstop>holdupsList</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
\ No newline at end of file
diff --git a/GUIDialogs/MaterialsDatabaseTab/CorrelationEditor.ui b/GUIDialogs/MaterialsDatabaseTab/CorrelationEditor.ui
index 052f606f..fda9dba0 100644
--- a/GUIDialogs/MaterialsDatabaseTab/CorrelationEditor.ui
+++ b/GUIDialogs/MaterialsDatabaseTab/CorrelationEditor.ui
@@ -14,7 +14,7 @@
       <string>CCorrelationEditor</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QGridLayout" name="gridLayout" columnstretch="1,0,0,0">
@@ -237,7 +237,7 @@
     <tabstop>tableParams</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
\ No newline at end of file
diff --git a/GUIDialogs/MaterialsDatabaseTab/DescriptionEditor.ui b/GUIDialogs/MaterialsDatabaseTab/DescriptionEditor.ui
index 3ae9f6f8..c506535a 100644
--- a/GUIDialogs/MaterialsDatabaseTab/DescriptionEditor.ui
+++ b/GUIDialogs/MaterialsDatabaseTab/DescriptionEditor.ui
@@ -14,7 +14,7 @@
    <string>Description</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../DyssolMainWindow/Resources.qrc">
+   <iconset resource="../../DyssolGUI/Resources.qrc">
     <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -36,7 +36,7 @@
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>
-  <include location="../../DyssolMainWindow/Resources.qrc"/>
+  <include location="../../DyssolGUI/Resources.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/GUIDialogs/MaterialsDatabaseTab/MaterialsDatabaseTab.ui b/GUIDialogs/MaterialsDatabaseTab/MaterialsDatabaseTab.ui
index 2a2b1b27..2e795756 100644
--- a/GUIDialogs/MaterialsDatabaseTab/MaterialsDatabaseTab.ui
+++ b/GUIDialogs/MaterialsDatabaseTab/MaterialsDatabaseTab.ui
@@ -17,7 +17,7 @@
       <string>Compounds editor</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QGridLayout" name="gridLayout_2">
@@ -1152,7 +1152,7 @@
     <tabstop>labelCompound1</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
\ No newline at end of file
diff --git a/GUIDialogs/MaterialsDatabaseTab/PropertyAdder.ui b/GUIDialogs/MaterialsDatabaseTab/PropertyAdder.ui
index 2576ca5d..d131dffa 100644
--- a/GUIDialogs/MaterialsDatabaseTab/PropertyAdder.ui
+++ b/GUIDialogs/MaterialsDatabaseTab/PropertyAdder.ui
@@ -14,7 +14,7 @@
    <string>Add property</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../DyssolMainWindow/Resources.qrc">
+   <iconset resource="../../DyssolGUI/Resources.qrc">
     <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -210,7 +210,7 @@
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>
-  <include location="../../DyssolMainWindow/Resources.qrc"/>
+  <include location="../../DyssolGUI/Resources.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/GUIDialogs/MaterialsDatabaseTab/PropertyEditor.ui b/GUIDialogs/MaterialsDatabaseTab/PropertyEditor.ui
index b7538bc7..32383902 100644
--- a/GUIDialogs/MaterialsDatabaseTab/PropertyEditor.ui
+++ b/GUIDialogs/MaterialsDatabaseTab/PropertyEditor.ui
@@ -14,7 +14,7 @@
       <string>Dependent property editor</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QGridLayout" name="gridLayout_2" rowstretch="1,0,1,0" columnstretch="1,0">
@@ -395,7 +395,7 @@
     <tabstop>lineCalcVal</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
\ No newline at end of file
diff --git a/GUIDialogs/ModulesManagerTab/ModulesManagerTab.ui b/GUIDialogs/ModulesManagerTab/ModulesManagerTab.ui
index 3238da37..1a289e00 100644
--- a/GUIDialogs/ModulesManagerTab/ModulesManagerTab.ui
+++ b/GUIDialogs/ModulesManagerTab/ModulesManagerTab.ui
@@ -14,7 +14,7 @@
       <string>Models manager</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QVBoxLayout" name="verticalLayout_3" stretch="1,3">
@@ -178,7 +178,7 @@
     <tabstop>tableModels</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
\ No newline at end of file
diff --git a/GUIDialogs/OptionsEditor/OptionsEditor.ui b/GUIDialogs/OptionsEditor/OptionsEditor.ui
index 3f43764b..b63e1bdb 100644
--- a/GUIDialogs/OptionsEditor/OptionsEditor.ui
+++ b/GUIDialogs/OptionsEditor/OptionsEditor.ui
@@ -32,7 +32,7 @@
       <string>Options</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <property name="sizeGripEnabled">
@@ -1162,7 +1162,7 @@
     <tabstop>checkBoxSplitFile</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections>
     <connection>
diff --git a/GUIDialogs/PhasesEditor/PhasesEditor.ui b/GUIDialogs/PhasesEditor/PhasesEditor.ui
index e66e8d1c..fbbb7076 100644
--- a/GUIDialogs/PhasesEditor/PhasesEditor.ui
+++ b/GUIDialogs/PhasesEditor/PhasesEditor.ui
@@ -14,7 +14,7 @@
       <string>Phases editor</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QGridLayout" name="gridLayout">
@@ -118,7 +118,7 @@
     <tabstop>pushButtonCancel</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
\ No newline at end of file
diff --git a/GUIDialogs/SettingsEditor/SettingsEditor.ui b/GUIDialogs/SettingsEditor/SettingsEditor.ui
index e67acd1d..c34fed1a 100644
--- a/GUIDialogs/SettingsEditor/SettingsEditor.ui
+++ b/GUIDialogs/SettingsEditor/SettingsEditor.ui
@@ -14,7 +14,7 @@
       <string>Settings</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -201,8 +201,8 @@
   </widget>
   <layoutdefault spacing="6" margin="11" />
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
\ No newline at end of file
diff --git a/GUIDialogs/SimulatorTab/SimulatorTab.ui b/GUIDialogs/SimulatorTab/SimulatorTab.ui
index fcce8474..5cd4bd16 100644
--- a/GUIDialogs/SimulatorTab/SimulatorTab.ui
+++ b/GUIDialogs/SimulatorTab/SimulatorTab.ui
@@ -14,7 +14,7 @@
       <string>CSimulatorTab</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QVBoxLayout" name="verticalLayout">
@@ -285,7 +285,7 @@
     </customwidget>
   </customwidgets>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
\ No newline at end of file
diff --git a/GUIDialogs/StreamsViewer/StreamsViewer.ui b/GUIDialogs/StreamsViewer/StreamsViewer.ui
index ed6df086..5912e93d 100644
--- a/GUIDialogs/StreamsViewer/StreamsViewer.ui
+++ b/GUIDialogs/StreamsViewer/StreamsViewer.ui
@@ -14,7 +14,7 @@
       <string>Streams properties viewer</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QHBoxLayout" name="horizontalLayout">
@@ -65,7 +65,7 @@
   </widget>
   <layoutdefault spacing="6" margin="11" />
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
\ No newline at end of file
diff --git a/GUIDialogs/TearStreamsEditor/TearStreamsEditor.ui b/GUIDialogs/TearStreamsEditor/TearStreamsEditor.ui
index bc6b6b0a..a922dbc6 100644
--- a/GUIDialogs/TearStreamsEditor/TearStreamsEditor.ui
+++ b/GUIDialogs/TearStreamsEditor/TearStreamsEditor.ui
@@ -14,7 +14,7 @@
       <string>Initial values of tear streams</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QVBoxLayout" name="verticalLayout_3" stretch="0,1,3">
@@ -195,7 +195,7 @@
     </customwidget>
   </customwidgets>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
\ No newline at end of file
diff --git a/GUIDialogs/UnitsViewer/PlotsViewer.ui b/GUIDialogs/UnitsViewer/PlotsViewer.ui
index e4ed281d..edcadbce 100644
--- a/GUIDialogs/UnitsViewer/PlotsViewer.ui
+++ b/GUIDialogs/UnitsViewer/PlotsViewer.ui
@@ -14,7 +14,7 @@
    <string>CPlotsViewer</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../DyssolMainWindow/Resources.qrc">
+   <iconset resource="../../DyssolGUI/Resources.qrc">
     <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -91,7 +91,7 @@
   <tabstop>tabWidget</tabstop>
  </tabstops>
  <resources>
-  <include location="../../DyssolMainWindow/Resources.qrc" />
+  <include location="../../DyssolGUI/Resources.qrc" />
  </resources>
  <connections />
 </ui>
diff --git a/GUIDialogs/UnitsViewer/UnitsViewer.ui b/GUIDialogs/UnitsViewer/UnitsViewer.ui
index 07dc4643..bc70cff7 100644
--- a/GUIDialogs/UnitsViewer/UnitsViewer.ui
+++ b/GUIDialogs/UnitsViewer/UnitsViewer.ui
@@ -14,7 +14,7 @@
       <string>Units properties viewer</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QHBoxLayout" name="horizontalLayout">
@@ -218,7 +218,7 @@
   </widget>
   <layoutdefault spacing="6" margin="11" />
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
\ No newline at end of file
diff --git a/GUIWidgets/BasicStreamEditor/BasicStreamEditor.ui b/GUIWidgets/BasicStreamEditor/BasicStreamEditor.ui
index 5145cdd9..795ad53c 100644
--- a/GUIWidgets/BasicStreamEditor/BasicStreamEditor.ui
+++ b/GUIWidgets/BasicStreamEditor/BasicStreamEditor.ui
@@ -179,7 +179,7 @@
     <tabstop>mainTabWidget</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
\ No newline at end of file
diff --git a/GUIWidgets/BasicStreamEditor/Functional.ui b/GUIWidgets/BasicStreamEditor/Functional.ui
index 8ab62d40..8636562c 100644
--- a/GUIWidgets/BasicStreamEditor/Functional.ui
+++ b/GUIWidgets/BasicStreamEditor/Functional.ui
@@ -20,7 +20,7 @@
       <string>Distribution</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QVBoxLayout" name="verticalLayout">
@@ -156,7 +156,7 @@
     <tabstop>pushButtonCancel</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
\ No newline at end of file
diff --git a/GUIWidgets/BasicStreamEditor/SolidDistributionsEditor.ui b/GUIWidgets/BasicStreamEditor/SolidDistributionsEditor.ui
index 05eb271f..021e51c0 100644
--- a/GUIWidgets/BasicStreamEditor/SolidDistributionsEditor.ui
+++ b/GUIWidgets/BasicStreamEditor/SolidDistributionsEditor.ui
@@ -14,7 +14,7 @@
       <string>Form</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QVBoxLayout" name="verticalLayout_4">
@@ -476,7 +476,7 @@
     <tabstop>pushButtonApply</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
\ No newline at end of file
diff --git a/GUIWidgets/BasicStreamsViewer/BasicStreamsViewer.ui b/GUIWidgets/BasicStreamsViewer/BasicStreamsViewer.ui
index c59275e7..a0857396 100644
--- a/GUIWidgets/BasicStreamsViewer/BasicStreamsViewer.ui
+++ b/GUIWidgets/BasicStreamsViewer/BasicStreamsViewer.ui
@@ -14,7 +14,7 @@
       <string>CBasicStreamsViewer</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QVBoxLayout" name="verticalLayout">
@@ -410,7 +410,7 @@
     <tabstop>tabWidget</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
\ No newline at end of file
diff --git a/GUIWidgets/QtPlot/GridLimitsDialog.ui b/GUIWidgets/QtPlot/GridLimitsDialog.ui
index 0d1a8e60..78ecc58e 100644
--- a/GUIWidgets/QtPlot/GridLimitsDialog.ui
+++ b/GUIWidgets/QtPlot/GridLimitsDialog.ui
@@ -17,7 +17,7 @@
    <string>Grid limits</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../DyssolMainWindow/Resources.qrc">
+   <iconset resource="../../DyssolGUI/Resources.qrc">
     <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
@@ -208,7 +208,7 @@
   <tabstop>buttonApply</tabstop>
  </tabstops>
  <resources>
-  <include location="../../DyssolMainWindow/Resources.qrc"/>
+  <include location="../../DyssolGUI/Resources.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/GUIWidgets/StatusWindow/StatusWindow.ui b/GUIWidgets/StatusWindow/StatusWindow.ui
index 14ab6148..5bf0397e 100644
--- a/GUIWidgets/StatusWindow/StatusWindow.ui
+++ b/GUIWidgets/StatusWindow/StatusWindow.ui
@@ -38,7 +38,7 @@
    <string>Status</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../DyssolMainWindow/Resources.qrc">
+   <iconset resource="../../DyssolGUI/Resources.qrc">
     <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
   </property>
   <property name="autoFillBackground">
@@ -125,7 +125,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../DyssolMainWindow/Resources.qrc"/>
+  <include location="../../DyssolGUI/Resources.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/README.md b/README.md
index cb533992..1af26d12 100644
--- a/README.md
+++ b/README.md
@@ -103,9 +103,9 @@ The compiled executable file and all the units' libraries will appear in `/path_
 - BaseSolvers - interfaces for equation solvers
 - CahceHandlers - dynamic data caching
 - Documentation - manuals
-- DyssolConsole - main project for command-line version of Dyssol
+- DyssolCLI - main project for command-line version of Dyssol
+- DyssolGUI - main project for GUI version of Dyssol
 - DyssolInstallers - scripts and data needed to build installers for Windows
-- DyssolMainWindow - main project for GUI version of Dyssol
 - EquationSolvers - built-in equation solvers based on SUNDIALS library
 - ExternalLibraries - all third-party libraries and scripts to build them
 - GUIDialogs - main GUI components
diff --git a/scripts/copy_to_home.sh b/scripts/copy_to_home.sh
index 86746077..92bb91d5 100644
--- a/scripts/copy_to_home.sh
+++ b/scripts/copy_to_home.sh
@@ -9,4 +9,4 @@ SCRIPT=$(readlink -f "$0")
 # Absolute path this script is in, thus /home/user/bin
 SCRIPTPATH=$(dirname "$SCRIPT")
 # Run copy
-rsync -av --exclude=.git --exclude=.vs --exclude=build --exclude=Documentation/sources --exclude=DyssolConsole/cache --exclude=DyssolInstallers/Compiler --exclude=DyssolInstallers/Installers --exclude=ExternalLibraries --exclude=install --exclude=Win32 --exclude=x64 ${SCRIPTPATH}/../ ~/dyssol/
\ No newline at end of file
+rsync -av --exclude=.git --exclude=.vs --exclude=build --exclude=Documentation/sources --exclude=DyssolCLI/cache --exclude=DyssolInstallers/Compiler --exclude=DyssolInstallers/Installers --exclude=ExternalLibraries --exclude=install --exclude=Win32 --exclude=x64 ${SCRIPTPATH}/../ ~/dyssol/
\ No newline at end of file