diff --git a/mathmech/CMakeLists.txt b/mathmech/CMakeLists.txt
new file mode 100644
index 0000000..5c399bc
--- /dev/null
+++ b/mathmech/CMakeLists.txt
@@ -0,0 +1,32 @@
+cmake_minimum_required (VERSION 2.8)
+
+cmake_policy(SET CMP0003 OLD)
+cmake_policy(SET CMP0011 NEW)
+cmake_policy(SET CMP0015 NEW)
+
+# set project name
+set (PROJECT mathmech)
+# set additional cmake file
+include (${PROJECT}.cmake)
+
+
+# additional options
+OPTION (WITH_DEBUG_MODE "Build with debug mode" OFF)
+OPTION (ADD_INCLUDE "Add include files" OFF)
+
+# set libraries
+set (LIBRARIES)
+  foreach (LIBRARY ${LIBRARIES})
+    find_library ("${LIBRARY}_FOUND" ${LIBRARY})
+      message (STATUS "Check the ${LIBRARY} is installed: " ${${LIBRARY}_FOUND})
+      if ("${${LIBRARY}_FOUND}" STREQUAL "${LIBRARY}_FOUND-NOTFOUND")
+        message (STATUS "Adding library sources")
+        add_subdirectory (../${LIBRARY} lib/${LIBRARY})
+      endif ()
+  endforeach ()
+
+# additional targets
+set (TARGETS "")
+set (HEADERS "")
+
+add_subdirectory (${${PROJECT}_SOURCE_DIR})
\ No newline at end of file
diff --git a/mathmech/build/CMakeLists.txt b/mathmech/build/CMakeLists.txt
deleted file mode 100644
index 4048a29..0000000
--- a/mathmech/build/CMakeLists.txt
+++ /dev/null
@@ -1,121 +0,0 @@
-cmake_minimum_required (VERSION 2.6)
-
-set (PROJECT mathmech)
-
-# additional options
-OPTION (WITH_DEBUG_MODE "Build with debug mode" OFF)
-OPTION (ADD_INCLUDE "Add include files" OFF)
-
-# executable path
-set (EXECUTABLE_OUTPUT_PATH ${${PROJECT}_BINARY_DIR})
-
-# verbose
-set (CMAKE_VERBOSE_MAKEFILE ON)
-
-# flags
-if ( WITH_DEBUG_MODE )
-  add_definitions ( -DDEBUG_MODE=1 )
-endif ()
-if ( CMAKE_COMPILER_IS_GNUCXX )
-  set (ADD_CXX_FLAGS  "-Wall")
-  set (CMAKE_CXX_FLAGS "-O0 ${ADD_CXX_FLAGS}")
-  set (CMAKE_CXX_FLAGS_DEBUG "-g -O0")
-  set (CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
-elseif ( MSVC )
-  set (ADD_CXX_FLAGS  "/W4")
-  set (CMAKE_CXX_FLAGS "${ADD_CXX_FLAGS}")
-else ()
-  message ("Unknown compiler")
-endif ()
-
-# set directories
-set (${PROJECT}_BINARY_DIR ../bin)
-set (${PROJECT}_RESOURCE_DIR ../resources)
-set (${PROJECT}_TRANSLATION_DIR ${${PROJECT}_RESOURCE_DIR}/translations)
-
-# set files
-set (HEADERS 
-     ../aboutwindow.h
-     ../aglallwindow.h
-     ../agglwindow.h
-     ../atomtypeswindow.h
-     ../clear_items.h
-     ../errorwindow.h
-     ../mainwindow.h
-     ../settingswindow.h
-     ../start_events.h
-     ../statgengraphwindow.h
-     ../update_fields.h)
-set (SOURCES 
-     ../aboutwindow.cpp
-     ../aglallwindow.cpp
-     ../agglwindow.cpp
-     ../atomtypeswindow.cpp
-     ../clear_items.cpp
-     ../errorwindow.cpp
-     ../main.cpp
-     ../mainwindow.cpp
-     ../settingswindow.cpp
-     ../start_events.cpp
-     ../statgengraphwindow.cpp
-     ../update_fields.cpp)
-set (FORMS
-     ../aboutwindow.ui
-     ../agglwindow.ui
-     ../aglallwindow.ui
-     ../atomtypeswindow.ui
-     ../errorwindow.ui
-     ../mainwindow.ui
-     ../settingswindow.ui
-     ../statgengraphwindow.ui)
-# set library
-if (CMAKE_COMPILER_IS_GNUCXX)
-  set (LIBRARIES m)
-else ()
-  set (LIBRARIES)
-endif()
-set (LANGUAGES
-     eng
-     rus)
-set (RESOURCES
-     ${${PROJECT}_RESOURCE_DIR}/resources.qrc)
-
-
-# compile
-project (${PROJECT})
-include_directories (../
-                     ${CMAKE_CURRENT_BINARY_DIR})
-
-find_package (Qt4 REQUIRED)
-include (${QT_USE_FILE})
-qt4_add_resources (QRC_SOURCES ${RESOURCES})
-qt4_wrap_cpp (MOC_SOURCES ${HEADERS})
-qt4_wrap_ui (UI_HEADERS ${FORMS})
-foreach (LANGUAGE ${LANGUAGES})
-    set (TS ${${PROJECT}_TRANSLATION_DIR}/${LANGUAGE}.ts)
-    set (QM ${${PROJECT}_TRANSLATION_DIR}/${LANGUAGE}.qm)
-    set (TRANSLATIONS ${TRANSLATIONS} ${TS})
-    set (TRANSLATIONS_BINARY ${TRANSLATIONS_BINARY} ${QM})
-    add_custom_command (
-        OUTPUT ${QM}
-        COMMAND ${QT_LRELEASE_EXECUTABLE} ${TS}
-        MAIN_DEPENDENCY ${TS})
-endforeach()
-add_custom_target (
-    translations 
-    COMMAND ${QT_LUPDATE_EXECUTABLE} ${HEADERS} ${SOURCES} -ts ${TRANSLATIONS})
-add_custom_command (
-    TARGET translations
-    COMMAND ${QT_LRELEASE_EXECUTABLE} ${TRANSLATIONS})
-
-source_group ("Header Files" FILES ${HEADERS})
-source_group ("Source Files" FILES ${SOURCES})
-source_group ("Generated Files" FILES ${MOC_SOURCES})
-source_group ("Resource Files" FILES ${QRC_SOURCES})
-
-add_executable (${PROJECT} WIN32 ${UI_HEADERS} ${HEADERS} ${SOURCES} ${MOC_SOURCES} ${QRC_SOURCES} ${TRANSLATIONS})
-
-target_link_libraries (${PROJECT} ${LIBRARIES} ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY})
-
-# install properties
-INSTALL (TARGETS ${PROJECT} DESTINATION bin)
diff --git a/mathmech/mathmech.cmake b/mathmech/mathmech.cmake
new file mode 100644
index 0000000..dd834b0
--- /dev/null
+++ b/mathmech/mathmech.cmake
@@ -0,0 +1,31 @@
+# set directories
+set (${PROJECT}_BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bin)
+set (${PROJECT}_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
+set (${PROJECT}_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
+set (${PROJECT}_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib)
+set (${PROJECT}_RESOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/resources)
+set (${PROJECT}_TRANSLATION_DIR ${${PROJECT}_RESOURCE_DIR}/translations)
+
+# library path
+link_directories (${${PROJECT}_LIB_DIR})
+# executable path
+set (EXECUTABLE_OUTPUT_PATH ${${PROJECT}_BINARY_DIR})
+
+# verbose
+set (CMAKE_VERBOSE_MAKEFILE ON)
+
+# flags
+if ( WITH_DEBUG_MODE )
+  add_definitions ( -DDEBUG_MODE=1 )
+endif ()
+if ( CMAKE_COMPILER_IS_GNUCXX )
+  set (ADD_CXX_FLAGS  "-Wall")
+  set (CMAKE_CXX_FLAGS "-O0 ${ADD_CXX_FLAGS}")
+  set (CMAKE_CXX_FLAGS_DEBUG "-g -O0")
+  set (CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
+elseif ( MSVC )
+  set (ADD_CXX_FLAGS  "/W4")
+  set (CMAKE_CXX_FLAGS "${ADD_CXX_FLAGS}")
+else ()
+  message ("Unknown compiler")
+endif ()
\ No newline at end of file
diff --git a/mathmech/resources/translations/eng.qm b/mathmech/resources/translations/eng.qm
deleted file mode 100644
index be651ee..0000000
--- a/mathmech/resources/translations/eng.qm
+++ /dev/null
@@ -1 +0,0 @@
-<�d��!�`���
\ No newline at end of file
diff --git a/mathmech/resources/translations/eng.ts b/mathmech/resources/translations/eng.ts
index 33b7b2a..96aa14b 100644
--- a/mathmech/resources/translations/eng.ts
+++ b/mathmech/resources/translations/eng.ts
@@ -4,22 +4,22 @@
 <context>
     <name>AgglWindow</name>
     <message>
-        <location filename="../../agglwindow.cpp" line="37"/>
+        <location filename="../../src/agglwindow.cpp" line="37"/>
         <source>Select file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../agglwindow.cpp" line="39"/>
+        <location filename="../../src/agglwindow.cpp" line="39"/>
         <source>&apos;statgen&apos; output files (*.dat);;All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../agglwindow.cpp" line="137"/>
+        <location filename="../../src/agglwindow.cpp" line="137"/>
         <source>Save file as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../agglwindow.cpp" line="139"/>
+        <location filename="../../src/agglwindow.cpp" line="139"/>
         <source>Agglomerate files (*.agl);;All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27,13 +27,13 @@
 <context>
     <name>AglAll</name>
     <message>
-        <location filename="../../aglallwindow.cpp" line="82"/>
-        <location filename="../../aglallwindow.cpp" line="83"/>
+        <location filename="../../src/aglallwindow.cpp" line="82"/>
+        <location filename="../../src/aglallwindow.cpp" line="83"/>
         <source>Processing &apos;agl&apos;...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../aglallwindow.cpp" line="207"/>
+        <location filename="../../src/aglallwindow.cpp" line="207"/>
         <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
@@ -41,27 +41,27 @@
 <context>
     <name>AglAllWindow</name>
     <message>
-        <location filename="../../aglallwindow.cpp" line="44"/>
+        <location filename="../../src/aglallwindow.cpp" line="44"/>
         <source>Select work directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../aglallwindow.cpp" line="54"/>
+        <location filename="../../src/aglallwindow.cpp" line="54"/>
         <source>Select trajectory file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../aglallwindow.cpp" line="56"/>
+        <location filename="../../src/aglallwindow.cpp" line="56"/>
         <source>&apos;statgen&apos; output files (*.dat);;All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../aglallwindow.cpp" line="65"/>
+        <location filename="../../src/aglallwindow.cpp" line="65"/>
         <source>Save file as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../aglallwindow.cpp" line="67"/>
+        <location filename="../../src/aglallwindow.cpp" line="67"/>
         <source>PDB files (*.pdb);;All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -69,19 +69,19 @@
 <context>
     <name>AtomTypesWindow</name>
     <message>
-        <location filename="../../atomtypeswindow.cpp" line="87"/>
-        <location filename="../../atomtypeswindow.cpp" line="100"/>
-        <location filename="../../atomtypeswindow.cpp" line="103"/>
+        <location filename="../../src/atomtypeswindow.cpp" line="87"/>
+        <location filename="../../src/atomtypeswindow.cpp" line="100"/>
+        <location filename="../../src/atomtypeswindow.cpp" line="103"/>
         <source>Add new molecule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../atomtypeswindow.cpp" line="42"/>
+        <location filename="../../src/atomtypeswindow.cpp" line="42"/>
         <source>Save file as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../atomtypeswindow.cpp" line="44"/>
+        <location filename="../../src/atomtypeswindow.cpp" line="44"/>
         <source>Atom types files (*.types);;All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -89,72 +89,72 @@
 <context>
     <name>ErrorWindow</name>
     <message>
-        <location filename="../../errorwindow.cpp" line="22"/>
+        <location filename="../../src/errorwindow.cpp" line="22"/>
         <source>Work directory does not exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="25"/>
+        <location filename="../../src/errorwindow.cpp" line="25"/>
         <source>Input file is not set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="28"/>
+        <location filename="../../src/errorwindow.cpp" line="28"/>
         <source>Atoms in plane must be different</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="31"/>
+        <location filename="../../src/errorwindow.cpp" line="31"/>
         <source>Atom types file is not set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="34"/>
+        <location filename="../../src/errorwindow.cpp" line="34"/>
         <source>Output file is not set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="37"/>
+        <location filename="../../src/errorwindow.cpp" line="37"/>
         <source>Atom type must contain 2 characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="40"/>
+        <location filename="../../src/errorwindow.cpp" line="40"/>
         <source>Log file is not set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="43"/>
+        <location filename="../../src/errorwindow.cpp" line="43"/>
         <source>Component is not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="46"/>
+        <location filename="../../src/errorwindow.cpp" line="46"/>
         <source>Atom types is not set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="49"/>
+        <location filename="../../src/errorwindow.cpp" line="49"/>
         <source>Something wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="52"/>
+        <location filename="../../src/errorwindow.cpp" line="52"/>
         <source>Interactions are not set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="55"/>
+        <location filename="../../src/errorwindow.cpp" line="55"/>
         <source>Invalid file type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="58"/>
+        <location filename="../../src/errorwindow.cpp" line="58"/>
         <source>Interaction step is not set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="61"/>
+        <location filename="../../src/errorwindow.cpp" line="61"/>
         <source>Unknown error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -162,159 +162,159 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../../mainwindow.cpp" line="26"/>
+        <location filename="../../src/mainwindow.cpp" line="26"/>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="236"/>
-        <location filename="../../mainwindow.cpp" line="290"/>
-        <location filename="../../mainwindow.cpp" line="333"/>
-        <location filename="../../mainwindow.cpp" line="376"/>
-        <location filename="../../mainwindow.cpp" line="419"/>
+        <location filename="../../src/mainwindow.cpp" line="236"/>
+        <location filename="../../src/mainwindow.cpp" line="290"/>
+        <location filename="../../src/mainwindow.cpp" line="333"/>
+        <location filename="../../src/mainwindow.cpp" line="376"/>
+        <location filename="../../src/mainwindow.cpp" line="419"/>
         <source>Select work directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="246"/>
-        <location filename="../../mainwindow.cpp" line="343"/>
-        <location filename="../../mainwindow.cpp" line="429"/>
+        <location filename="../../src/mainwindow.cpp" line="246"/>
+        <location filename="../../src/mainwindow.cpp" line="343"/>
+        <location filename="../../src/mainwindow.cpp" line="429"/>
         <source>Select trajectory file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="248"/>
+        <location filename="../../src/mainwindow.cpp" line="248"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="257"/>
+        <location filename="../../src/mainwindow.cpp" line="257"/>
         <source>Select atom types file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="259"/>
+        <location filename="../../src/mainwindow.cpp" line="259"/>
         <source>Atom types files (*.types);;All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="268"/>
+        <location filename="../../src/mainwindow.cpp" line="268"/>
         <source>Save files as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="270"/>
+        <location filename="../../src/mainwindow.cpp" line="270"/>
         <source>Mask of trajectory files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="279"/>
-        <location filename="../../mainwindow.cpp" line="322"/>
-        <location filename="../../mainwindow.cpp" line="365"/>
-        <location filename="../../mainwindow.cpp" line="408"/>
-        <location filename="../../mainwindow.cpp" line="462"/>
+        <location filename="../../src/mainwindow.cpp" line="279"/>
+        <location filename="../../src/mainwindow.cpp" line="322"/>
+        <location filename="../../src/mainwindow.cpp" line="365"/>
+        <location filename="../../src/mainwindow.cpp" line="408"/>
+        <location filename="../../src/mainwindow.cpp" line="462"/>
         <source>Save log file as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="281"/>
-        <location filename="../../mainwindow.cpp" line="324"/>
-        <location filename="../../mainwindow.cpp" line="367"/>
-        <location filename="../../mainwindow.cpp" line="410"/>
-        <location filename="../../mainwindow.cpp" line="464"/>
+        <location filename="../../src/mainwindow.cpp" line="281"/>
+        <location filename="../../src/mainwindow.cpp" line="324"/>
+        <location filename="../../src/mainwindow.cpp" line="367"/>
+        <location filename="../../src/mainwindow.cpp" line="410"/>
+        <location filename="../../src/mainwindow.cpp" line="464"/>
         <source>Log files (*.log)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="300"/>
-        <location filename="../../mainwindow.cpp" line="386"/>
+        <location filename="../../src/mainwindow.cpp" line="300"/>
+        <location filename="../../src/mainwindow.cpp" line="386"/>
         <source>Select trajectory files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="302"/>
-        <location filename="../../mainwindow.cpp" line="345"/>
-        <location filename="../../mainwindow.cpp" line="388"/>
-        <location filename="../../mainwindow.cpp" line="431"/>
+        <location filename="../../src/mainwindow.cpp" line="302"/>
+        <location filename="../../src/mainwindow.cpp" line="345"/>
+        <location filename="../../src/mainwindow.cpp" line="388"/>
+        <location filename="../../src/mainwindow.cpp" line="431"/>
         <source>Trajectory files (*.*[0-9])</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="311"/>
-        <location filename="../../mainwindow.cpp" line="397"/>
+        <location filename="../../src/mainwindow.cpp" line="311"/>
+        <location filename="../../src/mainwindow.cpp" line="397"/>
         <source>Save output file as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="313"/>
-        <location filename="../../mainwindow.cpp" line="399"/>
+        <location filename="../../src/mainwindow.cpp" line="313"/>
+        <location filename="../../src/mainwindow.cpp" line="399"/>
         <source>Output files (*.dat)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="354"/>
-        <location filename="../../mainwindow.cpp" line="451"/>
+        <location filename="../../src/mainwindow.cpp" line="354"/>
+        <location filename="../../src/mainwindow.cpp" line="451"/>
         <source>Save PDB file as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="356"/>
-        <location filename="../../mainwindow.cpp" line="453"/>
+        <location filename="../../src/mainwindow.cpp" line="356"/>
+        <location filename="../../src/mainwindow.cpp" line="453"/>
         <source>PDB files (*.pdb)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="440"/>
+        <location filename="../../src/mainwindow.cpp" line="440"/>
         <source>Select agglomerate file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="442"/>
+        <location filename="../../src/mainwindow.cpp" line="442"/>
         <source>Agglomerate files (*.agl);;All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="611"/>
-        <location filename="../../mainwindow.cpp" line="612"/>
+        <location filename="../../src/mainwindow.cpp" line="611"/>
+        <location filename="../../src/mainwindow.cpp" line="612"/>
         <source>Processing &apos;trj&apos;...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="622"/>
-        <location filename="../../mainwindow.cpp" line="703"/>
-        <location filename="../../mainwindow.cpp" line="751"/>
-        <location filename="../../mainwindow.cpp" line="821"/>
-        <location filename="../../mainwindow.cpp" line="889"/>
+        <location filename="../../src/mainwindow.cpp" line="622"/>
+        <location filename="../../src/mainwindow.cpp" line="703"/>
+        <location filename="../../src/mainwindow.cpp" line="751"/>
+        <location filename="../../src/mainwindow.cpp" line="821"/>
+        <location filename="../../src/mainwindow.cpp" line="889"/>
         <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="675"/>
-        <location filename="../../mainwindow.cpp" line="676"/>
+        <location filename="../../src/mainwindow.cpp" line="675"/>
+        <location filename="../../src/mainwindow.cpp" line="676"/>
         <source>Processing &apos;statgen&apos;...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="741"/>
-        <location filename="../../mainwindow.cpp" line="742"/>
+        <location filename="../../src/mainwindow.cpp" line="741"/>
+        <location filename="../../src/mainwindow.cpp" line="742"/>
         <source>Processing &apos;envir&apos;...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="807"/>
-        <location filename="../../mainwindow.cpp" line="808"/>
+        <location filename="../../src/mainwindow.cpp" line="807"/>
+        <location filename="../../src/mainwindow.cpp" line="808"/>
         <source>Processing &apos;radf&apos;...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="864"/>
-        <location filename="../../mainwindow.cpp" line="865"/>
+        <location filename="../../src/mainwindow.cpp" line="864"/>
+        <location filename="../../src/mainwindow.cpp" line="865"/>
         <source>Processing &apos;agl&apos;...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="869"/>
-        <location filename="../../mainwindow.cpp" line="870"/>
+        <location filename="../../src/mainwindow.cpp" line="869"/>
+        <location filename="../../src/mainwindow.cpp" line="870"/>
         <source>Processing &apos;trj2pdb&apos;...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -322,22 +322,22 @@
 <context>
     <name>SettingsWindow</name>
     <message>
-        <location filename="../../settingswindow.cpp" line="185"/>
-        <location filename="../../settingswindow.cpp" line="196"/>
-        <location filename="../../settingswindow.cpp" line="207"/>
-        <location filename="../../settingswindow.cpp" line="218"/>
-        <location filename="../../settingswindow.cpp" line="229"/>
-        <location filename="../../settingswindow.cpp" line="240"/>
+        <location filename="../../src/settingswindow.cpp" line="185"/>
+        <location filename="../../src/settingswindow.cpp" line="196"/>
+        <location filename="../../src/settingswindow.cpp" line="207"/>
+        <location filename="../../src/settingswindow.cpp" line="218"/>
+        <location filename="../../src/settingswindow.cpp" line="229"/>
+        <location filename="../../src/settingswindow.cpp" line="240"/>
         <source>Select component</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../settingswindow.cpp" line="187"/>
-        <location filename="../../settingswindow.cpp" line="198"/>
-        <location filename="../../settingswindow.cpp" line="209"/>
-        <location filename="../../settingswindow.cpp" line="220"/>
-        <location filename="../../settingswindow.cpp" line="231"/>
-        <location filename="../../settingswindow.cpp" line="242"/>
+        <location filename="../../src/settingswindow.cpp" line="187"/>
+        <location filename="../../src/settingswindow.cpp" line="198"/>
+        <location filename="../../src/settingswindow.cpp" line="209"/>
+        <location filename="../../src/settingswindow.cpp" line="220"/>
+        <location filename="../../src/settingswindow.cpp" line="231"/>
+        <location filename="../../src/settingswindow.cpp" line="242"/>
         <source>All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -345,32 +345,32 @@
 <context>
     <name>StatgenGraphWindow</name>
     <message>
-        <location filename="../../statgengraphwindow.cpp" line="54"/>
+        <location filename="../../src/statgengraphwindow.cpp" line="54"/>
         <source>N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../statgengraphwindow.cpp" line="55"/>
+        <location filename="../../src/statgengraphwindow.cpp" line="55"/>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../statgengraphwindow.cpp" line="72"/>
+        <location filename="../../src/statgengraphwindow.cpp" line="72"/>
         <source>r</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../statgengraphwindow.cpp" line="73"/>
+        <location filename="../../src/statgengraphwindow.cpp" line="73"/>
         <source>g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../statgengraphwindow.cpp" line="147"/>
+        <location filename="../../src/statgengraphwindow.cpp" line="147"/>
         <source>Save image as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../statgengraphwindow.cpp" line="149"/>
+        <location filename="../../src/statgengraphwindow.cpp" line="149"/>
         <source>JPEG file (*.jpeg);;Portable Network Graphics file (*.png);;Bitmap file (*.bmp)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/mathmech/resources/translations/rus.qm b/mathmech/resources/translations/rus.qm
deleted file mode 100644
index be651ee..0000000
--- a/mathmech/resources/translations/rus.qm
+++ /dev/null
@@ -1 +0,0 @@
-<�d��!�`���
\ No newline at end of file
diff --git a/mathmech/resources/translations/rus.ts b/mathmech/resources/translations/rus.ts
index 33b7b2a..e88b4b6 100644
--- a/mathmech/resources/translations/rus.ts
+++ b/mathmech/resources/translations/rus.ts
@@ -1,378 +1,378 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.0" language="ru_RU">
 <context>
     <name>AgglWindow</name>
     <message>
-        <location filename="../../agglwindow.cpp" line="37"/>
+        <location filename="../../src/agglwindow.cpp" line="37"/>
         <source>Select file</source>
-        <translation type="unfinished"></translation>
+        <translation>Выбор файла</translation>
     </message>
     <message>
-        <location filename="../../agglwindow.cpp" line="39"/>
+        <location filename="../../src/agglwindow.cpp" line="39"/>
         <source>&apos;statgen&apos; output files (*.dat);;All files (*.*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Файлы &apos;statgen&apos; (*.dat);;Все файлы (*.*)</translation>
     </message>
     <message>
-        <location filename="../../agglwindow.cpp" line="137"/>
+        <location filename="../../src/agglwindow.cpp" line="137"/>
         <source>Save file as...</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить файл как...</translation>
     </message>
     <message>
-        <location filename="../../agglwindow.cpp" line="139"/>
+        <location filename="../../src/agglwindow.cpp" line="139"/>
         <source>Agglomerate files (*.agl);;All files (*.*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Файл с агломератом (*.agl);Все файлы (*.*)</translation>
     </message>
 </context>
 <context>
     <name>AglAll</name>
     <message>
-        <location filename="../../aglallwindow.cpp" line="82"/>
-        <location filename="../../aglallwindow.cpp" line="83"/>
+        <location filename="../../src/aglallwindow.cpp" line="82"/>
+        <location filename="../../src/aglallwindow.cpp" line="83"/>
         <source>Processing &apos;agl&apos;...</source>
-        <translation type="unfinished"></translation>
+        <translation>Выполняется &apos;agl&apos;...</translation>
     </message>
     <message>
-        <location filename="../../aglallwindow.cpp" line="207"/>
+        <location filename="../../src/aglallwindow.cpp" line="207"/>
         <source>Done</source>
-        <translation type="unfinished"></translation>
+        <translation>Готово</translation>
     </message>
 </context>
 <context>
     <name>AglAllWindow</name>
     <message>
-        <location filename="../../aglallwindow.cpp" line="44"/>
+        <location filename="../../src/aglallwindow.cpp" line="44"/>
         <source>Select work directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Выбор рабочей директории</translation>
     </message>
     <message>
-        <location filename="../../aglallwindow.cpp" line="54"/>
+        <location filename="../../src/aglallwindow.cpp" line="54"/>
         <source>Select trajectory file</source>
-        <translation type="unfinished"></translation>
+        <translation>Выбор файла траектории</translation>
     </message>
     <message>
-        <location filename="../../aglallwindow.cpp" line="56"/>
+        <location filename="../../src/aglallwindow.cpp" line="56"/>
         <source>&apos;statgen&apos; output files (*.dat);;All files (*.*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Файлы &apos;statgen&apos; (*.dat);;Все файлы (*.*)</translation>
     </message>
     <message>
-        <location filename="../../aglallwindow.cpp" line="65"/>
+        <location filename="../../src/aglallwindow.cpp" line="65"/>
         <source>Save file as...</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить файл как...</translation>
     </message>
     <message>
-        <location filename="../../aglallwindow.cpp" line="67"/>
+        <location filename="../../src/aglallwindow.cpp" line="67"/>
         <source>PDB files (*.pdb);;All files (*.*)</source>
-        <translation type="unfinished"></translation>
+        <translation>PDB файлы (*.pdb);;Все файлы (*.*)</translation>
     </message>
 </context>
 <context>
     <name>AtomTypesWindow</name>
     <message>
-        <location filename="../../atomtypeswindow.cpp" line="87"/>
-        <location filename="../../atomtypeswindow.cpp" line="100"/>
-        <location filename="../../atomtypeswindow.cpp" line="103"/>
+        <location filename="../../src/atomtypeswindow.cpp" line="87"/>
+        <location filename="../../src/atomtypeswindow.cpp" line="100"/>
+        <location filename="../../src/atomtypeswindow.cpp" line="103"/>
         <source>Add new molecule</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавить новую молекулу</translation>
     </message>
     <message>
-        <location filename="../../atomtypeswindow.cpp" line="42"/>
+        <location filename="../../src/atomtypeswindow.cpp" line="42"/>
         <source>Save file as...</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить файл как...</translation>
     </message>
     <message>
-        <location filename="../../atomtypeswindow.cpp" line="44"/>
+        <location filename="../../src/atomtypeswindow.cpp" line="44"/>
         <source>Atom types files (*.types);;All files (*.*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Файл типов атомов (*.types);;Все файлы (*.*)</translation>
     </message>
 </context>
 <context>
     <name>ErrorWindow</name>
     <message>
-        <location filename="../../errorwindow.cpp" line="22"/>
+        <location filename="../../src/errorwindow.cpp" line="22"/>
         <source>Work directory does not exists</source>
-        <translation type="unfinished"></translation>
+        <translation>Рабочая директория не существует</translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="25"/>
+        <location filename="../../src/errorwindow.cpp" line="25"/>
         <source>Input file is not set</source>
-        <translation type="unfinished"></translation>
+        <translation>Входной файл не задан</translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="28"/>
+        <location filename="../../src/errorwindow.cpp" line="28"/>
         <source>Atoms in plane must be different</source>
-        <translation type="unfinished"></translation>
+        <translation>Атомы, образующие плоскость, должны быть различными</translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="31"/>
+        <location filename="../../src/errorwindow.cpp" line="31"/>
         <source>Atom types file is not set</source>
-        <translation type="unfinished"></translation>
+        <translation>Типы атомов не заданы</translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="34"/>
+        <location filename="../../src/errorwindow.cpp" line="34"/>
         <source>Output file is not set</source>
-        <translation type="unfinished"></translation>
+        <translation>Выходной файл не задан</translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="37"/>
+        <location filename="../../src/errorwindow.cpp" line="37"/>
         <source>Atom type must contain 2 characters</source>
-        <translation type="unfinished"></translation>
+        <translation>Тип атома должен содержать 2 символа</translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="40"/>
+        <location filename="../../src/errorwindow.cpp" line="40"/>
         <source>Log file is not set</source>
-        <translation type="unfinished"></translation>
+        <translation>Лог файл не задан</translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="43"/>
+        <location filename="../../src/errorwindow.cpp" line="43"/>
         <source>Component is not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Компонент не найден</translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="46"/>
+        <location filename="../../src/errorwindow.cpp" line="46"/>
         <source>Atom types is not set</source>
-        <translation type="unfinished"></translation>
+        <translation>Тип атома не задан</translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="49"/>
+        <location filename="../../src/errorwindow.cpp" line="49"/>
         <source>Something wrong</source>
-        <translation type="unfinished"></translation>
+        <translation>Что то не так</translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="52"/>
+        <location filename="../../src/errorwindow.cpp" line="52"/>
         <source>Interactions are not set</source>
-        <translation type="unfinished"></translation>
+        <translation>Взаимодействия не заданы</translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="55"/>
+        <location filename="../../src/errorwindow.cpp" line="55"/>
         <source>Invalid file type</source>
-        <translation type="unfinished"></translation>
+        <translation>Неправильный тип файла</translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="58"/>
+        <location filename="../../src/errorwindow.cpp" line="58"/>
         <source>Interaction step is not set</source>
-        <translation type="unfinished"></translation>
+        <translation>Шаг взаимодействия не задан</translation>
     </message>
     <message>
-        <location filename="../../errorwindow.cpp" line="61"/>
+        <location filename="../../src/errorwindow.cpp" line="61"/>
         <source>Unknown error</source>
-        <translation type="unfinished"></translation>
+        <translation>Неизвестная ошибка</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../../mainwindow.cpp" line="26"/>
+        <location filename="../../src/mainwindow.cpp" line="26"/>
         <source>Ready</source>
-        <translation type="unfinished"></translation>
+        <translation>Готов</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="236"/>
-        <location filename="../../mainwindow.cpp" line="290"/>
-        <location filename="../../mainwindow.cpp" line="333"/>
-        <location filename="../../mainwindow.cpp" line="376"/>
-        <location filename="../../mainwindow.cpp" line="419"/>
+        <location filename="../../src/mainwindow.cpp" line="236"/>
+        <location filename="../../src/mainwindow.cpp" line="290"/>
+        <location filename="../../src/mainwindow.cpp" line="333"/>
+        <location filename="../../src/mainwindow.cpp" line="376"/>
+        <location filename="../../src/mainwindow.cpp" line="419"/>
         <source>Select work directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Выбор рабочей директории</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="246"/>
-        <location filename="../../mainwindow.cpp" line="343"/>
-        <location filename="../../mainwindow.cpp" line="429"/>
+        <location filename="../../src/mainwindow.cpp" line="246"/>
+        <location filename="../../src/mainwindow.cpp" line="343"/>
+        <location filename="../../src/mainwindow.cpp" line="429"/>
         <source>Select trajectory file</source>
-        <translation type="unfinished"></translation>
+        <translation>Выбор файла траектории</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="248"/>
+        <location filename="../../src/mainwindow.cpp" line="248"/>
         <source>All files (*.*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Все файлы (*.*)</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="257"/>
+        <location filename="../../src/mainwindow.cpp" line="257"/>
         <source>Select atom types file</source>
-        <translation type="unfinished"></translation>
+        <translation>Выбор файла типов атомов</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="259"/>
+        <location filename="../../src/mainwindow.cpp" line="259"/>
         <source>Atom types files (*.types);;All files (*.*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Файл типов атомов (*.types);;Все файлы (*.*)</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="268"/>
+        <location filename="../../src/mainwindow.cpp" line="268"/>
         <source>Save files as</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить файл как...</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="270"/>
+        <location filename="../../src/mainwindow.cpp" line="270"/>
         <source>Mask of trajectory files</source>
-        <translation type="unfinished"></translation>
+        <translation>Маска файлов траектории</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="279"/>
-        <location filename="../../mainwindow.cpp" line="322"/>
-        <location filename="../../mainwindow.cpp" line="365"/>
-        <location filename="../../mainwindow.cpp" line="408"/>
-        <location filename="../../mainwindow.cpp" line="462"/>
+        <location filename="../../src/mainwindow.cpp" line="279"/>
+        <location filename="../../src/mainwindow.cpp" line="322"/>
+        <location filename="../../src/mainwindow.cpp" line="365"/>
+        <location filename="../../src/mainwindow.cpp" line="408"/>
+        <location filename="../../src/mainwindow.cpp" line="462"/>
         <source>Save log file as...</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить лог как...</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="281"/>
-        <location filename="../../mainwindow.cpp" line="324"/>
-        <location filename="../../mainwindow.cpp" line="367"/>
-        <location filename="../../mainwindow.cpp" line="410"/>
-        <location filename="../../mainwindow.cpp" line="464"/>
+        <location filename="../../src/mainwindow.cpp" line="281"/>
+        <location filename="../../src/mainwindow.cpp" line="324"/>
+        <location filename="../../src/mainwindow.cpp" line="367"/>
+        <location filename="../../src/mainwindow.cpp" line="410"/>
+        <location filename="../../src/mainwindow.cpp" line="464"/>
         <source>Log files (*.log)</source>
-        <translation type="unfinished"></translation>
+        <translation>Лог (*.log)</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="300"/>
-        <location filename="../../mainwindow.cpp" line="386"/>
+        <location filename="../../src/mainwindow.cpp" line="300"/>
+        <location filename="../../src/mainwindow.cpp" line="386"/>
         <source>Select trajectory files</source>
-        <translation type="unfinished"></translation>
+        <translation>Выбор файла траектории</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="302"/>
-        <location filename="../../mainwindow.cpp" line="345"/>
-        <location filename="../../mainwindow.cpp" line="388"/>
-        <location filename="../../mainwindow.cpp" line="431"/>
+        <location filename="../../src/mainwindow.cpp" line="302"/>
+        <location filename="../../src/mainwindow.cpp" line="345"/>
+        <location filename="../../src/mainwindow.cpp" line="388"/>
+        <location filename="../../src/mainwindow.cpp" line="431"/>
         <source>Trajectory files (*.*[0-9])</source>
-        <translation type="unfinished"></translation>
+        <translation>Файлы траектории (*.*[0-9])</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="311"/>
-        <location filename="../../mainwindow.cpp" line="397"/>
+        <location filename="../../src/mainwindow.cpp" line="311"/>
+        <location filename="../../src/mainwindow.cpp" line="397"/>
         <source>Save output file as...</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить файл как...</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="313"/>
-        <location filename="../../mainwindow.cpp" line="399"/>
+        <location filename="../../src/mainwindow.cpp" line="313"/>
+        <location filename="../../src/mainwindow.cpp" line="399"/>
         <source>Output files (*.dat)</source>
-        <translation type="unfinished"></translation>
+        <translation>Выходной файл (*.dat)</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="354"/>
-        <location filename="../../mainwindow.cpp" line="451"/>
+        <location filename="../../src/mainwindow.cpp" line="354"/>
+        <location filename="../../src/mainwindow.cpp" line="451"/>
         <source>Save PDB file as...</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить PDB как...</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="356"/>
-        <location filename="../../mainwindow.cpp" line="453"/>
+        <location filename="../../src/mainwindow.cpp" line="356"/>
+        <location filename="../../src/mainwindow.cpp" line="453"/>
         <source>PDB files (*.pdb)</source>
-        <translation type="unfinished"></translation>
+        <translation>PDB файл (*.pdb)</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="440"/>
+        <location filename="../../src/mainwindow.cpp" line="440"/>
         <source>Select agglomerate file</source>
-        <translation type="unfinished"></translation>
+        <translation>Выбор файла с агломератом</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="442"/>
+        <location filename="../../src/mainwindow.cpp" line="442"/>
         <source>Agglomerate files (*.agl);;All files (*.*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Файл с агломератом (*.agl);Все файлы (*.*)</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="611"/>
-        <location filename="../../mainwindow.cpp" line="612"/>
+        <location filename="../../src/mainwindow.cpp" line="611"/>
+        <location filename="../../src/mainwindow.cpp" line="612"/>
         <source>Processing &apos;trj&apos;...</source>
-        <translation type="unfinished"></translation>
+        <translation>Выполняется &apos;trj&apos;...</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="622"/>
-        <location filename="../../mainwindow.cpp" line="703"/>
-        <location filename="../../mainwindow.cpp" line="751"/>
-        <location filename="../../mainwindow.cpp" line="821"/>
-        <location filename="../../mainwindow.cpp" line="889"/>
+        <location filename="../../src/mainwindow.cpp" line="622"/>
+        <location filename="../../src/mainwindow.cpp" line="703"/>
+        <location filename="../../src/mainwindow.cpp" line="751"/>
+        <location filename="../../src/mainwindow.cpp" line="821"/>
+        <location filename="../../src/mainwindow.cpp" line="889"/>
         <source>Done</source>
-        <translation type="unfinished"></translation>
+        <translation>Готово</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="675"/>
-        <location filename="../../mainwindow.cpp" line="676"/>
+        <location filename="../../src/mainwindow.cpp" line="675"/>
+        <location filename="../../src/mainwindow.cpp" line="676"/>
         <source>Processing &apos;statgen&apos;...</source>
-        <translation type="unfinished"></translation>
+        <translation>Выполняется &apos;statgen&apos;...</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="741"/>
-        <location filename="../../mainwindow.cpp" line="742"/>
+        <location filename="../../src/mainwindow.cpp" line="741"/>
+        <location filename="../../src/mainwindow.cpp" line="742"/>
         <source>Processing &apos;envir&apos;...</source>
-        <translation type="unfinished"></translation>
+        <translation>Выполняется &apos;envir&apos;...</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="807"/>
-        <location filename="../../mainwindow.cpp" line="808"/>
+        <location filename="../../src/mainwindow.cpp" line="807"/>
+        <location filename="../../src/mainwindow.cpp" line="808"/>
         <source>Processing &apos;radf&apos;...</source>
-        <translation type="unfinished"></translation>
+        <translation>Выполняется &apos;radf&apos;...</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="864"/>
-        <location filename="../../mainwindow.cpp" line="865"/>
+        <location filename="../../src/mainwindow.cpp" line="864"/>
+        <location filename="../../src/mainwindow.cpp" line="865"/>
         <source>Processing &apos;agl&apos;...</source>
-        <translation type="unfinished"></translation>
+        <translation>Выполняется &apos;agl&apos;...</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="869"/>
-        <location filename="../../mainwindow.cpp" line="870"/>
+        <location filename="../../src/mainwindow.cpp" line="869"/>
+        <location filename="../../src/mainwindow.cpp" line="870"/>
         <source>Processing &apos;trj2pdb&apos;...</source>
-        <translation type="unfinished"></translation>
+        <translation>Выполняется &apos;trj2pdb&apos;...</translation>
     </message>
 </context>
 <context>
     <name>SettingsWindow</name>
     <message>
-        <location filename="../../settingswindow.cpp" line="185"/>
-        <location filename="../../settingswindow.cpp" line="196"/>
-        <location filename="../../settingswindow.cpp" line="207"/>
-        <location filename="../../settingswindow.cpp" line="218"/>
-        <location filename="../../settingswindow.cpp" line="229"/>
-        <location filename="../../settingswindow.cpp" line="240"/>
+        <location filename="../../src/settingswindow.cpp" line="185"/>
+        <location filename="../../src/settingswindow.cpp" line="196"/>
+        <location filename="../../src/settingswindow.cpp" line="207"/>
+        <location filename="../../src/settingswindow.cpp" line="218"/>
+        <location filename="../../src/settingswindow.cpp" line="229"/>
+        <location filename="../../src/settingswindow.cpp" line="240"/>
         <source>Select component</source>
-        <translation type="unfinished"></translation>
+        <translation>Выбор компонента</translation>
     </message>
     <message>
-        <location filename="../../settingswindow.cpp" line="187"/>
-        <location filename="../../settingswindow.cpp" line="198"/>
-        <location filename="../../settingswindow.cpp" line="209"/>
-        <location filename="../../settingswindow.cpp" line="220"/>
-        <location filename="../../settingswindow.cpp" line="231"/>
-        <location filename="../../settingswindow.cpp" line="242"/>
+        <location filename="../../src/settingswindow.cpp" line="187"/>
+        <location filename="../../src/settingswindow.cpp" line="198"/>
+        <location filename="../../src/settingswindow.cpp" line="209"/>
+        <location filename="../../src/settingswindow.cpp" line="220"/>
+        <location filename="../../src/settingswindow.cpp" line="231"/>
+        <location filename="../../src/settingswindow.cpp" line="242"/>
         <source>All files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Все файлы (*)</translation>
     </message>
 </context>
 <context>
     <name>StatgenGraphWindow</name>
     <message>
-        <location filename="../../statgengraphwindow.cpp" line="54"/>
+        <location filename="../../src/statgengraphwindow.cpp" line="54"/>
         <source>N</source>
-        <translation type="unfinished"></translation>
+        <translation>N</translation>
     </message>
     <message>
-        <location filename="../../statgengraphwindow.cpp" line="55"/>
+        <location filename="../../src/statgengraphwindow.cpp" line="55"/>
         <source>p</source>
-        <translation type="unfinished"></translation>
+        <translation>p</translation>
     </message>
     <message>
-        <location filename="../../statgengraphwindow.cpp" line="72"/>
+        <location filename="../../src/statgengraphwindow.cpp" line="72"/>
         <source>r</source>
-        <translation type="unfinished"></translation>
+        <translation>r</translation>
     </message>
     <message>
-        <location filename="../../statgengraphwindow.cpp" line="73"/>
+        <location filename="../../src/statgengraphwindow.cpp" line="73"/>
         <source>g</source>
-        <translation type="unfinished"></translation>
+        <translation>g</translation>
     </message>
     <message>
-        <location filename="../../statgengraphwindow.cpp" line="147"/>
+        <location filename="../../src/statgengraphwindow.cpp" line="147"/>
         <source>Save image as...</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить изображение как...</translation>
     </message>
     <message>
-        <location filename="../../statgengraphwindow.cpp" line="149"/>
+        <location filename="../../src/statgengraphwindow.cpp" line="149"/>
         <source>JPEG file (*.jpeg);;Portable Network Graphics file (*.png);;Bitmap file (*.bmp)</source>
-        <translation type="unfinished"></translation>
+        <translation>JPEG (*.jpeg);;Portable Network Graphics (*.png);;Bitmap (*.bmp)</translation>
     </message>
 </context>
 </TS>
diff --git a/mathmech/src/CMakeLists.txt b/mathmech/src/CMakeLists.txt
new file mode 100644
index 0000000..ff0b658
--- /dev/null
+++ b/mathmech/src/CMakeLists.txt
@@ -0,0 +1,67 @@
+set ("${PROJECT}_VERSION_MAJOR" 1)
+set ("${PROJECT}_VERSION_MINOR" 0)
+set ("${PROJECT}_VERSION_PATCH" 0)
+set ("${PROJECT}_VERSION" ${${PROJECT}_VERSION_MAJOR}.${${PROJECT}_VERSION_MINOR}.${${PROJECT}_VERSION_PATCH})
+
+message (STATUS "${PROJECT}: Version ${${PROJECT}_VERSION}")
+
+# set files
+file (GLOB SOURCES *.cpp)
+file (GLOB HEADERS *.h)
+file (GLOB FORMS *.ui)
+# set library
+if (CMAKE_COMPILER_IS_GNUCXX)
+  set (LIBRARIES m)
+else ()
+  set (LIBRARIES)
+endif()
+set (LANGUAGES
+     eng
+     rus)
+set (RESOURCES ${${PROJECT}_RESOURCE_DIR}/resources.qrc)
+
+message (STATUS "SOURCES: ${SOURCES}")
+message (STATUS "HEADERS: ${HEADERS}")
+message (STATUS "FORMS: ${FORMS}")
+
+
+# compile
+project (${PROJECT})
+# include_path
+include_directories (${${PROJECT}_INCLUDE_DIR}/${PROJECT}
+                     ${${PROJECT}_SOURCE_DIR}
+                     ${CMAKE_CURRENT_BINARY_DIR})
+
+find_package (Qt4 REQUIRED)
+include (${QT_USE_FILE})
+qt4_add_resources (QRC_SOURCES ${RESOURCES})
+qt4_wrap_cpp (MOC_SOURCES ${HEADERS})
+qt4_wrap_ui (UI_HEADERS ${FORMS})
+foreach (LANGUAGE ${LANGUAGES})
+    set (TS ${${PROJECT}_TRANSLATION_DIR}/${LANGUAGE}.ts)
+    set (QM ${${PROJECT}_TRANSLATION_DIR}/${LANGUAGE}.qm)
+    set (TRANSLATIONS ${TRANSLATIONS} ${TS})
+    set (TRANSLATIONS_BINARY ${TRANSLATIONS_BINARY} ${QM})
+    add_custom_command (
+        OUTPUT ${QM}
+        COMMAND ${QT_LRELEASE_EXECUTABLE} ${TS}
+        MAIN_DEPENDENCY ${TS})
+endforeach()
+add_custom_target (
+    translations 
+    COMMAND ${QT_LUPDATE_EXECUTABLE} ${HEADERS} ${SOURCES} -ts ${TRANSLATIONS})
+add_custom_command (
+    TARGET translations
+    COMMAND ${QT_LRELEASE_EXECUTABLE} ${TRANSLATIONS})
+
+source_group ("Header Files" FILES ${HEADERS})
+source_group ("Source Files" FILES ${SOURCES})
+source_group ("Generated Files" FILES ${MOC_SOURCES})
+source_group ("Resource Files" FILES ${QRC_SOURCES})
+
+add_executable (${PROJECT} WIN32 ${UI_HEADERS} ${HEADERS} ${SOURCES} ${MOC_SOURCES} ${QRC_SOURCES} ${TRANSLATIONS})
+
+target_link_libraries (${PROJECT} ${LIBRARIES} ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY})
+
+# install properties
+INSTALL (TARGETS ${PROJECT} DESTINATION bin)
diff --git a/mathmech/Makefile b/mathmech/src/Makefile
similarity index 100%
rename from mathmech/Makefile
rename to mathmech/src/Makefile
diff --git a/mathmech/aboutwindow.cpp b/mathmech/src/aboutwindow.cpp
similarity index 100%
rename from mathmech/aboutwindow.cpp
rename to mathmech/src/aboutwindow.cpp
diff --git a/mathmech/aboutwindow.h b/mathmech/src/aboutwindow.h
similarity index 100%
rename from mathmech/aboutwindow.h
rename to mathmech/src/aboutwindow.h
diff --git a/mathmech/aboutwindow.ui b/mathmech/src/aboutwindow.ui
similarity index 100%
rename from mathmech/aboutwindow.ui
rename to mathmech/src/aboutwindow.ui
diff --git a/mathmech/agglwindow.cpp b/mathmech/src/agglwindow.cpp
similarity index 100%
rename from mathmech/agglwindow.cpp
rename to mathmech/src/agglwindow.cpp
diff --git a/mathmech/agglwindow.h b/mathmech/src/agglwindow.h
similarity index 100%
rename from mathmech/agglwindow.h
rename to mathmech/src/agglwindow.h
diff --git a/mathmech/agglwindow.ui b/mathmech/src/agglwindow.ui
similarity index 100%
rename from mathmech/agglwindow.ui
rename to mathmech/src/agglwindow.ui
diff --git a/mathmech/aglallwindow.cpp b/mathmech/src/aglallwindow.cpp
similarity index 100%
rename from mathmech/aglallwindow.cpp
rename to mathmech/src/aglallwindow.cpp
diff --git a/mathmech/aglallwindow.h b/mathmech/src/aglallwindow.h
similarity index 100%
rename from mathmech/aglallwindow.h
rename to mathmech/src/aglallwindow.h
diff --git a/mathmech/aglallwindow.ui b/mathmech/src/aglallwindow.ui
similarity index 100%
rename from mathmech/aglallwindow.ui
rename to mathmech/src/aglallwindow.ui
diff --git a/mathmech/atomtypeswindow.cpp b/mathmech/src/atomtypeswindow.cpp
similarity index 100%
rename from mathmech/atomtypeswindow.cpp
rename to mathmech/src/atomtypeswindow.cpp
diff --git a/mathmech/atomtypeswindow.h b/mathmech/src/atomtypeswindow.h
similarity index 100%
rename from mathmech/atomtypeswindow.h
rename to mathmech/src/atomtypeswindow.h
diff --git a/mathmech/atomtypeswindow.ui b/mathmech/src/atomtypeswindow.ui
similarity index 100%
rename from mathmech/atomtypeswindow.ui
rename to mathmech/src/atomtypeswindow.ui
diff --git a/mathmech/clear_items.cpp b/mathmech/src/clear_items.cpp
similarity index 100%
rename from mathmech/clear_items.cpp
rename to mathmech/src/clear_items.cpp
diff --git a/mathmech/clear_items.h b/mathmech/src/clear_items.h
similarity index 100%
rename from mathmech/clear_items.h
rename to mathmech/src/clear_items.h
diff --git a/mathmech/errorwindow.cpp b/mathmech/src/errorwindow.cpp
similarity index 100%
rename from mathmech/errorwindow.cpp
rename to mathmech/src/errorwindow.cpp
diff --git a/mathmech/errorwindow.h b/mathmech/src/errorwindow.h
similarity index 100%
rename from mathmech/errorwindow.h
rename to mathmech/src/errorwindow.h
diff --git a/mathmech/errorwindow.ui b/mathmech/src/errorwindow.ui
similarity index 100%
rename from mathmech/errorwindow.ui
rename to mathmech/src/errorwindow.ui
diff --git a/mathmech/main.cpp b/mathmech/src/main.cpp
similarity index 100%
rename from mathmech/main.cpp
rename to mathmech/src/main.cpp
diff --git a/mathmech/mainwindow.cpp b/mathmech/src/mainwindow.cpp
similarity index 100%
rename from mathmech/mainwindow.cpp
rename to mathmech/src/mainwindow.cpp
diff --git a/mathmech/mainwindow.h b/mathmech/src/mainwindow.h
similarity index 100%
rename from mathmech/mainwindow.h
rename to mathmech/src/mainwindow.h
diff --git a/mathmech/mainwindow.ui b/mathmech/src/mainwindow.ui
similarity index 100%
rename from mathmech/mainwindow.ui
rename to mathmech/src/mainwindow.ui
diff --git a/mathmech/mathmech.pro b/mathmech/src/mathmech.pro
similarity index 100%
rename from mathmech/mathmech.pro
rename to mathmech/src/mathmech.pro
diff --git a/mathmech/mathmech.pro.user b/mathmech/src/mathmech.pro.user
similarity index 100%
rename from mathmech/mathmech.pro.user
rename to mathmech/src/mathmech.pro.user
diff --git a/mathmech/settingswindow.cpp b/mathmech/src/settingswindow.cpp
similarity index 100%
rename from mathmech/settingswindow.cpp
rename to mathmech/src/settingswindow.cpp
diff --git a/mathmech/settingswindow.h b/mathmech/src/settingswindow.h
similarity index 100%
rename from mathmech/settingswindow.h
rename to mathmech/src/settingswindow.h
diff --git a/mathmech/settingswindow.ui b/mathmech/src/settingswindow.ui
similarity index 100%
rename from mathmech/settingswindow.ui
rename to mathmech/src/settingswindow.ui
diff --git a/mathmech/start_events.cpp b/mathmech/src/start_events.cpp
similarity index 100%
rename from mathmech/start_events.cpp
rename to mathmech/src/start_events.cpp
diff --git a/mathmech/start_events.h b/mathmech/src/start_events.h
similarity index 100%
rename from mathmech/start_events.h
rename to mathmech/src/start_events.h
diff --git a/mathmech/statgengraphwindow.cpp b/mathmech/src/statgengraphwindow.cpp
similarity index 100%
rename from mathmech/statgengraphwindow.cpp
rename to mathmech/src/statgengraphwindow.cpp
diff --git a/mathmech/statgengraphwindow.h b/mathmech/src/statgengraphwindow.h
similarity index 100%
rename from mathmech/statgengraphwindow.h
rename to mathmech/src/statgengraphwindow.h
diff --git a/mathmech/statgengraphwindow.ui b/mathmech/src/statgengraphwindow.ui
similarity index 100%
rename from mathmech/statgengraphwindow.ui
rename to mathmech/src/statgengraphwindow.ui
diff --git a/mathmech/update_fields.cpp b/mathmech/src/update_fields.cpp
similarity index 100%
rename from mathmech/update_fields.cpp
rename to mathmech/src/update_fields.cpp
diff --git a/mathmech/update_fields.h b/mathmech/src/update_fields.h
similarity index 100%
rename from mathmech/update_fields.h
rename to mathmech/src/update_fields.h