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/0test_binary.sh b/0test_binary.sh
similarity index 100%
rename from gsmartcontrol/0test_binary.sh
rename to 0test_binary.sh
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/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-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_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_var_func.m4 b/autoconf.m4/ac_cxx_var_func.m4
similarity index 100%
rename from gsmartcontrol/autoconf.m4/ac_cxx_var_func.m4
rename to autoconf.m4/ac_cxx_var_func.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/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/baqup b/baqup
similarity index 100%
rename from gsmartcontrol/baqup
rename to baqup
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.ac b/configure.ac
similarity index 100%
rename from gsmartcontrol/configure.ac
rename to configure.ac
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/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_gnome.desktop.in b/data/gsmartcontrol_gnome.desktop.in
similarity index 100%
rename from gsmartcontrol/data/gsmartcontrol_gnome.desktop.in
rename to data/gsmartcontrol_gnome.desktop.in
diff --git a/gsmartcontrol/data/gsmartcontrol_kde.desktop.in b/data/gsmartcontrol_kde.desktop.in
similarity index 100%
rename from gsmartcontrol/data/gsmartcontrol_kde.desktop.in
rename to data/gsmartcontrol_kde.desktop.in
diff --git a/gsmartcontrol/data/gsmartcontrol_other.desktop.in b/data/gsmartcontrol_other.desktop.in
similarity index 100%
rename from gsmartcontrol/data/gsmartcontrol_other.desktop.in
rename to data/gsmartcontrol_other.desktop.in
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/file2csource.sh b/file2csource.sh
similarity index 100%
rename from gsmartcontrol/file2csource.sh
rename to file2csource.sh
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_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/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/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.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/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_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_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/applib/wrapping_label.h b/src/applib/wrapping_label.h
similarity index 100%
rename from gsmartcontrol/src/applib/wrapping_label.h
rename to src/applib/wrapping_label.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_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/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/buffer.h b/src/hz/buffer.h
similarity index 100%
rename from gsmartcontrol/src/hz/buffer.h
rename to src/hz/buffer.h
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/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/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_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_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/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/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/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_format.h b/src/hz/string_format.h
similarity index 100%
rename from gsmartcontrol/src/hz/string_format.h
rename to src/hz/string_format.h
diff --git a/gsmartcontrol/src/hz/string_format_test.cpp b/src/hz/string_format_test.cpp
similarity index 100%
rename from gsmartcontrol/src/hz/string_format_test.cpp
rename to src/hz/string_format_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_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 b/src/pcrecpp/pcrecpp.cc.orig
similarity index 100%
rename from gsmartcontrol/src/pcrecpp/pcrecpp.cc.orig
rename to src/pcrecpp/pcrecpp.cc.orig
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/AUTHORS.txt.cpp b/src/res/AUTHORS.txt.cpp
similarity index 100%
rename from gsmartcontrol/src/res/AUTHORS.txt.cpp
rename to src/res/AUTHORS.txt.cpp
diff --git a/gsmartcontrol/src/res/LICENSE_gsmartcontrol.txt.cpp b/src/res/LICENSE_gsmartcontrol.txt.cpp
similarity index 100%
rename from gsmartcontrol/src/res/LICENSE_gsmartcontrol.txt.cpp
rename to src/res/LICENSE_gsmartcontrol.txt.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/README.txt.cpp b/src/res/README.txt.cpp
similarity index 100%
rename from gsmartcontrol/src/res/README.txt.cpp
rename to src/res/README.txt.cpp
diff --git a/gsmartcontrol/src/res/gsc_about_dialog.glade b/src/res/gsc_about_dialog.glade
similarity index 100%
rename from gsmartcontrol/src/res/gsc_about_dialog.glade
rename to src/res/gsc_about_dialog.glade
diff --git a/gsmartcontrol/src/res/gsc_about_dialog.glade.cpp b/src/res/gsc_about_dialog.glade.cpp
similarity index 100%
rename from gsmartcontrol/src/res/gsc_about_dialog.glade.cpp
rename to src/res/gsc_about_dialog.glade.cpp
diff --git a/gsmartcontrol/src/res/gsc_about_dialog.ui.cpp b/src/res/gsc_about_dialog.ui.cpp
similarity index 100%
rename from gsmartcontrol/src/res/gsc_about_dialog.ui.cpp
rename to src/res/gsc_about_dialog.ui.cpp
diff --git a/gsmartcontrol/src/res/gsc_executor_log_window.glade b/src/res/gsc_executor_log_window.glade
similarity index 100%
rename from gsmartcontrol/src/res/gsc_executor_log_window.glade
rename to src/res/gsc_executor_log_window.glade
diff --git a/gsmartcontrol/src/res/gsc_executor_log_window.glade.cpp b/src/res/gsc_executor_log_window.glade.cpp
similarity index 100%
rename from gsmartcontrol/src/res/gsc_executor_log_window.glade.cpp
rename to src/res/gsc_executor_log_window.glade.cpp
diff --git a/gsmartcontrol/src/res/gsc_executor_log_window.ui.cpp b/src/res/gsc_executor_log_window.ui.cpp
similarity index 100%
rename from gsmartcontrol/src/res/gsc_executor_log_window.ui.cpp
rename to src/res/gsc_executor_log_window.ui.cpp
diff --git a/gsmartcontrol/src/res/gsc_help_window.glade b/src/res/gsc_help_window.glade
similarity index 100%
rename from gsmartcontrol/src/res/gsc_help_window.glade
rename to src/res/gsc_help_window.glade
diff --git a/gsmartcontrol/src/res/gsc_help_window.glade.cpp b/src/res/gsc_help_window.glade.cpp
similarity index 100%
rename from gsmartcontrol/src/res/gsc_help_window.glade.cpp
rename to src/res/gsc_help_window.glade.cpp
diff --git a/gsmartcontrol/src/res/gsc_help_window.ui.cpp b/src/res/gsc_help_window.ui.cpp
similarity index 100%
rename from gsmartcontrol/src/res/gsc_help_window.ui.cpp
rename to src/res/gsc_help_window.ui.cpp
diff --git a/gsmartcontrol/src/res/gsc_info_window.glade b/src/res/gsc_info_window.glade
similarity index 100%
rename from gsmartcontrol/src/res/gsc_info_window.glade
rename to src/res/gsc_info_window.glade
diff --git a/gsmartcontrol/src/res/gsc_info_window.glade.cpp b/src/res/gsc_info_window.glade.cpp
similarity index 100%
rename from gsmartcontrol/src/res/gsc_info_window.glade.cpp
rename to src/res/gsc_info_window.glade.cpp
diff --git a/gsmartcontrol/src/res/gsc_info_window.ui.cpp b/src/res/gsc_info_window.ui.cpp
similarity index 100%
rename from gsmartcontrol/src/res/gsc_info_window.ui.cpp
rename to src/res/gsc_info_window.ui.cpp
diff --git a/gsmartcontrol/src/res/gsc_main_window.glade b/src/res/gsc_main_window.glade
similarity index 100%
rename from gsmartcontrol/src/res/gsc_main_window.glade
rename to src/res/gsc_main_window.glade
diff --git a/gsmartcontrol/src/res/gsc_main_window.glade.cpp b/src/res/gsc_main_window.glade.cpp
similarity index 100%
rename from gsmartcontrol/src/res/gsc_main_window.glade.cpp
rename to src/res/gsc_main_window.glade.cpp
diff --git a/gsmartcontrol/src/res/gsc_main_window.ui.cpp b/src/res/gsc_main_window.ui.cpp
similarity index 100%
rename from gsmartcontrol/src/res/gsc_main_window.ui.cpp
rename to src/res/gsc_main_window.ui.cpp
diff --git a/gsmartcontrol/src/res/gsc_preferences_window.glade b/src/res/gsc_preferences_window.glade
similarity index 100%
rename from gsmartcontrol/src/res/gsc_preferences_window.glade
rename to src/res/gsc_preferences_window.glade
diff --git a/gsmartcontrol/src/res/gsc_preferences_window.glade.cpp b/src/res/gsc_preferences_window.glade.cpp
similarity index 100%
rename from gsmartcontrol/src/res/gsc_preferences_window.glade.cpp
rename to src/res/gsc_preferences_window.glade.cpp
diff --git a/gsmartcontrol/src/res/gsc_preferences_window.ui.cpp b/src/res/gsc_preferences_window.ui.cpp
similarity index 100%
rename from gsmartcontrol/src/res/gsc_preferences_window.ui.cpp
rename to src/res/gsc_preferences_window.ui.cpp
diff --git a/gsmartcontrol/src/res/gsc_text_window.glade b/src/res/gsc_text_window.glade
similarity index 100%
rename from gsmartcontrol/src/res/gsc_text_window.glade
rename to src/res/gsc_text_window.glade
diff --git a/gsmartcontrol/src/res/gsc_text_window.glade.cpp b/src/res/gsc_text_window.glade.cpp
similarity index 100%
rename from gsmartcontrol/src/res/gsc_text_window.glade.cpp
rename to src/res/gsc_text_window.glade.cpp
diff --git a/gsmartcontrol/src/res/gsc_text_window.ui.cpp b/src/res/gsc_text_window.ui.cpp
similarity index 100%
rename from gsmartcontrol/src/res/gsc_text_window.ui.cpp
rename to src/res/gsc_text_window.ui.cpp
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_multi.h.notworing b/src/rmn/resource_data_multi.h.notworing
similarity index 100%
rename from gsmartcontrol/src/rmn/resource_data_multi.h.notworing
rename to src/rmn/resource_data_multi.h.notworing
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/templates/cc b/templates/cc
similarity index 100%
rename from gsmartcontrol/templates/cc
rename to templates/cc
diff --git a/gsmartcontrol/templates/hh b/templates/hh
similarity index 100%
rename from gsmartcontrol/templates/hh
rename to templates/hh
diff --git a/gsmartcontrol/test-data/actions/sda_long_testing b/test-data/actions/sda_long_testing
similarity index 100%
rename from gsmartcontrol/test-data/actions/sda_long_testing
rename to test-data/actions/sda_long_testing
diff --git a/gsmartcontrol/test-data/actions/sda_long_testing_caps b/test-data/actions/sda_long_testing_caps
similarity index 100%
rename from gsmartcontrol/test-data/actions/sda_long_testing_caps
rename to test-data/actions/sda_long_testing_caps
diff --git a/gsmartcontrol/test-data/actions/sda_nopermission b/test-data/actions/sda_nopermission
similarity index 100%
rename from gsmartcontrol/test-data/actions/sda_nopermission
rename to test-data/actions/sda_nopermission
diff --git a/gsmartcontrol/test-data/actions/sda_testing b/test-data/actions/sda_testing
similarity index 100%
rename from gsmartcontrol/test-data/actions/sda_testing
rename to test-data/actions/sda_testing
diff --git a/gsmartcontrol/test-data/actions/sdb_abort b/test-data/actions/sdb_abort
similarity index 100%
rename from gsmartcontrol/test-data/actions/sdb_abort
rename to test-data/actions/sdb_abort
diff --git a/gsmartcontrol/test-data/actions/sdb_testing_cap b/test-data/actions/sdb_testing_cap
similarity index 100%
rename from gsmartcontrol/test-data/actions/sdb_testing_cap
rename to test-data/actions/sdb_testing_cap
diff --git a/gsmartcontrol/test-data/actions/sea_start_long_test.37 b/test-data/actions/sea_start_long_test.37
similarity index 100%
rename from gsmartcontrol/test-data/actions/sea_start_long_test.37
rename to test-data/actions/sea_start_long_test.37
diff --git a/gsmartcontrol/test-data/actions/sea_start_long_test.39 b/test-data/actions/sea_start_long_test.39
similarity index 100%
rename from gsmartcontrol/test-data/actions/sea_start_long_test.39
rename to test-data/actions/sea_start_long_test.39
diff --git a/gsmartcontrol/test-data/mine/cdrw_ide-a.37.uns b/test-data/mine/cdrw_ide-a.37.uns
similarity index 100%
rename from gsmartcontrol/test-data/mine/cdrw_ide-a.37.uns
rename to test-data/mine/cdrw_ide-a.37.uns
diff --git a/gsmartcontrol/test-data/mine/cdrw_ide-i.37.uns b/test-data/mine/cdrw_ide-i.37.uns
similarity index 100%
rename from gsmartcontrol/test-data/mine/cdrw_ide-i.37.uns
rename to test-data/mine/cdrw_ide-i.37.uns
diff --git a/gsmartcontrol/test-data/mine/dvd_ide-a.37.uns b/test-data/mine/dvd_ide-a.37.uns
similarity index 100%
rename from gsmartcontrol/test-data/mine/dvd_ide-a.37.uns
rename to test-data/mine/dvd_ide-a.37.uns
diff --git a/gsmartcontrol/test-data/mine/dvd_ide-i.37.uns b/test-data/mine/dvd_ide-i.37.uns
similarity index 100%
rename from gsmartcontrol/test-data/mine/dvd_ide-i.37.uns
rename to test-data/mine/dvd_ide-i.37.uns
diff --git a/gsmartcontrol/test-data/mine/flash_usb_transcend-a.37 b/test-data/mine/flash_usb_transcend-a.37
similarity index 100%
rename from gsmartcontrol/test-data/mine/flash_usb_transcend-a.37
rename to test-data/mine/flash_usb_transcend-a.37
diff --git a/gsmartcontrol/test-data/mine/flash_usb_transcend-i.37 b/test-data/mine/flash_usb_transcend-i.37
similarity index 100%
rename from gsmartcontrol/test-data/mine/flash_usb_transcend-i.37
rename to test-data/mine/flash_usb_transcend-i.37
diff --git a/gsmartcontrol/test-data/mine/raid_elka-a.37.uns b/test-data/mine/raid_elka-a.37.uns
similarity index 100%
rename from gsmartcontrol/test-data/mine/raid_elka-a.37.uns
rename to test-data/mine/raid_elka-a.37.uns
diff --git a/gsmartcontrol/test-data/mine/samsP120_250M_mighty-a.37 b/test-data/mine/samsP120_250M_mighty-a.37
similarity index 100%
rename from gsmartcontrol/test-data/mine/samsP120_250M_mighty-a.37
rename to test-data/mine/samsP120_250M_mighty-a.37
diff --git a/gsmartcontrol/test-data/mine/sea10K.7_scsi_bil-a.1-11.uns b/test-data/mine/sea10K.7_scsi_bil-a.1-11.uns
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea10K.7_scsi_bil-a.1-11.uns
rename to test-data/mine/sea10K.7_scsi_bil-a.1-11.uns
diff --git a/gsmartcontrol/test-data/mine/sea7200.10_250G_mighty-a.37 b/test-data/mine/sea7200.10_250G_mighty-a.37
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.10_250G_mighty-a.37
rename to test-data/mine/sea7200.10_250G_mighty-a.37
diff --git a/gsmartcontrol/test-data/mine/sea7200.10_500G_my-a.37 b/test-data/mine/sea7200.10_500G_my-a.37
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.10_500G_my-a.37
rename to test-data/mine/sea7200.10_500G_my-a.37
diff --git a/gsmartcontrol/test-data/mine/sea7200.10_500G_my-a.37.smrt_dis b/test-data/mine/sea7200.10_500G_my-a.37.smrt_dis
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.10_500G_my-a.37.smrt_dis
rename to test-data/mine/sea7200.10_500G_my-a.37.smrt_dis
diff --git a/gsmartcontrol/test-data/mine/sea7200.10_500G_my-i.37 b/test-data/mine/sea7200.10_500G_my-i.37
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.10_500G_my-i.37
rename to test-data/mine/sea7200.10_500G_my-i.37
diff --git a/gsmartcontrol/test-data/mine/sea7200.11_1T_my-a.37 b/test-data/mine/sea7200.11_1T_my-a.37
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.11_1T_my-a.37
rename to test-data/mine/sea7200.11_1T_my-a.37
diff --git a/gsmartcontrol/test-data/mine/sea7200.11_1T_my-a.38 b/test-data/mine/sea7200.11_1T_my-a.38
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.11_1T_my-a.38
rename to test-data/mine/sea7200.11_1T_my-a.38
diff --git a/gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.1-01 b/test-data/mine/sea7200.11_1T_my-d_ata-a.1-01
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.1-01
rename to test-data/mine/sea7200.11_1T_my-d_ata-a.1-01
diff --git a/gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.1-04 b/test-data/mine/sea7200.11_1T_my-d_ata-a.1-04
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.1-04
rename to test-data/mine/sea7200.11_1T_my-d_ata-a.1-04
diff --git a/gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.1-07 b/test-data/mine/sea7200.11_1T_my-d_ata-a.1-07
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.1-07
rename to test-data/mine/sea7200.11_1T_my-d_ata-a.1-07
diff --git a/gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.1-09 b/test-data/mine/sea7200.11_1T_my-d_ata-a.1-09
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.1-09
rename to test-data/mine/sea7200.11_1T_my-d_ata-a.1-09
diff --git a/gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.1-10 b/test-data/mine/sea7200.11_1T_my-d_ata-a.1-10
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.1-10
rename to test-data/mine/sea7200.11_1T_my-d_ata-a.1-10
diff --git a/gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.1-11 b/test-data/mine/sea7200.11_1T_my-d_ata-a.1-11
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.1-11
rename to test-data/mine/sea7200.11_1T_my-d_ata-a.1-11
diff --git a/gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.1-14 b/test-data/mine/sea7200.11_1T_my-d_ata-a.1-14
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.1-14
rename to test-data/mine/sea7200.11_1T_my-d_ata-a.1-14
diff --git a/gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.1-16 b/test-data/mine/sea7200.11_1T_my-d_ata-a.1-16
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.1-16
rename to test-data/mine/sea7200.11_1T_my-d_ata-a.1-16
diff --git a/gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.1-18 b/test-data/mine/sea7200.11_1T_my-d_ata-a.1-18
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.1-18
rename to test-data/mine/sea7200.11_1T_my-d_ata-a.1-18
diff --git a/gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.20 b/test-data/mine/sea7200.11_1T_my-d_ata-a.20
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.20
rename to test-data/mine/sea7200.11_1T_my-d_ata-a.20
diff --git a/gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.21 b/test-data/mine/sea7200.11_1T_my-d_ata-a.21
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.21
rename to test-data/mine/sea7200.11_1T_my-d_ata-a.21
diff --git a/gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.23 b/test-data/mine/sea7200.11_1T_my-d_ata-a.23
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.23
rename to test-data/mine/sea7200.11_1T_my-d_ata-a.23
diff --git a/gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.25 b/test-data/mine/sea7200.11_1T_my-d_ata-a.25
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.25
rename to test-data/mine/sea7200.11_1T_my-d_ata-a.25
diff --git a/gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.26 b/test-data/mine/sea7200.11_1T_my-d_ata-a.26
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.26
rename to test-data/mine/sea7200.11_1T_my-d_ata-a.26
diff --git a/gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.29 b/test-data/mine/sea7200.11_1T_my-d_ata-a.29
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.29
rename to test-data/mine/sea7200.11_1T_my-d_ata-a.29
diff --git a/gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.30 b/test-data/mine/sea7200.11_1T_my-d_ata-a.30
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.30
rename to test-data/mine/sea7200.11_1T_my-d_ata-a.30
diff --git a/gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.31 b/test-data/mine/sea7200.11_1T_my-d_ata-a.31
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.31
rename to test-data/mine/sea7200.11_1T_my-d_ata-a.31
diff --git a/gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.32 b/test-data/mine/sea7200.11_1T_my-d_ata-a.32
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.32
rename to test-data/mine/sea7200.11_1T_my-d_ata-a.32
diff --git a/gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.33 b/test-data/mine/sea7200.11_1T_my-d_ata-a.33
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.33
rename to test-data/mine/sea7200.11_1T_my-d_ata-a.33
diff --git a/gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.36 b/test-data/mine/sea7200.11_1T_my-d_ata-a.36
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.11_1T_my-d_ata-a.36
rename to test-data/mine/sea7200.11_1T_my-d_ata-a.36
diff --git a/gsmartcontrol/test-data/mine/sea7200.11_1T_my-i.37 b/test-data/mine/sea7200.11_1T_my-i.37
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.11_1T_my-i.37
rename to test-data/mine/sea7200.11_1T_my-i.37
diff --git a/gsmartcontrol/test-data/mine/sea7200.7_200G_my-a.37.errors b/test-data/mine/sea7200.7_200G_my-a.37.errors
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.7_200G_my-a.37.errors
rename to test-data/mine/sea7200.7_200G_my-a.37.errors
diff --git a/gsmartcontrol/test-data/mine/sea7200.7_80G_ide_zura-a.30 b/test-data/mine/sea7200.7_80G_ide_zura-a.30
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.7_80G_ide_zura-a.30
rename to test-data/mine/sea7200.7_80G_ide_zura-a.30
diff --git a/gsmartcontrol/test-data/mine/sea7200.7_80G_ide_zura-a.37.smrt_dis b/test-data/mine/sea7200.7_80G_ide_zura-a.37.smrt_dis
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.7_80G_ide_zura-a.37.smrt_dis
rename to test-data/mine/sea7200.7_80G_ide_zura-a.37.smrt_dis
diff --git a/gsmartcontrol/test-data/mine/sea7200.7_80G_kolesn-a.37.errors b/test-data/mine/sea7200.7_80G_kolesn-a.37.errors
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.7_80G_kolesn-a.37.errors
rename to test-data/mine/sea7200.7_80G_kolesn-a.37.errors
diff --git a/gsmartcontrol/test-data/mine/sea7200.9_sata_worm-a.37_smrt_dis b/test-data/mine/sea7200.9_sata_worm-a.37_smrt_dis
similarity index 100%
rename from gsmartcontrol/test-data/mine/sea7200.9_sata_worm-a.37_smrt_dis
rename to test-data/mine/sea7200.9_sata_worm-a.37_smrt_dis
diff --git a/gsmartcontrol/test-data/mine/wdc_80G_ide_pechkin-a.37 b/test-data/mine/wdc_80G_ide_pechkin-a.37
similarity index 100%
rename from gsmartcontrol/test-data/mine/wdc_80G_ide_pechkin-a.37
rename to test-data/mine/wdc_80G_ide_pechkin-a.37
diff --git a/gsmartcontrol/test-data/mine/wdcse_250G_iset-a.37.failed_attr b/test-data/mine/wdcse_250G_iset-a.37.failed_attr
similarity index 100%
rename from gsmartcontrol/test-data/mine/wdcse_250G_iset-a.37.failed_attr
rename to test-data/mine/wdcse_250G_iset-a.37.failed_attr
diff --git a/gsmartcontrol/test-data/mine/wdcse_250G_iset-a.37.failing_attr b/test-data/mine/wdcse_250G_iset-a.37.failing_attr
similarity index 100%
rename from gsmartcontrol/test-data/mine/wdcse_250G_iset-a.37.failing_attr
rename to test-data/mine/wdcse_250G_iset-a.37.failing_attr
diff --git a/gsmartcontrol/test-data/run_tests.sh b/test-data/run_tests.sh
similarity index 100%
rename from gsmartcontrol/test-data/run_tests.sh
rename to test-data/run_tests.sh
diff --git a/gsmartcontrol/test-data/smartmon-mail/FUJITSU MHW2080BH PL.txt b/test-data/smartmon-mail/FUJITSU MHW2080BH PL.txt
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-mail/FUJITSU MHW2080BH PL.txt
rename to test-data/smartmon-mail/FUJITSU MHW2080BH PL.txt
diff --git a/gsmartcontrol/test-data/smartmon-mail/FUJITSU MHY2120BH.txt b/test-data/smartmon-mail/FUJITSU MHY2120BH.txt
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-mail/FUJITSU MHY2120BH.txt
rename to test-data/smartmon-mail/FUJITSU MHY2120BH.txt
diff --git a/gsmartcontrol/test-data/smartmon-mail/Hitachi HDT725025VLA380.txt b/test-data/smartmon-mail/Hitachi HDT725025VLA380.txt
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-mail/Hitachi HDT725025VLA380.txt
rename to test-data/smartmon-mail/Hitachi HDT725025VLA380.txt
diff --git a/gsmartcontrol/test-data/smartmon-mail/Hitachi HDT725050VLA360.txt b/test-data/smartmon-mail/Hitachi HDT725050VLA360.txt
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-mail/Hitachi HDT725050VLA360.txt
rename to test-data/smartmon-mail/Hitachi HDT725050VLA360.txt
diff --git a/gsmartcontrol/test-data/smartmon-mail/Hitachi HTS721080G9SA00.txt.funkybytes b/test-data/smartmon-mail/Hitachi HTS721080G9SA00.txt.funkybytes
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-mail/Hitachi HTS721080G9SA00.txt.funkybytes
rename to test-data/smartmon-mail/Hitachi HTS721080G9SA00.txt.funkybytes
diff --git a/gsmartcontrol/test-data/smartmon-mail/MAXTOR STM3320620AS.txt b/test-data/smartmon-mail/MAXTOR STM3320620AS.txt
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-mail/MAXTOR STM3320620AS.txt
rename to test-data/smartmon-mail/MAXTOR STM3320620AS.txt
diff --git a/gsmartcontrol/test-data/smartmon-mail/SAMSUNG SP80A4H.txt.extrawarn b/test-data/smartmon-mail/SAMSUNG SP80A4H.txt.extrawarn
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-mail/SAMSUNG SP80A4H.txt.extrawarn
rename to test-data/smartmon-mail/SAMSUNG SP80A4H.txt.extrawarn
diff --git a/gsmartcontrol/test-data/smartmon-mail/ST32120A.smartctl-a-Tpermissive.txt.reallyold b/test-data/smartmon-mail/ST32120A.smartctl-a-Tpermissive.txt.reallyold
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-mail/ST32120A.smartctl-a-Tpermissive.txt.reallyold
rename to test-data/smartmon-mail/ST32120A.smartctl-a-Tpermissive.txt.reallyold
diff --git a/gsmartcontrol/test-data/smartmon-mail/ST3500630AS.txt b/test-data/smartmon-mail/ST3500630AS.txt
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-mail/ST3500630AS.txt
rename to test-data/smartmon-mail/ST3500630AS.txt
diff --git a/gsmartcontrol/test-data/smartmon-mail/ST3500630SV.txt b/test-data/smartmon-mail/ST3500630SV.txt
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-mail/ST3500630SV.txt
rename to test-data/smartmon-mail/ST3500630SV.txt
diff --git a/gsmartcontrol/test-data/smartmon-mail/ST380819AS.txt b/test-data/smartmon-mail/ST380819AS.txt
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-mail/ST380819AS.txt
rename to test-data/smartmon-mail/ST380819AS.txt
diff --git a/gsmartcontrol/test-data/smartmon-mail/WDC WD3000GLFS-01F8U0.txt b/test-data/smartmon-mail/WDC WD3000GLFS-01F8U0.txt
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-mail/WDC WD3000GLFS-01F8U0.txt
rename to test-data/smartmon-mail/WDC WD3000GLFS-01F8U0.txt
diff --git a/gsmartcontrol/test-data/smartmon-mail/WDC WD3200BEVT-22ZCT0.txt b/test-data/smartmon-mail/WDC WD3200BEVT-22ZCT0.txt
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-mail/WDC WD3200BEVT-22ZCT0.txt
rename to test-data/smartmon-mail/WDC WD3200BEVT-22ZCT0.txt
diff --git a/gsmartcontrol/test-data/smartmon-mail/WDC WD5002ABYS-01B1B0.txt b/test-data/smartmon-mail/WDC WD5002ABYS-01B1B0.txt
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-mail/WDC WD5002ABYS-01B1B0.txt
rename to test-data/smartmon-mail/WDC WD5002ABYS-01B1B0.txt
diff --git a/gsmartcontrol/test-data/smartmon-site/FUJITSU1.txt.health_failed b/test-data/smartmon-site/FUJITSU1.txt.health_failed
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-site/FUJITSU1.txt.health_failed
rename to test-data/smartmon-site/FUJITSU1.txt.health_failed
diff --git a/gsmartcontrol/test-data/smartmon-site/FUJITSU_MHR2020AT.txt.health_failed b/test-data/smartmon-site/FUJITSU_MHR2020AT.txt.health_failed
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-site/FUJITSU_MHR2020AT.txt.health_failed
rename to test-data/smartmon-site/FUJITSU_MHR2020AT.txt.health_failed
diff --git a/gsmartcontrol/test-data/smartmon-site/HITACHI_DK23AA-12B.txt.health_failed b/test-data/smartmon-site/HITACHI_DK23AA-12B.txt.health_failed
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-site/HITACHI_DK23AA-12B.txt.health_failed
rename to test-data/smartmon-site/HITACHI_DK23AA-12B.txt.health_failed
diff --git a/gsmartcontrol/test-data/smartmon-site/HITACHI_DK23BA-20-0.txt b/test-data/smartmon-site/HITACHI_DK23BA-20-0.txt
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-site/HITACHI_DK23BA-20-0.txt
rename to test-data/smartmon-site/HITACHI_DK23BA-20-0.txt
diff --git a/gsmartcontrol/test-data/smartmon-site/IC35L120AVV207-0.txt b/test-data/smartmon-site/IC35L120AVV207-0.txt
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-site/IC35L120AVV207-0.txt
rename to test-data/smartmon-site/IC35L120AVV207-0.txt
diff --git a/gsmartcontrol/test-data/smartmon-site/IC35L120AVV207-1.txt b/test-data/smartmon-site/IC35L120AVV207-1.txt
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-site/IC35L120AVV207-1.txt
rename to test-data/smartmon-site/IC35L120AVV207-1.txt
diff --git a/gsmartcontrol/test-data/smartmon-site/IC35L120AVVA07-0-0.txt b/test-data/smartmon-site/IC35L120AVVA07-0-0.txt
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-site/IC35L120AVVA07-0-0.txt
rename to test-data/smartmon-site/IC35L120AVVA07-0-0.txt
diff --git a/gsmartcontrol/test-data/smartmon-site/IC35L120AVVA07-0-1.txt b/test-data/smartmon-site/IC35L120AVVA07-0-1.txt
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-site/IC35L120AVVA07-0-1.txt
rename to test-data/smartmon-site/IC35L120AVVA07-0-1.txt
diff --git a/gsmartcontrol/test-data/smartmon-site/MAXTOR-0.txt b/test-data/smartmon-site/MAXTOR-0.txt
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-site/MAXTOR-0.txt
rename to test-data/smartmon-site/MAXTOR-0.txt
diff --git a/gsmartcontrol/test-data/smartmon-site/MAXTOR-1.txt.health_failed b/test-data/smartmon-site/MAXTOR-1.txt.health_failed
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-site/MAXTOR-1.txt.health_failed
rename to test-data/smartmon-site/MAXTOR-1.txt.health_failed
diff --git a/gsmartcontrol/test-data/smartmon-site/MAXTOR-10.txt b/test-data/smartmon-site/MAXTOR-10.txt
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-site/MAXTOR-10.txt
rename to test-data/smartmon-site/MAXTOR-10.txt
diff --git a/gsmartcontrol/test-data/smartmon-site/MAXTOR-2.txt b/test-data/smartmon-site/MAXTOR-2.txt
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-site/MAXTOR-2.txt
rename to test-data/smartmon-site/MAXTOR-2.txt
diff --git a/gsmartcontrol/test-data/smartmon-site/MAXTOR-3.txt b/test-data/smartmon-site/MAXTOR-3.txt
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-site/MAXTOR-3.txt
rename to test-data/smartmon-site/MAXTOR-3.txt
diff --git a/gsmartcontrol/test-data/smartmon-site/MAXTOR-4.txt b/test-data/smartmon-site/MAXTOR-4.txt
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-site/MAXTOR-4.txt
rename to test-data/smartmon-site/MAXTOR-4.txt
diff --git a/gsmartcontrol/test-data/smartmon-site/MAXTOR-6.txt.old_error_fmt b/test-data/smartmon-site/MAXTOR-6.txt.old_error_fmt
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-site/MAXTOR-6.txt.old_error_fmt
rename to test-data/smartmon-site/MAXTOR-6.txt.old_error_fmt
diff --git a/gsmartcontrol/test-data/smartmon-site/MAXTOR-7.txt.health_failed b/test-data/smartmon-site/MAXTOR-7.txt.health_failed
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-site/MAXTOR-7.txt.health_failed
rename to test-data/smartmon-site/MAXTOR-7.txt.health_failed
diff --git a/gsmartcontrol/test-data/smartmon-site/MAXTOR-8.txt.health_failed b/test-data/smartmon-site/MAXTOR-8.txt.health_failed
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-site/MAXTOR-8.txt.health_failed
rename to test-data/smartmon-site/MAXTOR-8.txt.health_failed
diff --git a/gsmartcontrol/test-data/smartmon-site/MAXTOR-9.txt.health_failed b/test-data/smartmon-site/MAXTOR-9.txt.health_failed
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-site/MAXTOR-9.txt.health_failed
rename to test-data/smartmon-site/MAXTOR-9.txt.health_failed
diff --git a/gsmartcontrol/test-data/smartmon-site/Maxtor-5.txt b/test-data/smartmon-site/Maxtor-5.txt
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-site/Maxtor-5.txt
rename to test-data/smartmon-site/Maxtor-5.txt
diff --git a/gsmartcontrol/test-data/smartmon-site/ST910021AS.txt.health_failed b/test-data/smartmon-site/ST910021AS.txt.health_failed
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-site/ST910021AS.txt.health_failed
rename to test-data/smartmon-site/ST910021AS.txt.health_failed
diff --git a/gsmartcontrol/test-data/smartmon-site/TOSHIBA-0.txt b/test-data/smartmon-site/TOSHIBA-0.txt
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-site/TOSHIBA-0.txt
rename to test-data/smartmon-site/TOSHIBA-0.txt
diff --git a/gsmartcontrol/test-data/smartmon-site/TOSHIBA-MK6021GAS.txt b/test-data/smartmon-site/TOSHIBA-MK6021GAS.txt
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-site/TOSHIBA-MK6021GAS.txt
rename to test-data/smartmon-site/TOSHIBA-MK6021GAS.txt
diff --git a/gsmartcontrol/test-data/smartmon-site/WD2500JB.txt.health_failed b/test-data/smartmon-site/WD2500JB.txt.health_failed
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-site/WD2500JB.txt.health_failed
rename to test-data/smartmon-site/WD2500JB.txt.health_failed
diff --git a/gsmartcontrol/test-data/smartmon-site/WD800JD.txt.funky_attrs b/test-data/smartmon-site/WD800JD.txt.funky_attrs
similarity index 100%
rename from gsmartcontrol/test-data/smartmon-site/WD800JD.txt.funky_attrs
rename to test-data/smartmon-site/WD800JD.txt.funky_attrs
diff --git a/gsmartcontrol/version.in b/version.in
similarity index 100%
rename from gsmartcontrol/version.in
rename to version.in