diff --git a/gsmartcontrol/.svnignore.txt b/.svnignore.txt
similarity index 100%
rename from gsmartcontrol/.svnignore.txt
rename to .svnignore.txt
diff --git a/gsmartcontrol/.update-ignores b/.update-ignores
similarity index 100%
rename from gsmartcontrol/.update-ignores
rename to .update-ignores
diff --git a/gsmartcontrol/AUTHORS.txt b/AUTHORS.txt
similarity index 100%
rename from gsmartcontrol/AUTHORS.txt
rename to AUTHORS.txt
diff --git a/gsmartcontrol/COPYING b/COPYING
similarity index 100%
rename from gsmartcontrol/COPYING
rename to COPYING
diff --git a/gsmartcontrol/ChangeLog b/ChangeLog
similarity index 100%
rename from gsmartcontrol/ChangeLog
rename to ChangeLog
diff --git a/gsmartcontrol/Doxyfile b/Doxyfile
similarity index 100%
rename from gsmartcontrol/Doxyfile
rename to Doxyfile
diff --git a/gsmartcontrol/INSTALL b/INSTALL
similarity index 100%
rename from gsmartcontrol/INSTALL
rename to INSTALL
diff --git a/gsmartcontrol/LICENSE_boost_1_0.txt b/LICENSE_boost_1_0.txt
similarity index 100%
rename from gsmartcontrol/LICENSE_boost_1_0.txt
rename to LICENSE_boost_1_0.txt
diff --git a/gsmartcontrol/LICENSE_bsd-ac.txt b/LICENSE_bsd-ac.txt
similarity index 100%
rename from gsmartcontrol/LICENSE_bsd-ac.txt
rename to LICENSE_bsd-ac.txt
diff --git a/gsmartcontrol/LICENSE_bsd-ucb.txt b/LICENSE_bsd-ucb.txt
similarity index 100%
rename from gsmartcontrol/LICENSE_bsd-ucb.txt
rename to LICENSE_bsd-ucb.txt
diff --git a/gsmartcontrol/LICENSE_gpl2.txt b/LICENSE_gpl2.txt
similarity index 100%
rename from gsmartcontrol/LICENSE_gpl2.txt
rename to LICENSE_gpl2.txt
diff --git a/gsmartcontrol/LICENSE_gpl3.txt b/LICENSE_gpl3.txt
similarity index 100%
rename from gsmartcontrol/LICENSE_gpl3.txt
rename to LICENSE_gpl3.txt
diff --git a/gsmartcontrol/LICENSE_gsmartcontrol.txt b/LICENSE_gsmartcontrol.txt
similarity index 100%
rename from gsmartcontrol/LICENSE_gsmartcontrol.txt
rename to LICENSE_gsmartcontrol.txt
diff --git a/gsmartcontrol/LICENSE_hz.txt b/LICENSE_hz.txt
similarity index 100%
rename from gsmartcontrol/LICENSE_hz.txt
rename to LICENSE_hz.txt
diff --git a/gsmartcontrol/LICENSE_pcrecpp.txt b/LICENSE_pcrecpp.txt
similarity index 100%
rename from gsmartcontrol/LICENSE_pcrecpp.txt
rename to LICENSE_pcrecpp.txt
diff --git a/gsmartcontrol/LICENSE_unlicense.txt b/LICENSE_unlicense.txt
similarity index 100%
rename from gsmartcontrol/LICENSE_unlicense.txt
rename to LICENSE_unlicense.txt
diff --git a/gsmartcontrol/LICENSE_zlib.txt b/LICENSE_zlib.txt
similarity index 100%
rename from gsmartcontrol/LICENSE_zlib.txt
rename to LICENSE_zlib.txt
diff --git a/gsmartcontrol/Makefile.am b/Makefile.am
similarity index 100%
rename from gsmartcontrol/Makefile.am
rename to Makefile.am
diff --git a/gsmartcontrol/NEWS b/NEWS
similarity index 100%
rename from gsmartcontrol/NEWS
rename to NEWS
diff --git a/gsmartcontrol/README.txt b/README.txt
similarity index 100%
rename from gsmartcontrol/README.txt
rename to README.txt
diff --git a/gsmartcontrol/TODO b/TODO
similarity index 100%
rename from gsmartcontrol/TODO
rename to TODO
diff --git a/gsmartcontrol/autoconf.m4/ac_cxx_exceptions.m4 b/autoconf.m4/ac_cxx_exceptions.m4
similarity index 100%
rename from gsmartcontrol/autoconf.m4/ac_cxx_exceptions.m4
rename to autoconf.m4/ac_cxx_exceptions.m4
diff --git a/gsmartcontrol/autoconf.m4/ac_cxx_namespaces.m4 b/autoconf.m4/ac_cxx_namespaces.m4
similarity index 100%
rename from gsmartcontrol/autoconf.m4/ac_cxx_namespaces.m4
rename to autoconf.m4/ac_cxx_namespaces.m4
diff --git a/gsmartcontrol/autoconf.m4/ac_cxx_rtti.m4 b/autoconf.m4/ac_cxx_rtti.m4
similarity index 100%
rename from gsmartcontrol/autoconf.m4/ac_cxx_rtti.m4
rename to autoconf.m4/ac_cxx_rtti.m4
diff --git a/gsmartcontrol/autoconf.m4/ac_cxx_verbose_terminate_handler.m4 b/autoconf.m4/ac_cxx_verbose_terminate_handler.m4
similarity index 100%
rename from gsmartcontrol/autoconf.m4/ac_cxx_verbose_terminate_handler.m4
rename to autoconf.m4/ac_cxx_verbose_terminate_handler.m4
diff --git a/gsmartcontrol/autoconf.m4/app_auto_clear_flags.m4 b/autoconf.m4/app_auto_clear_flags.m4
similarity index 100%
rename from gsmartcontrol/autoconf.m4/app_auto_clear_flags.m4
rename to autoconf.m4/app_auto_clear_flags.m4
diff --git a/gsmartcontrol/autoconf.m4/app_compiler_options.m4 b/autoconf.m4/app_compiler_options.m4
similarity index 100%
rename from gsmartcontrol/autoconf.m4/app_compiler_options.m4
rename to autoconf.m4/app_compiler_options.m4
diff --git a/gsmartcontrol/autoconf.m4/app_cxx_extern_c_overload.m4 b/autoconf.m4/app_cxx_extern_c_overload.m4
similarity index 100%
rename from gsmartcontrol/autoconf.m4/app_cxx_extern_c_overload.m4
rename to autoconf.m4/app_cxx_extern_c_overload.m4
diff --git a/gsmartcontrol/autoconf.m4/app_cxx_func.m4 b/autoconf.m4/app_cxx_func.m4
similarity index 100%
rename from gsmartcontrol/autoconf.m4/app_cxx_func.m4
rename to autoconf.m4/app_cxx_func.m4
diff --git a/gsmartcontrol/autoconf.m4/app_detect_os.m4 b/autoconf.m4/app_detect_os.m4
similarity index 100%
rename from gsmartcontrol/autoconf.m4/app_detect_os.m4
rename to autoconf.m4/app_detect_os.m4
diff --git a/gsmartcontrol/autoconf.m4/app_get_mt_flags.m4 b/autoconf.m4/app_get_mt_flags.m4
similarity index 100%
rename from gsmartcontrol/autoconf.m4/app_get_mt_flags.m4
rename to autoconf.m4/app_get_mt_flags.m4
diff --git a/gsmartcontrol/autoconf.m4/app_use_system_extensions.m4 b/autoconf.m4/app_use_system_extensions.m4
similarity index 100%
rename from gsmartcontrol/autoconf.m4/app_use_system_extensions.m4
rename to autoconf.m4/app_use_system_extensions.m4
diff --git a/gsmartcontrol/autoconf.m4/ax_compiler_vendor.m4 b/autoconf.m4/ax_compiler_vendor.m4
similarity index 100%
rename from gsmartcontrol/autoconf.m4/ax_compiler_vendor.m4
rename to autoconf.m4/ax_compiler_vendor.m4
diff --git a/gsmartcontrol/autoconf.m4/ax_cxx_gcc_abi_demangle.m4 b/autoconf.m4/ax_cxx_gcc_abi_demangle.m4
similarity index 100%
rename from gsmartcontrol/autoconf.m4/ax_cxx_gcc_abi_demangle.m4
rename to autoconf.m4/ax_cxx_gcc_abi_demangle.m4
diff --git a/gsmartcontrol/autogen.sh b/autogen.sh
similarity index 100%
rename from gsmartcontrol/autogen.sh
rename to autogen.sh
diff --git a/gsmartcontrol/compilation_flags.in b/compilation_flags.in
similarity index 100%
rename from gsmartcontrol/compilation_flags.in
rename to compilation_flags.in
diff --git a/gsmartcontrol/configure-dev b/configure-dev
similarity index 100%
rename from gsmartcontrol/configure-dev
rename to configure-dev
diff --git a/gsmartcontrol/configure.ac b/configure.ac
similarity index 100%
rename from gsmartcontrol/configure.ac
rename to configure.ac
diff --git a/gsmartcontrol/contrib/cron-based_noadmin/README b/contrib/cron-based_noadmin/README
similarity index 100%
rename from gsmartcontrol/contrib/cron-based_noadmin/README
rename to contrib/cron-based_noadmin/README
diff --git a/gsmartcontrol/contrib/cron-based_noadmin/cron_gather_smart.sh b/contrib/cron-based_noadmin/cron_gather_smart.sh
similarity index 100%
rename from gsmartcontrol/contrib/cron-based_noadmin/cron_gather_smart.sh
rename to contrib/cron-based_noadmin/cron_gather_smart.sh
diff --git a/gsmartcontrol/contrib/cron-based_noadmin/crontab.example b/contrib/cron-based_noadmin/crontab.example
similarity index 100%
rename from gsmartcontrol/contrib/cron-based_noadmin/crontab.example
rename to contrib/cron-based_noadmin/crontab.example
diff --git a/gsmartcontrol/contrib/cron-based_noadmin/smartctl_subst.sh b/contrib/cron-based_noadmin/smartctl_subst.sh
similarity index 100%
rename from gsmartcontrol/contrib/cron-based_noadmin/smartctl_subst.sh
rename to contrib/cron-based_noadmin/smartctl_subst.sh
diff --git a/gsmartcontrol/data/128/Makefile.am b/data/128/Makefile.am
similarity index 100%
rename from gsmartcontrol/data/128/Makefile.am
rename to data/128/Makefile.am
diff --git a/gsmartcontrol/data/128/gsmartcontrol.png b/data/128/gsmartcontrol.png
similarity index 100%
rename from gsmartcontrol/data/128/gsmartcontrol.png
rename to data/128/gsmartcontrol.png
diff --git a/gsmartcontrol/data/16/Makefile.am b/data/16/Makefile.am
similarity index 100%
rename from gsmartcontrol/data/16/Makefile.am
rename to data/16/Makefile.am
diff --git a/gsmartcontrol/data/16/gsmartcontrol.png b/data/16/gsmartcontrol.png
similarity index 100%
rename from gsmartcontrol/data/16/gsmartcontrol.png
rename to data/16/gsmartcontrol.png
diff --git a/gsmartcontrol/data/22/Makefile.am b/data/22/Makefile.am
similarity index 100%
rename from gsmartcontrol/data/22/Makefile.am
rename to data/22/Makefile.am
diff --git a/gsmartcontrol/data/22/gsmartcontrol.png b/data/22/gsmartcontrol.png
similarity index 100%
rename from gsmartcontrol/data/22/gsmartcontrol.png
rename to data/22/gsmartcontrol.png
diff --git a/gsmartcontrol/data/24/Makefile.am b/data/24/Makefile.am
similarity index 100%
rename from gsmartcontrol/data/24/Makefile.am
rename to data/24/Makefile.am
diff --git a/gsmartcontrol/data/24/gsmartcontrol.png b/data/24/gsmartcontrol.png
similarity index 100%
rename from gsmartcontrol/data/24/gsmartcontrol.png
rename to data/24/gsmartcontrol.png
diff --git a/gsmartcontrol/data/256/Makefile.am b/data/256/Makefile.am
similarity index 100%
rename from gsmartcontrol/data/256/Makefile.am
rename to data/256/Makefile.am
diff --git a/gsmartcontrol/data/256/gsmartcontrol.png b/data/256/gsmartcontrol.png
similarity index 100%
rename from gsmartcontrol/data/256/gsmartcontrol.png
rename to data/256/gsmartcontrol.png
diff --git a/gsmartcontrol/data/32/Makefile.am b/data/32/Makefile.am
similarity index 100%
rename from gsmartcontrol/data/32/Makefile.am
rename to data/32/Makefile.am
diff --git a/gsmartcontrol/data/32/gsmartcontrol.png b/data/32/gsmartcontrol.png
similarity index 100%
rename from gsmartcontrol/data/32/gsmartcontrol.png
rename to data/32/gsmartcontrol.png
diff --git a/gsmartcontrol/data/48/Makefile.am b/data/48/Makefile.am
similarity index 100%
rename from gsmartcontrol/data/48/Makefile.am
rename to data/48/Makefile.am
diff --git a/gsmartcontrol/data/48/gsmartcontrol.png b/data/48/gsmartcontrol.png
similarity index 100%
rename from gsmartcontrol/data/48/gsmartcontrol.png
rename to data/48/gsmartcontrol.png
diff --git a/gsmartcontrol/data/64/Makefile.am b/data/64/Makefile.am
similarity index 100%
rename from gsmartcontrol/data/64/Makefile.am
rename to data/64/Makefile.am
diff --git a/gsmartcontrol/data/64/gsmartcontrol.png b/data/64/gsmartcontrol.png
similarity index 100%
rename from gsmartcontrol/data/64/gsmartcontrol.png
rename to data/64/gsmartcontrol.png
diff --git a/gsmartcontrol/data/Makefile.am b/data/Makefile.am
similarity index 100%
rename from gsmartcontrol/data/Makefile.am
rename to data/Makefile.am
diff --git a/gsmartcontrol/data/gsmartcontrol-root.in b/data/gsmartcontrol-root.in
similarity index 100%
rename from gsmartcontrol/data/gsmartcontrol-root.in
rename to data/gsmartcontrol-root.in
diff --git a/gsmartcontrol/data/gsmartcontrol.1 b/data/gsmartcontrol.1
similarity index 100%
rename from gsmartcontrol/data/gsmartcontrol.1
rename to data/gsmartcontrol.1
diff --git a/gsmartcontrol/data/gsmartcontrol.appdata.xml.in b/data/gsmartcontrol.appdata.xml.in
similarity index 100%
rename from gsmartcontrol/data/gsmartcontrol.appdata.xml.in
rename to data/gsmartcontrol.appdata.xml.in
diff --git a/gsmartcontrol/data/gsmartcontrol.desktop.in b/data/gsmartcontrol.desktop.in
similarity index 100%
rename from gsmartcontrol/data/gsmartcontrol.desktop.in
rename to data/gsmartcontrol.desktop.in
diff --git a/gsmartcontrol/data/gsmartcontrol.ico b/data/gsmartcontrol.ico
similarity index 100%
rename from gsmartcontrol/data/gsmartcontrol.ico
rename to data/gsmartcontrol.ico
diff --git a/gsmartcontrol/data/gsmartcontrol.xpm b/data/gsmartcontrol.xpm
similarity index 100%
rename from gsmartcontrol/data/gsmartcontrol.xpm
rename to data/gsmartcontrol.xpm
diff --git a/gsmartcontrol/data/icon_cddvd.png b/data/icon_cddvd.png
similarity index 100%
rename from gsmartcontrol/data/icon_cddvd.png
rename to data/icon_cddvd.png
diff --git a/gsmartcontrol/data/icon_hdd.png b/data/icon_hdd.png
similarity index 100%
rename from gsmartcontrol/data/icon_hdd.png
rename to data/icon_hdd.png
diff --git a/gsmartcontrol/data/nsis/Makefile.am b/data/nsis/Makefile.am
similarity index 100%
rename from gsmartcontrol/data/nsis/Makefile.am
rename to data/nsis/Makefile.am
diff --git a/gsmartcontrol/data/nsis/distribution.txt.in b/data/nsis/distribution.txt.in
similarity index 100%
rename from gsmartcontrol/data/nsis/distribution.txt.in
rename to data/nsis/distribution.txt.in
diff --git a/gsmartcontrol/data/nsis/gsmartcontrol.nsi.in b/data/nsis/gsmartcontrol.nsi.in
similarity index 100%
rename from gsmartcontrol/data/nsis/gsmartcontrol.nsi.in
rename to data/nsis/gsmartcontrol.nsi.in
diff --git a/gsmartcontrol/data/nsis/nsi_install.ico b/data/nsis/nsi_install.ico
similarity index 100%
rename from gsmartcontrol/data/nsis/nsi_install.ico
rename to data/nsis/nsi_install.ico
diff --git a/gsmartcontrol/data/nsis/nsi_uninstall.ico b/data/nsis/nsi_uninstall.ico
similarity index 100%
rename from gsmartcontrol/data/nsis/nsi_uninstall.ico
rename to data/nsis/nsi_uninstall.ico
diff --git a/gsmartcontrol/debian.dist/Makefile.am b/debian.dist/Makefile.am
similarity index 100%
rename from gsmartcontrol/debian.dist/Makefile.am
rename to debian.dist/Makefile.am
diff --git a/gsmartcontrol/debian.dist/changelog.in b/debian.dist/changelog.in
similarity index 100%
rename from gsmartcontrol/debian.dist/changelog.in
rename to debian.dist/changelog.in
diff --git a/gsmartcontrol/debian.dist/compat b/debian.dist/compat
similarity index 100%
rename from gsmartcontrol/debian.dist/compat
rename to debian.dist/compat
diff --git a/gsmartcontrol/debian.dist/control b/debian.dist/control
similarity index 100%
rename from gsmartcontrol/debian.dist/control
rename to debian.dist/control
diff --git a/gsmartcontrol/debian.dist/copyright b/debian.dist/copyright
similarity index 100%
rename from gsmartcontrol/debian.dist/copyright
rename to debian.dist/copyright
diff --git a/gsmartcontrol/debian.dist/menu b/debian.dist/menu
similarity index 100%
rename from gsmartcontrol/debian.dist/menu
rename to debian.dist/menu
diff --git a/gsmartcontrol/debian.dist/postinst b/debian.dist/postinst
similarity index 100%
rename from gsmartcontrol/debian.dist/postinst
rename to debian.dist/postinst
diff --git a/gsmartcontrol/debian.dist/postrm b/debian.dist/postrm
similarity index 100%
rename from gsmartcontrol/debian.dist/postrm
rename to debian.dist/postrm
diff --git a/gsmartcontrol/debian.dist/rules b/debian.dist/rules
similarity index 100%
rename from gsmartcontrol/debian.dist/rules
rename to debian.dist/rules
diff --git a/gsmartcontrol/doxy_main_page.h b/doxy_main_page.h
similarity index 100%
rename from gsmartcontrol/doxy_main_page.h
rename to doxy_main_page.h
diff --git a/gsmartcontrol/file2csource.sh b/file2csource.sh
similarity index 100%
rename from gsmartcontrol/file2csource.sh
rename to file2csource.sh
diff --git a/gsmartcontrol/gsmartcontrol.kdev4 b/gsmartcontrol.kdev4
similarity index 100%
rename from gsmartcontrol/gsmartcontrol.kdev4
rename to gsmartcontrol.kdev4
diff --git a/gsmartcontrol/gsmartcontrol.kdevelop b/gsmartcontrol.kdevelop
similarity index 100%
rename from gsmartcontrol/gsmartcontrol.kdevelop
rename to gsmartcontrol.kdevelop
diff --git a/gsmartcontrol/gsmartcontrol.spec.in b/gsmartcontrol.spec.in
similarity index 100%
rename from gsmartcontrol/gsmartcontrol.spec.in
rename to gsmartcontrol.spec.in
diff --git a/gsmartcontrol/src/Makefile.am b/src/Makefile.am
similarity index 100%
rename from gsmartcontrol/src/Makefile.am
rename to src/Makefile.am
diff --git a/gsmartcontrol/src/applib/Makefile.am b/src/applib/Makefile.am
similarity index 100%
rename from gsmartcontrol/src/applib/Makefile.am
rename to src/applib/Makefile.am
diff --git a/gsmartcontrol/src/applib/app_gtkmm_features.h b/src/applib/app_gtkmm_features.h
similarity index 100%
rename from gsmartcontrol/src/applib/app_gtkmm_features.h
rename to src/applib/app_gtkmm_features.h
diff --git a/gsmartcontrol/src/applib/app_gtkmm_utils.cpp b/src/applib/app_gtkmm_utils.cpp
similarity index 100%
rename from gsmartcontrol/src/applib/app_gtkmm_utils.cpp
rename to src/applib/app_gtkmm_utils.cpp
diff --git a/gsmartcontrol/src/applib/app_gtkmm_utils.h b/src/applib/app_gtkmm_utils.h
similarity index 100%
rename from gsmartcontrol/src/applib/app_gtkmm_utils.h
rename to src/applib/app_gtkmm_utils.h
diff --git a/gsmartcontrol/src/applib/app_pango_utils.cpp b/src/applib/app_pango_utils.cpp
similarity index 100%
rename from gsmartcontrol/src/applib/app_pango_utils.cpp
rename to src/applib/app_pango_utils.cpp
diff --git a/gsmartcontrol/src/applib/app_pango_utils.h b/src/applib/app_pango_utils.h
similarity index 100%
rename from gsmartcontrol/src/applib/app_pango_utils.h
rename to src/applib/app_pango_utils.h
diff --git a/gsmartcontrol/src/applib/app_pcrecpp.h b/src/applib/app_pcrecpp.h
similarity index 100%
rename from gsmartcontrol/src/applib/app_pcrecpp.h
rename to src/applib/app_pcrecpp.h
diff --git a/gsmartcontrol/src/applib/app_ui_res_utils.h b/src/applib/app_ui_res_utils.h
similarity index 100%
rename from gsmartcontrol/src/applib/app_ui_res_utils.h
rename to src/applib/app_ui_res_utils.h
diff --git a/gsmartcontrol/src/applib/app_ui_res_utils_test.cpp b/src/applib/app_ui_res_utils_test.cpp
similarity index 100%
rename from gsmartcontrol/src/applib/app_ui_res_utils_test.cpp
rename to src/applib/app_ui_res_utils_test.cpp
diff --git a/gsmartcontrol/src/applib/app_ui_res_utils_test_data.cpp b/src/applib/app_ui_res_utils_test_data.cpp
similarity index 100%
rename from gsmartcontrol/src/applib/app_ui_res_utils_test_data.cpp
rename to src/applib/app_ui_res_utils_test_data.cpp
diff --git a/gsmartcontrol/src/applib/cli_executors.h b/src/applib/cli_executors.h
similarity index 100%
rename from gsmartcontrol/src/applib/cli_executors.h
rename to src/applib/cli_executors.h
diff --git a/gsmartcontrol/src/applib/cmdex.cpp b/src/applib/cmdex.cpp
similarity index 100%
rename from gsmartcontrol/src/applib/cmdex.cpp
rename to src/applib/cmdex.cpp
diff --git a/gsmartcontrol/src/applib/cmdex.h b/src/applib/cmdex.h
similarity index 100%
rename from gsmartcontrol/src/applib/cmdex.h
rename to src/applib/cmdex.h
diff --git a/gsmartcontrol/src/applib/cmdex_sync.cpp b/src/applib/cmdex_sync.cpp
similarity index 100%
rename from gsmartcontrol/src/applib/cmdex_sync.cpp
rename to src/applib/cmdex_sync.cpp
diff --git a/gsmartcontrol/src/applib/cmdex_sync.h b/src/applib/cmdex_sync.h
similarity index 100%
rename from gsmartcontrol/src/applib/cmdex_sync.h
rename to src/applib/cmdex_sync.h
diff --git a/gsmartcontrol/src/applib/cmdex_sync_gui.cpp b/src/applib/cmdex_sync_gui.cpp
similarity index 100%
rename from gsmartcontrol/src/applib/cmdex_sync_gui.cpp
rename to src/applib/cmdex_sync_gui.cpp
diff --git a/gsmartcontrol/src/applib/cmdex_sync_gui.h b/src/applib/cmdex_sync_gui.h
similarity index 100%
rename from gsmartcontrol/src/applib/cmdex_sync_gui.h
rename to src/applib/cmdex_sync_gui.h
diff --git a/gsmartcontrol/src/applib/executor_factory.cpp b/src/applib/executor_factory.cpp
similarity index 100%
rename from gsmartcontrol/src/applib/executor_factory.cpp
rename to src/applib/executor_factory.cpp
diff --git a/gsmartcontrol/src/applib/executor_factory.h b/src/applib/executor_factory.h
similarity index 100%
rename from gsmartcontrol/src/applib/executor_factory.h
rename to src/applib/executor_factory.h
diff --git a/gsmartcontrol/src/applib/gui_utils.cpp b/src/applib/gui_utils.cpp
similarity index 100%
rename from gsmartcontrol/src/applib/gui_utils.cpp
rename to src/applib/gui_utils.cpp
diff --git a/gsmartcontrol/src/applib/gui_utils.h b/src/applib/gui_utils.h
similarity index 100%
rename from gsmartcontrol/src/applib/gui_utils.h
rename to src/applib/gui_utils.h
diff --git a/gsmartcontrol/src/applib/selftest.cpp b/src/applib/selftest.cpp
similarity index 100%
rename from gsmartcontrol/src/applib/selftest.cpp
rename to src/applib/selftest.cpp
diff --git a/gsmartcontrol/src/applib/selftest.h b/src/applib/selftest.h
similarity index 100%
rename from gsmartcontrol/src/applib/selftest.h
rename to src/applib/selftest.h
diff --git a/gsmartcontrol/src/applib/smartctl_executor.cpp b/src/applib/smartctl_executor.cpp
similarity index 100%
rename from gsmartcontrol/src/applib/smartctl_executor.cpp
rename to src/applib/smartctl_executor.cpp
diff --git a/gsmartcontrol/src/applib/smartctl_executor.h b/src/applib/smartctl_executor.h
similarity index 100%
rename from gsmartcontrol/src/applib/smartctl_executor.h
rename to src/applib/smartctl_executor.h
diff --git a/gsmartcontrol/src/applib/smartctl_executor_gui.h b/src/applib/smartctl_executor_gui.h
similarity index 100%
rename from gsmartcontrol/src/applib/smartctl_executor_gui.h
rename to src/applib/smartctl_executor_gui.h
diff --git a/gsmartcontrol/src/applib/smartctl_executor_test.cpp b/src/applib/smartctl_executor_test.cpp
similarity index 100%
rename from gsmartcontrol/src/applib/smartctl_executor_test.cpp
rename to src/applib/smartctl_executor_test.cpp
diff --git a/gsmartcontrol/src/applib/smartctl_parser.cpp b/src/applib/smartctl_parser.cpp
similarity index 100%
rename from gsmartcontrol/src/applib/smartctl_parser.cpp
rename to src/applib/smartctl_parser.cpp
diff --git a/gsmartcontrol/src/applib/smartctl_parser.h b/src/applib/smartctl_parser.h
similarity index 100%
rename from gsmartcontrol/src/applib/smartctl_parser.h
rename to src/applib/smartctl_parser.h
diff --git a/gsmartcontrol/src/applib/smartctl_parser_test.cpp b/src/applib/smartctl_parser_test.cpp
similarity index 100%
rename from gsmartcontrol/src/applib/smartctl_parser_test.cpp
rename to src/applib/smartctl_parser_test.cpp
diff --git a/gsmartcontrol/src/applib/spawn_test.cpp b/src/applib/spawn_test.cpp
similarity index 100%
rename from gsmartcontrol/src/applib/spawn_test.cpp
rename to src/applib/spawn_test.cpp
diff --git a/gsmartcontrol/src/applib/storage_detector.cpp b/src/applib/storage_detector.cpp
similarity index 100%
rename from gsmartcontrol/src/applib/storage_detector.cpp
rename to src/applib/storage_detector.cpp
diff --git a/gsmartcontrol/src/applib/storage_detector.h b/src/applib/storage_detector.h
similarity index 100%
rename from gsmartcontrol/src/applib/storage_detector.h
rename to src/applib/storage_detector.h
diff --git a/gsmartcontrol/src/applib/storage_detector_helpers.h b/src/applib/storage_detector_helpers.h
similarity index 100%
rename from gsmartcontrol/src/applib/storage_detector_helpers.h
rename to src/applib/storage_detector_helpers.h
diff --git a/gsmartcontrol/src/applib/storage_detector_linux.cpp b/src/applib/storage_detector_linux.cpp
similarity index 100%
rename from gsmartcontrol/src/applib/storage_detector_linux.cpp
rename to src/applib/storage_detector_linux.cpp
diff --git a/gsmartcontrol/src/applib/storage_detector_linux.h b/src/applib/storage_detector_linux.h
similarity index 100%
rename from gsmartcontrol/src/applib/storage_detector_linux.h
rename to src/applib/storage_detector_linux.h
diff --git a/gsmartcontrol/src/applib/storage_detector_other.cpp b/src/applib/storage_detector_other.cpp
similarity index 100%
rename from gsmartcontrol/src/applib/storage_detector_other.cpp
rename to src/applib/storage_detector_other.cpp
diff --git a/gsmartcontrol/src/applib/storage_detector_other.h b/src/applib/storage_detector_other.h
similarity index 100%
rename from gsmartcontrol/src/applib/storage_detector_other.h
rename to src/applib/storage_detector_other.h
diff --git a/gsmartcontrol/src/applib/storage_detector_test.cpp b/src/applib/storage_detector_test.cpp
similarity index 100%
rename from gsmartcontrol/src/applib/storage_detector_test.cpp
rename to src/applib/storage_detector_test.cpp
diff --git a/gsmartcontrol/src/applib/storage_detector_win32.cpp b/src/applib/storage_detector_win32.cpp
similarity index 100%
rename from gsmartcontrol/src/applib/storage_detector_win32.cpp
rename to src/applib/storage_detector_win32.cpp
diff --git a/gsmartcontrol/src/applib/storage_detector_win32.h b/src/applib/storage_detector_win32.h
similarity index 100%
rename from gsmartcontrol/src/applib/storage_detector_win32.h
rename to src/applib/storage_detector_win32.h
diff --git a/gsmartcontrol/src/applib/storage_device.cpp b/src/applib/storage_device.cpp
similarity index 100%
rename from gsmartcontrol/src/applib/storage_device.cpp
rename to src/applib/storage_device.cpp
diff --git a/gsmartcontrol/src/applib/storage_device.h b/src/applib/storage_device.h
similarity index 100%
rename from gsmartcontrol/src/applib/storage_device.h
rename to src/applib/storage_device.h
diff --git a/gsmartcontrol/src/applib/storage_property.cpp b/src/applib/storage_property.cpp
similarity index 100%
rename from gsmartcontrol/src/applib/storage_property.cpp
rename to src/applib/storage_property.cpp
diff --git a/gsmartcontrol/src/applib/storage_property.h b/src/applib/storage_property.h
similarity index 100%
rename from gsmartcontrol/src/applib/storage_property.h
rename to src/applib/storage_property.h
diff --git a/gsmartcontrol/src/applib/storage_property_colors.h b/src/applib/storage_property_colors.h
similarity index 100%
rename from gsmartcontrol/src/applib/storage_property_colors.h
rename to src/applib/storage_property_colors.h
diff --git a/gsmartcontrol/src/applib/storage_property_descr.cpp b/src/applib/storage_property_descr.cpp
similarity index 100%
rename from gsmartcontrol/src/applib/storage_property_descr.cpp
rename to src/applib/storage_property_descr.cpp
diff --git a/gsmartcontrol/src/applib/storage_property_descr.h b/src/applib/storage_property_descr.h
similarity index 100%
rename from gsmartcontrol/src/applib/storage_property_descr.h
rename to src/applib/storage_property_descr.h
diff --git a/gsmartcontrol/src/applib/storage_settings.h b/src/applib/storage_settings.h
similarity index 100%
rename from gsmartcontrol/src/applib/storage_settings.h
rename to src/applib/storage_settings.h
diff --git a/gsmartcontrol/src/global_macros.h b/src/global_macros.h
similarity index 100%
rename from gsmartcontrol/src/global_macros.h
rename to src/global_macros.h
diff --git a/gsmartcontrol/src/gsc_about_dialog.cpp b/src/gsc_about_dialog.cpp
similarity index 100%
rename from gsmartcontrol/src/gsc_about_dialog.cpp
rename to src/gsc_about_dialog.cpp
diff --git a/gsmartcontrol/src/gsc_about_dialog.h b/src/gsc_about_dialog.h
similarity index 100%
rename from gsmartcontrol/src/gsc_about_dialog.h
rename to src/gsc_about_dialog.h
diff --git a/gsmartcontrol/src/gsc_add_device_window.cpp b/src/gsc_add_device_window.cpp
similarity index 100%
rename from gsmartcontrol/src/gsc_add_device_window.cpp
rename to src/gsc_add_device_window.cpp
diff --git a/gsmartcontrol/src/gsc_add_device_window.h b/src/gsc_add_device_window.h
similarity index 100%
rename from gsmartcontrol/src/gsc_add_device_window.h
rename to src/gsc_add_device_window.h
diff --git a/gsmartcontrol/src/gsc_executor_error_dialog.cpp b/src/gsc_executor_error_dialog.cpp
similarity index 100%
rename from gsmartcontrol/src/gsc_executor_error_dialog.cpp
rename to src/gsc_executor_error_dialog.cpp
diff --git a/gsmartcontrol/src/gsc_executor_error_dialog.h b/src/gsc_executor_error_dialog.h
similarity index 100%
rename from gsmartcontrol/src/gsc_executor_error_dialog.h
rename to src/gsc_executor_error_dialog.h
diff --git a/gsmartcontrol/src/gsc_executor_log_window.cpp b/src/gsc_executor_log_window.cpp
similarity index 100%
rename from gsmartcontrol/src/gsc_executor_log_window.cpp
rename to src/gsc_executor_log_window.cpp
diff --git a/gsmartcontrol/src/gsc_executor_log_window.h b/src/gsc_executor_log_window.h
similarity index 100%
rename from gsmartcontrol/src/gsc_executor_log_window.h
rename to src/gsc_executor_log_window.h
diff --git a/gsmartcontrol/src/gsc_help_window.cpp b/src/gsc_help_window.cpp
similarity index 100%
rename from gsmartcontrol/src/gsc_help_window.cpp
rename to src/gsc_help_window.cpp
diff --git a/gsmartcontrol/src/gsc_help_window.h b/src/gsc_help_window.h
similarity index 100%
rename from gsmartcontrol/src/gsc_help_window.h
rename to src/gsc_help_window.h
diff --git a/gsmartcontrol/src/gsc_info_window.cpp b/src/gsc_info_window.cpp
similarity index 100%
rename from gsmartcontrol/src/gsc_info_window.cpp
rename to src/gsc_info_window.cpp
diff --git a/gsmartcontrol/src/gsc_info_window.h b/src/gsc_info_window.h
similarity index 100%
rename from gsmartcontrol/src/gsc_info_window.h
rename to src/gsc_info_window.h
diff --git a/gsmartcontrol/src/gsc_init.cpp b/src/gsc_init.cpp
similarity index 100%
rename from gsmartcontrol/src/gsc_init.cpp
rename to src/gsc_init.cpp
diff --git a/gsmartcontrol/src/gsc_init.h b/src/gsc_init.h
similarity index 100%
rename from gsmartcontrol/src/gsc_init.h
rename to src/gsc_init.h
diff --git a/gsmartcontrol/src/gsc_main.cpp b/src/gsc_main.cpp
similarity index 100%
rename from gsmartcontrol/src/gsc_main.cpp
rename to src/gsc_main.cpp
diff --git a/gsmartcontrol/src/gsc_main_window.cpp b/src/gsc_main_window.cpp
similarity index 100%
rename from gsmartcontrol/src/gsc_main_window.cpp
rename to src/gsc_main_window.cpp
diff --git a/gsmartcontrol/src/gsc_main_window.h b/src/gsc_main_window.h
similarity index 100%
rename from gsmartcontrol/src/gsc_main_window.h
rename to src/gsc_main_window.h
diff --git a/gsmartcontrol/src/gsc_main_window_iconview.h b/src/gsc_main_window_iconview.h
similarity index 100%
rename from gsmartcontrol/src/gsc_main_window_iconview.h
rename to src/gsc_main_window_iconview.h
diff --git a/gsmartcontrol/src/gsc_preferences_window.cpp b/src/gsc_preferences_window.cpp
similarity index 100%
rename from gsmartcontrol/src/gsc_preferences_window.cpp
rename to src/gsc_preferences_window.cpp
diff --git a/gsmartcontrol/src/gsc_preferences_window.h b/src/gsc_preferences_window.h
similarity index 100%
rename from gsmartcontrol/src/gsc_preferences_window.h
rename to src/gsc_preferences_window.h
diff --git a/gsmartcontrol/src/gsc_settings.h b/src/gsc_settings.h
similarity index 100%
rename from gsmartcontrol/src/gsc_settings.h
rename to src/gsc_settings.h
diff --git a/gsmartcontrol/src/gsc_text_window.h b/src/gsc_text_window.h
similarity index 100%
rename from gsmartcontrol/src/gsc_text_window.h
rename to src/gsc_text_window.h
diff --git a/gsmartcontrol/src/gsc_winres.rc.in b/src/gsc_winres.rc.in
similarity index 100%
rename from gsmartcontrol/src/gsc_winres.rc.in
rename to src/gsc_winres.rc.in
diff --git a/gsmartcontrol/src/gsmartcontrol.exe.manifest.in b/src/gsmartcontrol.exe.manifest.in
similarity index 100%
rename from gsmartcontrol/src/gsmartcontrol.exe.manifest.in
rename to src/gsmartcontrol.exe.manifest.in
diff --git a/gsmartcontrol/src/hz/Makefile.am b/src/hz/Makefile.am
similarity index 100%
rename from gsmartcontrol/src/hz/Makefile.am
rename to src/hz/Makefile.am
diff --git a/gsmartcontrol/src/hz/any_convert.h b/src/hz/any_convert.h
similarity index 100%
rename from gsmartcontrol/src/hz/any_convert.h
rename to src/hz/any_convert.h
diff --git a/gsmartcontrol/src/hz/any_type.h b/src/hz/any_type.h
similarity index 100%
rename from gsmartcontrol/src/hz/any_type.h
rename to src/hz/any_type.h
diff --git a/gsmartcontrol/src/hz/any_type_holder.h b/src/hz/any_type_holder.h
similarity index 100%
rename from gsmartcontrol/src/hz/any_type_holder.h
rename to src/hz/any_type_holder.h
diff --git a/gsmartcontrol/src/hz/any_type_test.cpp b/src/hz/any_type_test.cpp
similarity index 100%
rename from gsmartcontrol/src/hz/any_type_test.cpp
rename to src/hz/any_type_test.cpp
diff --git a/gsmartcontrol/src/hz/ascii.h b/src/hz/ascii.h
similarity index 100%
rename from gsmartcontrol/src/hz/ascii.h
rename to src/hz/ascii.h
diff --git a/gsmartcontrol/src/hz/bad_cast_exception.h b/src/hz/bad_cast_exception.h
similarity index 100%
rename from gsmartcontrol/src/hz/bad_cast_exception.h
rename to src/hz/bad_cast_exception.h
diff --git a/gsmartcontrol/src/hz/bin2ascii_encoder.h b/src/hz/bin2ascii_encoder.h
similarity index 100%
rename from gsmartcontrol/src/hz/bin2ascii_encoder.h
rename to src/hz/bin2ascii_encoder.h
diff --git a/gsmartcontrol/src/hz/bin2ascii_encoder_test.cpp b/src/hz/bin2ascii_encoder_test.cpp
similarity index 100%
rename from gsmartcontrol/src/hz/bin2ascii_encoder_test.cpp
rename to src/hz/bin2ascii_encoder_test.cpp
diff --git a/gsmartcontrol/src/hz/common_types.h b/src/hz/common_types.h
similarity index 100%
rename from gsmartcontrol/src/hz/common_types.h
rename to src/hz/common_types.h
diff --git a/gsmartcontrol/src/hz/cstdint.h b/src/hz/cstdint.h
similarity index 100%
rename from gsmartcontrol/src/hz/cstdint.h
rename to src/hz/cstdint.h
diff --git a/gsmartcontrol/src/hz/cstdint_impl_msvc.h b/src/hz/cstdint_impl_msvc.h
similarity index 100%
rename from gsmartcontrol/src/hz/cstdint_impl_msvc.h
rename to src/hz/cstdint_impl_msvc.h
diff --git a/gsmartcontrol/src/hz/data_file.h b/src/hz/data_file.h
similarity index 100%
rename from gsmartcontrol/src/hz/data_file.h
rename to src/hz/data_file.h
diff --git a/gsmartcontrol/src/hz/debug.h b/src/hz/debug.h
similarity index 100%
rename from gsmartcontrol/src/hz/debug.h
rename to src/hz/debug.h
diff --git a/gsmartcontrol/src/hz/down_cast.h b/src/hz/down_cast.h
similarity index 100%
rename from gsmartcontrol/src/hz/down_cast.h
rename to src/hz/down_cast.h
diff --git a/gsmartcontrol/src/hz/down_cast_test.cpp b/src/hz/down_cast_test.cpp
similarity index 100%
rename from gsmartcontrol/src/hz/down_cast_test.cpp
rename to src/hz/down_cast_test.cpp
diff --git a/gsmartcontrol/src/hz/env_tools.h b/src/hz/env_tools.h
similarity index 100%
rename from gsmartcontrol/src/hz/env_tools.h
rename to src/hz/env_tools.h
diff --git a/gsmartcontrol/src/hz/errno_string.h b/src/hz/errno_string.h
similarity index 100%
rename from gsmartcontrol/src/hz/errno_string.h
rename to src/hz/errno_string.h
diff --git a/gsmartcontrol/src/hz/errno_string_test.cpp b/src/hz/errno_string_test.cpp
similarity index 100%
rename from gsmartcontrol/src/hz/errno_string_test.cpp
rename to src/hz/errno_string_test.cpp
diff --git a/gsmartcontrol/src/hz/error.h b/src/hz/error.h
similarity index 100%
rename from gsmartcontrol/src/hz/error.h
rename to src/hz/error.h
diff --git a/gsmartcontrol/src/hz/error_holder.h b/src/hz/error_holder.h
similarity index 100%
rename from gsmartcontrol/src/hz/error_holder.h
rename to src/hz/error_holder.h
diff --git a/gsmartcontrol/src/hz/exceptions.h b/src/hz/exceptions.h
similarity index 100%
rename from gsmartcontrol/src/hz/exceptions.h
rename to src/hz/exceptions.h
diff --git a/gsmartcontrol/src/hz/format_unit.h b/src/hz/format_unit.h
similarity index 100%
rename from gsmartcontrol/src/hz/format_unit.h
rename to src/hz/format_unit.h
diff --git a/gsmartcontrol/src/hz/format_unit_test.cpp b/src/hz/format_unit_test.cpp
similarity index 100%
rename from gsmartcontrol/src/hz/format_unit_test.cpp
rename to src/hz/format_unit_test.cpp
diff --git a/gsmartcontrol/src/hz/fs_common.h b/src/hz/fs_common.h
similarity index 100%
rename from gsmartcontrol/src/hz/fs_common.h
rename to src/hz/fs_common.h
diff --git a/gsmartcontrol/src/hz/fs_dir.h b/src/hz/fs_dir.h
similarity index 100%
rename from gsmartcontrol/src/hz/fs_dir.h
rename to src/hz/fs_dir.h
diff --git a/gsmartcontrol/src/hz/fs_dir_platform.h b/src/hz/fs_dir_platform.h
similarity index 100%
rename from gsmartcontrol/src/hz/fs_dir_platform.h
rename to src/hz/fs_dir_platform.h
diff --git a/gsmartcontrol/src/hz/fs_dir_test.cpp b/src/hz/fs_dir_test.cpp
similarity index 100%
rename from gsmartcontrol/src/hz/fs_dir_test.cpp
rename to src/hz/fs_dir_test.cpp
diff --git a/gsmartcontrol/src/hz/fs_error_holder.h b/src/hz/fs_error_holder.h
similarity index 100%
rename from gsmartcontrol/src/hz/fs_error_holder.h
rename to src/hz/fs_error_holder.h
diff --git a/gsmartcontrol/src/hz/fs_file.h b/src/hz/fs_file.h
similarity index 100%
rename from gsmartcontrol/src/hz/fs_file.h
rename to src/hz/fs_file.h
diff --git a/gsmartcontrol/src/hz/fs_file_test.cpp b/src/hz/fs_file_test.cpp
similarity index 100%
rename from gsmartcontrol/src/hz/fs_file_test.cpp
rename to src/hz/fs_file_test.cpp
diff --git a/gsmartcontrol/src/hz/fs_path.h b/src/hz/fs_path.h
similarity index 100%
rename from gsmartcontrol/src/hz/fs_path.h
rename to src/hz/fs_path.h
diff --git a/gsmartcontrol/src/hz/fs_path_test.cpp b/src/hz/fs_path_test.cpp
similarity index 100%
rename from gsmartcontrol/src/hz/fs_path_test.cpp
rename to src/hz/fs_path_test.cpp
diff --git a/gsmartcontrol/src/hz/fs_path_utils.h b/src/hz/fs_path_utils.h
similarity index 100%
rename from gsmartcontrol/src/hz/fs_path_utils.h
rename to src/hz/fs_path_utils.h
diff --git a/gsmartcontrol/src/hz/fs_tools.h b/src/hz/fs_tools.h
similarity index 100%
rename from gsmartcontrol/src/hz/fs_tools.h
rename to src/hz/fs_tools.h
diff --git a/gsmartcontrol/src/hz/hz_config.h b/src/hz/hz_config.h
similarity index 100%
rename from gsmartcontrol/src/hz/hz_config.h
rename to src/hz/hz_config.h
diff --git a/gsmartcontrol/src/hz/i18n.h b/src/hz/i18n.h
similarity index 100%
rename from gsmartcontrol/src/hz/i18n.h
rename to src/hz/i18n.h
diff --git a/gsmartcontrol/src/hz/initialized.h b/src/hz/initialized.h
similarity index 100%
rename from gsmartcontrol/src/hz/initialized.h
rename to src/hz/initialized.h
diff --git a/gsmartcontrol/src/hz/instance_manager.h b/src/hz/instance_manager.h
similarity index 100%
rename from gsmartcontrol/src/hz/instance_manager.h
rename to src/hz/instance_manager.h
diff --git a/gsmartcontrol/src/hz/intrusive_ptr.h b/src/hz/intrusive_ptr.h
similarity index 100%
rename from gsmartcontrol/src/hz/intrusive_ptr.h
rename to src/hz/intrusive_ptr.h
diff --git a/gsmartcontrol/src/hz/intrusive_scoped_lock.h b/src/hz/intrusive_scoped_lock.h
similarity index 100%
rename from gsmartcontrol/src/hz/intrusive_scoped_lock.h
rename to src/hz/intrusive_scoped_lock.h
diff --git a/gsmartcontrol/src/hz/launch_url.h b/src/hz/launch_url.h
similarity index 100%
rename from gsmartcontrol/src/hz/launch_url.h
rename to src/hz/launch_url.h
diff --git a/gsmartcontrol/src/hz/local_algo.h b/src/hz/local_algo.h
similarity index 100%
rename from gsmartcontrol/src/hz/local_algo.h
rename to src/hz/local_algo.h
diff --git a/gsmartcontrol/src/hz/locale_tools.h b/src/hz/locale_tools.h
similarity index 100%
rename from gsmartcontrol/src/hz/locale_tools.h
rename to src/hz/locale_tools.h
diff --git a/gsmartcontrol/src/hz/noncopyable.h b/src/hz/noncopyable.h
similarity index 100%
rename from gsmartcontrol/src/hz/noncopyable.h
rename to src/hz/noncopyable.h
diff --git a/gsmartcontrol/src/hz/optional_value.h b/src/hz/optional_value.h
similarity index 100%
rename from gsmartcontrol/src/hz/optional_value.h
rename to src/hz/optional_value.h
diff --git a/gsmartcontrol/src/hz/portable_snprintf.h b/src/hz/portable_snprintf.h
similarity index 100%
rename from gsmartcontrol/src/hz/portable_snprintf.h
rename to src/hz/portable_snprintf.h
diff --git a/gsmartcontrol/src/hz/process_signal.h b/src/hz/process_signal.h
similarity index 100%
rename from gsmartcontrol/src/hz/process_signal.h
rename to src/hz/process_signal.h
diff --git a/gsmartcontrol/src/hz/ptr_container.h b/src/hz/ptr_container.h
similarity index 100%
rename from gsmartcontrol/src/hz/ptr_container.h
rename to src/hz/ptr_container.h
diff --git a/gsmartcontrol/src/hz/res_data.h b/src/hz/res_data.h
similarity index 100%
rename from gsmartcontrol/src/hz/res_data.h
rename to src/hz/res_data.h
diff --git a/gsmartcontrol/src/hz/scoped_array.h b/src/hz/scoped_array.h
similarity index 100%
rename from gsmartcontrol/src/hz/scoped_array.h
rename to src/hz/scoped_array.h
diff --git a/gsmartcontrol/src/hz/scoped_ptr.h b/src/hz/scoped_ptr.h
similarity index 100%
rename from gsmartcontrol/src/hz/scoped_ptr.h
rename to src/hz/scoped_ptr.h
diff --git a/gsmartcontrol/src/hz/static_assert.h b/src/hz/static_assert.h
similarity index 100%
rename from gsmartcontrol/src/hz/static_assert.h
rename to src/hz/static_assert.h
diff --git a/gsmartcontrol/src/hz/stream_cast.h b/src/hz/stream_cast.h
similarity index 100%
rename from gsmartcontrol/src/hz/stream_cast.h
rename to src/hz/stream_cast.h
diff --git a/gsmartcontrol/src/hz/string_algo.h b/src/hz/string_algo.h
similarity index 100%
rename from gsmartcontrol/src/hz/string_algo.h
rename to src/hz/string_algo.h
diff --git a/gsmartcontrol/src/hz/string_algo_test.cpp b/src/hz/string_algo_test.cpp
similarity index 100%
rename from gsmartcontrol/src/hz/string_algo_test.cpp
rename to src/hz/string_algo_test.cpp
diff --git a/gsmartcontrol/src/hz/string_num.h b/src/hz/string_num.h
similarity index 100%
rename from gsmartcontrol/src/hz/string_num.h
rename to src/hz/string_num.h
diff --git a/gsmartcontrol/src/hz/string_num_test.cpp b/src/hz/string_num_test.cpp
similarity index 100%
rename from gsmartcontrol/src/hz/string_num_test.cpp
rename to src/hz/string_num_test.cpp
diff --git a/gsmartcontrol/src/hz/string_sprintf.h b/src/hz/string_sprintf.h
similarity index 100%
rename from gsmartcontrol/src/hz/string_sprintf.h
rename to src/hz/string_sprintf.h
diff --git a/gsmartcontrol/src/hz/string_sprintf_macros.h b/src/hz/string_sprintf_macros.h
similarity index 100%
rename from gsmartcontrol/src/hz/string_sprintf_macros.h
rename to src/hz/string_sprintf_macros.h
diff --git a/gsmartcontrol/src/hz/string_wcmatch.h b/src/hz/string_wcmatch.h
similarity index 100%
rename from gsmartcontrol/src/hz/string_wcmatch.h
rename to src/hz/string_wcmatch.h
diff --git a/gsmartcontrol/src/hz/string_wcmatch_test.cpp b/src/hz/string_wcmatch_test.cpp
similarity index 100%
rename from gsmartcontrol/src/hz/string_wcmatch_test.cpp
rename to src/hz/string_wcmatch_test.cpp
diff --git a/gsmartcontrol/src/hz/sync.h b/src/hz/sync.h
similarity index 100%
rename from gsmartcontrol/src/hz/sync.h
rename to src/hz/sync.h
diff --git a/gsmartcontrol/src/hz/sync_lock_ptr.h b/src/hz/sync_lock_ptr.h
similarity index 100%
rename from gsmartcontrol/src/hz/sync_lock_ptr.h
rename to src/hz/sync_lock_ptr.h
diff --git a/gsmartcontrol/src/hz/sync_multilock.h b/src/hz/sync_multilock.h
similarity index 100%
rename from gsmartcontrol/src/hz/sync_multilock.h
rename to src/hz/sync_multilock.h
diff --git a/gsmartcontrol/src/hz/sync_multilock_test.cpp b/src/hz/sync_multilock_test.cpp
similarity index 100%
rename from gsmartcontrol/src/hz/sync_multilock_test.cpp
rename to src/hz/sync_multilock_test.cpp
diff --git a/gsmartcontrol/src/hz/sync_part_get_policy.h b/src/hz/sync_part_get_policy.h
similarity index 100%
rename from gsmartcontrol/src/hz/sync_part_get_policy.h
rename to src/hz/sync_part_get_policy.h
diff --git a/gsmartcontrol/src/hz/sync_policy_boost.h b/src/hz/sync_policy_boost.h
similarity index 100%
rename from gsmartcontrol/src/hz/sync_policy_boost.h
rename to src/hz/sync_policy_boost.h
diff --git a/gsmartcontrol/src/hz/sync_policy_glib.h b/src/hz/sync_policy_glib.h
similarity index 100%
rename from gsmartcontrol/src/hz/sync_policy_glib.h
rename to src/hz/sync_policy_glib.h
diff --git a/gsmartcontrol/src/hz/sync_policy_glibmm.h b/src/hz/sync_policy_glibmm.h
similarity index 100%
rename from gsmartcontrol/src/hz/sync_policy_glibmm.h
rename to src/hz/sync_policy_glibmm.h
diff --git a/gsmartcontrol/src/hz/sync_policy_poco.h b/src/hz/sync_policy_poco.h
similarity index 100%
rename from gsmartcontrol/src/hz/sync_policy_poco.h
rename to src/hz/sync_policy_poco.h
diff --git a/gsmartcontrol/src/hz/sync_policy_pthread.h b/src/hz/sync_policy_pthread.h
similarity index 100%
rename from gsmartcontrol/src/hz/sync_policy_pthread.h
rename to src/hz/sync_policy_pthread.h
diff --git a/gsmartcontrol/src/hz/sync_policy_win32.h b/src/hz/sync_policy_win32.h
similarity index 100%
rename from gsmartcontrol/src/hz/sync_policy_win32.h
rename to src/hz/sync_policy_win32.h
diff --git a/gsmartcontrol/src/hz/sync_test.cpp b/src/hz/sync_test.cpp
similarity index 100%
rename from gsmartcontrol/src/hz/sync_test.cpp
rename to src/hz/sync_test.cpp
diff --git a/gsmartcontrol/src/hz/system_specific.h b/src/hz/system_specific.h
similarity index 100%
rename from gsmartcontrol/src/hz/system_specific.h
rename to src/hz/system_specific.h
diff --git a/gsmartcontrol/src/hz/tls.h b/src/hz/tls.h
similarity index 100%
rename from gsmartcontrol/src/hz/tls.h
rename to src/hz/tls.h
diff --git a/gsmartcontrol/src/hz/tls_policy_boost.h b/src/hz/tls_policy_boost.h
similarity index 100%
rename from gsmartcontrol/src/hz/tls_policy_boost.h
rename to src/hz/tls_policy_boost.h
diff --git a/gsmartcontrol/src/hz/tls_policy_glib.h b/src/hz/tls_policy_glib.h
similarity index 100%
rename from gsmartcontrol/src/hz/tls_policy_glib.h
rename to src/hz/tls_policy_glib.h
diff --git a/gsmartcontrol/src/hz/tls_policy_pthread.h b/src/hz/tls_policy_pthread.h
similarity index 100%
rename from gsmartcontrol/src/hz/tls_policy_pthread.h
rename to src/hz/tls_policy_pthread.h
diff --git a/gsmartcontrol/src/hz/tls_policy_win32.h b/src/hz/tls_policy_win32.h
similarity index 100%
rename from gsmartcontrol/src/hz/tls_policy_win32.h
rename to src/hz/tls_policy_win32.h
diff --git a/gsmartcontrol/src/hz/tls_test.cpp b/src/hz/tls_test.cpp
similarity index 100%
rename from gsmartcontrol/src/hz/tls_test.cpp
rename to src/hz/tls_test.cpp
diff --git a/gsmartcontrol/src/hz/type_categories.h b/src/hz/type_categories.h
similarity index 100%
rename from gsmartcontrol/src/hz/type_categories.h
rename to src/hz/type_categories.h
diff --git a/gsmartcontrol/src/hz/type_properties.h b/src/hz/type_properties.h
similarity index 100%
rename from gsmartcontrol/src/hz/type_properties.h
rename to src/hz/type_properties.h
diff --git a/gsmartcontrol/src/hz/win32_tools.h b/src/hz/win32_tools.h
similarity index 100%
rename from gsmartcontrol/src/hz/win32_tools.h
rename to src/hz/win32_tools.h
diff --git a/gsmartcontrol/src/libdebug/Makefile.am b/src/libdebug/Makefile.am
similarity index 100%
rename from gsmartcontrol/src/libdebug/Makefile.am
rename to src/libdebug/Makefile.am
diff --git a/gsmartcontrol/src/libdebug/dchannel.cpp b/src/libdebug/dchannel.cpp
similarity index 100%
rename from gsmartcontrol/src/libdebug/dchannel.cpp
rename to src/libdebug/dchannel.cpp
diff --git a/gsmartcontrol/src/libdebug/dchannel.h b/src/libdebug/dchannel.h
similarity index 100%
rename from gsmartcontrol/src/libdebug/dchannel.h
rename to src/libdebug/dchannel.h
diff --git a/gsmartcontrol/src/libdebug/dcmdarg.cpp b/src/libdebug/dcmdarg.cpp
similarity index 100%
rename from gsmartcontrol/src/libdebug/dcmdarg.cpp
rename to src/libdebug/dcmdarg.cpp
diff --git a/gsmartcontrol/src/libdebug/dcmdarg.h b/src/libdebug/dcmdarg.h
similarity index 100%
rename from gsmartcontrol/src/libdebug/dcmdarg.h
rename to src/libdebug/dcmdarg.h
diff --git a/gsmartcontrol/src/libdebug/dexcept.h b/src/libdebug/dexcept.h
similarity index 100%
rename from gsmartcontrol/src/libdebug/dexcept.h
rename to src/libdebug/dexcept.h
diff --git a/gsmartcontrol/src/libdebug/dflags.cpp b/src/libdebug/dflags.cpp
similarity index 100%
rename from gsmartcontrol/src/libdebug/dflags.cpp
rename to src/libdebug/dflags.cpp
diff --git a/gsmartcontrol/src/libdebug/dflags.h b/src/libdebug/dflags.h
similarity index 100%
rename from gsmartcontrol/src/libdebug/dflags.h
rename to src/libdebug/dflags.h
diff --git a/gsmartcontrol/src/libdebug/dout.cpp b/src/libdebug/dout.cpp
similarity index 100%
rename from gsmartcontrol/src/libdebug/dout.cpp
rename to src/libdebug/dout.cpp
diff --git a/gsmartcontrol/src/libdebug/dout.h b/src/libdebug/dout.h
similarity index 100%
rename from gsmartcontrol/src/libdebug/dout.h
rename to src/libdebug/dout.h
diff --git a/gsmartcontrol/src/libdebug/dstate.cpp b/src/libdebug/dstate.cpp
similarity index 100%
rename from gsmartcontrol/src/libdebug/dstate.cpp
rename to src/libdebug/dstate.cpp
diff --git a/gsmartcontrol/src/libdebug/dstate.h b/src/libdebug/dstate.h
similarity index 100%
rename from gsmartcontrol/src/libdebug/dstate.h
rename to src/libdebug/dstate.h
diff --git a/gsmartcontrol/src/libdebug/dstate_pub.h b/src/libdebug/dstate_pub.h
similarity index 100%
rename from gsmartcontrol/src/libdebug/dstate_pub.h
rename to src/libdebug/dstate_pub.h
diff --git a/gsmartcontrol/src/libdebug/dstream.cpp b/src/libdebug/dstream.cpp
similarity index 100%
rename from gsmartcontrol/src/libdebug/dstream.cpp
rename to src/libdebug/dstream.cpp
diff --git a/gsmartcontrol/src/libdebug/dstream.h b/src/libdebug/dstream.h
similarity index 100%
rename from gsmartcontrol/src/libdebug/dstream.h
rename to src/libdebug/dstream.h
diff --git a/gsmartcontrol/src/libdebug/libdebug.h b/src/libdebug/libdebug.h
similarity index 100%
rename from gsmartcontrol/src/libdebug/libdebug.h
rename to src/libdebug/libdebug.h
diff --git a/gsmartcontrol/src/libdebug/libdebug_mini.h b/src/libdebug/libdebug_mini.h
similarity index 100%
rename from gsmartcontrol/src/libdebug/libdebug_mini.h
rename to src/libdebug/libdebug_mini.h
diff --git a/gsmartcontrol/src/libdebug/libdebug_test.cpp b/src/libdebug/libdebug_test.cpp
similarity index 100%
rename from gsmartcontrol/src/libdebug/libdebug_test.cpp
rename to src/libdebug/libdebug_test.cpp
diff --git a/gsmartcontrol/src/pcrecpp/Makefile.am b/src/pcrecpp/Makefile.am
similarity index 100%
rename from gsmartcontrol/src/pcrecpp/Makefile.am
rename to src/pcrecpp/Makefile.am
diff --git a/gsmartcontrol/src/pcrecpp/README b/src/pcrecpp/README
similarity index 100%
rename from gsmartcontrol/src/pcrecpp/README
rename to src/pcrecpp/README
diff --git a/gsmartcontrol/src/pcrecpp/pcre_scanner.cpp b/src/pcrecpp/pcre_scanner.cpp
similarity index 100%
rename from gsmartcontrol/src/pcrecpp/pcre_scanner.cpp
rename to src/pcrecpp/pcre_scanner.cpp
diff --git a/gsmartcontrol/src/pcrecpp/pcre_scanner.h b/src/pcrecpp/pcre_scanner.h
similarity index 100%
rename from gsmartcontrol/src/pcrecpp/pcre_scanner.h
rename to src/pcrecpp/pcre_scanner.h
diff --git a/gsmartcontrol/src/pcrecpp/pcre_stringpiece.cpp b/src/pcrecpp/pcre_stringpiece.cpp
similarity index 100%
rename from gsmartcontrol/src/pcrecpp/pcre_stringpiece.cpp
rename to src/pcrecpp/pcre_stringpiece.cpp
diff --git a/gsmartcontrol/src/pcrecpp/pcre_stringpiece.h b/src/pcrecpp/pcre_stringpiece.h
similarity index 100%
rename from gsmartcontrol/src/pcrecpp/pcre_stringpiece.h
rename to src/pcrecpp/pcre_stringpiece.h
diff --git a/gsmartcontrol/src/pcrecpp/pcrecpp.cc.orig_dist b/src/pcrecpp/pcrecpp.cc.orig_dist
similarity index 100%
rename from gsmartcontrol/src/pcrecpp/pcrecpp.cc.orig_dist
rename to src/pcrecpp/pcrecpp.cc.orig_dist
diff --git a/gsmartcontrol/src/pcrecpp/pcrecpp.cpp b/src/pcrecpp/pcrecpp.cpp
similarity index 100%
rename from gsmartcontrol/src/pcrecpp/pcrecpp.cpp
rename to src/pcrecpp/pcrecpp.cpp
diff --git a/gsmartcontrol/src/pcrecpp/pcrecpp.h b/src/pcrecpp/pcrecpp.h
similarity index 100%
rename from gsmartcontrol/src/pcrecpp/pcrecpp.h
rename to src/pcrecpp/pcrecpp.h
diff --git a/gsmartcontrol/src/pcrecpp/pcrecpp_internal.h b/src/pcrecpp/pcrecpp_internal.h
similarity index 100%
rename from gsmartcontrol/src/pcrecpp/pcrecpp_internal.h
rename to src/pcrecpp/pcrecpp_internal.h
diff --git a/gsmartcontrol/src/pcrecpp/pcrecpparg.h b/src/pcrecpp/pcrecpparg.h
similarity index 100%
rename from gsmartcontrol/src/pcrecpp/pcrecpparg.h
rename to src/pcrecpp/pcrecpparg.h
diff --git a/gsmartcontrol/src/rconfig/Makefile.am b/src/rconfig/Makefile.am
similarity index 100%
rename from gsmartcontrol/src/rconfig/Makefile.am
rename to src/rconfig/Makefile.am
diff --git a/gsmartcontrol/src/rconfig/rcautosave.h b/src/rconfig/rcautosave.h
similarity index 100%
rename from gsmartcontrol/src/rconfig/rcautosave.h
rename to src/rconfig/rcautosave.h
diff --git a/gsmartcontrol/src/rconfig/rcdump.h b/src/rconfig/rcdump.h
similarity index 100%
rename from gsmartcontrol/src/rconfig/rcdump.h
rename to src/rconfig/rcdump.h
diff --git a/gsmartcontrol/src/rconfig/rcloadsave.h b/src/rconfig/rcloadsave.h
similarity index 100%
rename from gsmartcontrol/src/rconfig/rcloadsave.h
rename to src/rconfig/rcloadsave.h
diff --git a/gsmartcontrol/src/rconfig/rcmain.h b/src/rconfig/rcmain.h
similarity index 100%
rename from gsmartcontrol/src/rconfig/rcmain.h
rename to src/rconfig/rcmain.h
diff --git a/gsmartcontrol/src/rconfig/rconfig.h b/src/rconfig/rconfig.h
similarity index 100%
rename from gsmartcontrol/src/rconfig/rconfig.h
rename to src/rconfig/rconfig.h
diff --git a/gsmartcontrol/src/rconfig/rconfig_mini.h b/src/rconfig/rconfig_mini.h
similarity index 100%
rename from gsmartcontrol/src/rconfig/rconfig_mini.h
rename to src/rconfig/rconfig_mini.h
diff --git a/gsmartcontrol/src/rconfig/rconfig_test.cpp b/src/rconfig/rconfig_test.cpp
similarity index 100%
rename from gsmartcontrol/src/rconfig/rconfig_test.cpp
rename to src/rconfig/rconfig_test.cpp
diff --git a/gsmartcontrol/src/res/Makefile.am b/src/res/Makefile.am
similarity index 100%
rename from gsmartcontrol/src/res/Makefile.am
rename to src/res/Makefile.am
diff --git a/gsmartcontrol/src/res/gsc_about_dialog.ui b/src/res/gsc_about_dialog.ui
similarity index 100%
rename from gsmartcontrol/src/res/gsc_about_dialog.ui
rename to src/res/gsc_about_dialog.ui
diff --git a/gsmartcontrol/src/res/gsc_add_device_window.ui b/src/res/gsc_add_device_window.ui
similarity index 100%
rename from gsmartcontrol/src/res/gsc_add_device_window.ui
rename to src/res/gsc_add_device_window.ui
diff --git a/gsmartcontrol/src/res/gsc_executor_log_window.ui b/src/res/gsc_executor_log_window.ui
similarity index 100%
rename from gsmartcontrol/src/res/gsc_executor_log_window.ui
rename to src/res/gsc_executor_log_window.ui
diff --git a/gsmartcontrol/src/res/gsc_help_window.ui b/src/res/gsc_help_window.ui
similarity index 100%
rename from gsmartcontrol/src/res/gsc_help_window.ui
rename to src/res/gsc_help_window.ui
diff --git a/gsmartcontrol/src/res/gsc_info_window.ui b/src/res/gsc_info_window.ui
similarity index 100%
rename from gsmartcontrol/src/res/gsc_info_window.ui
rename to src/res/gsc_info_window.ui
diff --git a/gsmartcontrol/src/res/gsc_main_window.ui b/src/res/gsc_main_window.ui
similarity index 100%
rename from gsmartcontrol/src/res/gsc_main_window.ui
rename to src/res/gsc_main_window.ui
diff --git a/gsmartcontrol/src/res/gsc_preferences_window.ui b/src/res/gsc_preferences_window.ui
similarity index 100%
rename from gsmartcontrol/src/res/gsc_preferences_window.ui
rename to src/res/gsc_preferences_window.ui
diff --git a/gsmartcontrol/src/res/gsc_text_window.ui b/src/res/gsc_text_window.ui
similarity index 100%
rename from gsmartcontrol/src/res/gsc_text_window.ui
rename to src/res/gsc_text_window.ui
diff --git a/gsmartcontrol/src/rmn/Makefile.am b/src/rmn/Makefile.am
similarity index 100%
rename from gsmartcontrol/src/rmn/Makefile.am
rename to src/rmn/Makefile.am
diff --git a/gsmartcontrol/src/rmn/resource_base.h b/src/rmn/resource_base.h
similarity index 100%
rename from gsmartcontrol/src/rmn/resource_base.h
rename to src/rmn/resource_base.h
diff --git a/gsmartcontrol/src/rmn/resource_data_any.h b/src/rmn/resource_data_any.h
similarity index 100%
rename from gsmartcontrol/src/rmn/resource_data_any.h
rename to src/rmn/resource_data_any.h
diff --git a/gsmartcontrol/src/rmn/resource_data_locking.h b/src/rmn/resource_data_locking.h
similarity index 100%
rename from gsmartcontrol/src/rmn/resource_data_locking.h
rename to src/rmn/resource_data_locking.h
diff --git a/gsmartcontrol/src/rmn/resource_data_one.h b/src/rmn/resource_data_one.h
similarity index 100%
rename from gsmartcontrol/src/rmn/resource_data_one.h
rename to src/rmn/resource_data_one.h
diff --git a/gsmartcontrol/src/rmn/resource_data_types.h b/src/rmn/resource_data_types.h
similarity index 100%
rename from gsmartcontrol/src/rmn/resource_data_types.h
rename to src/rmn/resource_data_types.h
diff --git a/gsmartcontrol/src/rmn/resource_exception.h b/src/rmn/resource_exception.h
similarity index 100%
rename from gsmartcontrol/src/rmn/resource_exception.h
rename to src/rmn/resource_exception.h
diff --git a/gsmartcontrol/src/rmn/resource_node.h b/src/rmn/resource_node.h
similarity index 100%
rename from gsmartcontrol/src/rmn/resource_node.h
rename to src/rmn/resource_node.h
diff --git a/gsmartcontrol/src/rmn/resource_node_dump.h b/src/rmn/resource_node_dump.h
similarity index 100%
rename from gsmartcontrol/src/rmn/resource_node_dump.h
rename to src/rmn/resource_node_dump.h
diff --git a/gsmartcontrol/src/rmn/resource_serialization.h b/src/rmn/resource_serialization.h
similarity index 100%
rename from gsmartcontrol/src/rmn/resource_serialization.h
rename to src/rmn/resource_serialization.h
diff --git a/gsmartcontrol/src/rmn/rmn.h b/src/rmn/rmn.h
similarity index 100%
rename from gsmartcontrol/src/rmn/rmn.h
rename to src/rmn/rmn.h
diff --git a/gsmartcontrol/src/rmn/rmn_test.cpp b/src/rmn/rmn_test.cpp
similarity index 100%
rename from gsmartcontrol/src/rmn/rmn_test.cpp
rename to src/rmn/rmn_test.cpp
diff --git a/gsmartcontrol/version.in b/version.in
similarity index 100%
rename from gsmartcontrol/version.in
rename to version.in