diff --git a/doc/kiosktool/Makefile.am b/doc/kiostdetool/Makefile.am
similarity index 100%
rename from doc/kiosktool/Makefile.am
rename to doc/kiostdetool/Makefile.am
diff --git a/doc/kiosktool/extra-steps.docbook b/doc/kiostdetool/extra-steps.docbook
similarity index 100%
rename from doc/kiosktool/extra-steps.docbook
rename to doc/kiostdetool/extra-steps.docbook
diff --git a/doc/kiosktool/index.docbook b/doc/kiostdetool/index.docbook
similarity index 100%
rename from doc/kiosktool/index.docbook
rename to doc/kiostdetool/index.docbook
diff --git a/doc/kiosktool/introduction.docbook b/doc/kiostdetool/introduction.docbook
similarity index 100%
rename from doc/kiosktool/introduction.docbook
rename to doc/kiostdetool/introduction.docbook
diff --git a/doc/kiosktool/profile-assign.docbook b/doc/kiostdetool/profile-assign.docbook
similarity index 100%
rename from doc/kiosktool/profile-assign.docbook
rename to doc/kiostdetool/profile-assign.docbook
diff --git a/doc/kiosktool/profile-create.docbook b/doc/kiostdetool/profile-create.docbook
similarity index 100%
rename from doc/kiosktool/profile-create.docbook
rename to doc/kiostdetool/profile-create.docbook
diff --git a/doc/kiosktool/profile-setup.docbook b/doc/kiostdetool/profile-setup.docbook
similarity index 100%
rename from doc/kiosktool/profile-setup.docbook
rename to doc/kiostdetool/profile-setup.docbook
diff --git a/doc/kiosktool/profiles.docbook b/doc/kiostdetool/profiles.docbook
similarity index 100%
rename from doc/kiosktool/profiles.docbook
rename to doc/kiostdetool/profiles.docbook
diff --git a/doc/kiosktool/settings.docbook b/doc/kiostdetool/settings.docbook
similarity index 100%
rename from doc/kiosktool/settings.docbook
rename to doc/kiostdetool/settings.docbook
diff --git a/kiosktool/Makefile.am b/kiostdetool/Makefile.am
similarity index 100%
rename from kiosktool/Makefile.am
rename to kiostdetool/Makefile.am
diff --git a/kiosktool/background.png b/kiostdetool/background.png
similarity index 100%
rename from kiosktool/background.png
rename to kiostdetool/background.png
diff --git a/kiosktool/caption-da.png b/kiostdetool/caption-da.png
similarity index 100%
rename from kiosktool/caption-da.png
rename to kiostdetool/caption-da.png
diff --git a/kiosktool/caption-empty.png b/kiostdetool/caption-empty.png
similarity index 100%
rename from kiosktool/caption-empty.png
rename to kiostdetool/caption-empty.png
diff --git a/kiosktool/caption-et.png b/kiostdetool/caption-et.png
similarity index 100%
rename from kiosktool/caption-et.png
rename to kiostdetool/caption-et.png
diff --git a/kiosktool/caption-pt.png b/kiostdetool/caption-pt.png
similarity index 100%
rename from kiosktool/caption-pt.png
rename to kiostdetool/caption-pt.png
diff --git a/kiosktool/caption-pt_BR.png b/kiostdetool/caption-pt_BR.png
similarity index 100%
rename from kiosktool/caption-pt_BR.png
rename to kiostdetool/caption-pt_BR.png
diff --git a/kiosktool/caption-sv.png b/kiostdetool/caption-sv.png
similarity index 100%
rename from kiosktool/caption-sv.png
rename to kiostdetool/caption-sv.png
diff --git a/kiosktool/caption.png b/kiostdetool/caption.png
similarity index 100%
rename from kiosktool/caption.png
rename to kiostdetool/caption.png
diff --git a/kiosktool/component.cpp b/kiostdetool/component.cpp
similarity index 100%
rename from kiosktool/component.cpp
rename to kiostdetool/component.cpp
diff --git a/kiosktool/component.h b/kiostdetool/component.h
similarity index 100%
rename from kiosktool/component.h
rename to kiostdetool/component.h
diff --git a/kiosktool/componentPage.cpp b/kiostdetool/componentPage.cpp
similarity index 100%
rename from kiosktool/componentPage.cpp
rename to kiostdetool/componentPage.cpp
diff --git a/kiosktool/componentPage.h b/kiostdetool/componentPage.h
similarity index 100%
rename from kiosktool/componentPage.h
rename to kiostdetool/componentPage.h
diff --git a/kiosktool/componentPage_ui.ui b/kiostdetool/componentPage_ui.ui
similarity index 100%
rename from kiosktool/componentPage_ui.ui
rename to kiostdetool/componentPage_ui.ui
diff --git a/kiosktool/componentSelectionPage.cpp b/kiostdetool/componentSelectionPage.cpp
similarity index 100%
rename from kiosktool/componentSelectionPage.cpp
rename to kiostdetool/componentSelectionPage.cpp
diff --git a/kiosktool/componentSelectionPage.h b/kiostdetool/componentSelectionPage.h
similarity index 100%
rename from kiosktool/componentSelectionPage.h
rename to kiostdetool/componentSelectionPage.h
diff --git a/kiosktool/componentSelectionPage_ui.ui b/kiostdetool/componentSelectionPage_ui.ui
similarity index 100%
rename from kiosktool/componentSelectionPage_ui.ui
rename to kiostdetool/componentSelectionPage_ui.ui
diff --git a/kiosktool/configure.in.in b/kiostdetool/configure.in.in
similarity index 100%
rename from kiosktool/configure.in.in
rename to kiostdetool/configure.in.in
diff --git a/kiosktool/cr16-app-kiosktool.png b/kiostdetool/cr16-app-kiostdetool.png
similarity index 100%
rename from kiosktool/cr16-app-kiosktool.png
rename to kiostdetool/cr16-app-kiostdetool.png
diff --git a/kiosktool/cr32-app-kiosktool.png b/kiostdetool/cr32-app-kiostdetool.png
similarity index 100%
rename from kiosktool/cr32-app-kiosktool.png
rename to kiostdetool/cr32-app-kiostdetool.png
diff --git a/kiosktool/cr48-app-kiosktool.png b/kiostdetool/cr48-app-kiostdetool.png
similarity index 100%
rename from kiosktool/cr48-app-kiosktool.png
rename to kiostdetool/cr48-app-kiostdetool.png
diff --git a/kiosktool/desktopComponent.cpp b/kiostdetool/desktopComponent.cpp
similarity index 100%
rename from kiosktool/desktopComponent.cpp
rename to kiostdetool/desktopComponent.cpp
diff --git a/kiosktool/desktopComponent.h b/kiostdetool/desktopComponent.h
similarity index 100%
rename from kiosktool/desktopComponent.h
rename to kiostdetool/desktopComponent.h
diff --git a/kiosktool/extractxml b/kiostdetool/extractxml
similarity index 100%
rename from kiosktool/extractxml
rename to kiostdetool/extractxml
diff --git a/kiosktool/filetypeeditComponent.cpp b/kiostdetool/filetypeeditComponent.cpp
similarity index 100%
rename from kiosktool/filetypeeditComponent.cpp
rename to kiostdetool/filetypeeditComponent.cpp
diff --git a/kiosktool/filetypeeditComponent.h b/kiostdetool/filetypeeditComponent.h
similarity index 100%
rename from kiosktool/filetypeeditComponent.h
rename to kiostdetool/filetypeeditComponent.h
diff --git a/kiosktool/kcms/Makefile.am b/kiostdetool/kcms/Makefile.am
similarity index 100%
rename from kiosktool/kcms/Makefile.am
rename to kiostdetool/kcms/Makefile.am
diff --git a/kiosktool/kcms/autostart/Makefile.am b/kiostdetool/kcms/autostart/Makefile.am
similarity index 100%
rename from kiosktool/kcms/autostart/Makefile.am
rename to kiostdetool/kcms/autostart/Makefile.am
diff --git a/kiosktool/kcms/autostart/kcmautostart.cpp b/kiostdetool/kcms/autostart/kcmautostart.cpp
similarity index 100%
rename from kiosktool/kcms/autostart/kcmautostart.cpp
rename to kiostdetool/kcms/autostart/kcmautostart.cpp
diff --git a/kiosktool/kcms/autostart/kcmautostart.desktop b/kiostdetool/kcms/autostart/kcmautostart.desktop
similarity index 100%
rename from kiosktool/kcms/autostart/kcmautostart.desktop
rename to kiostdetool/kcms/autostart/kcmautostart.desktop
diff --git a/kiosktool/kcms/autostart/kcmautostart.h b/kiostdetool/kcms/autostart/kcmautostart.h
similarity index 100%
rename from kiosktool/kcms/autostart/kcmautostart.h
rename to kiostdetool/kcms/autostart/kcmautostart.h
diff --git a/kiosktool/kioskConfigDialog.cpp b/kiostdetool/kioskConfigDialog.cpp
similarity index 100%
rename from kiosktool/kioskConfigDialog.cpp
rename to kiostdetool/kioskConfigDialog.cpp
diff --git a/kiosktool/kioskConfigDialog.h b/kiostdetool/kioskConfigDialog.h
similarity index 100%
rename from kiosktool/kioskConfigDialog.h
rename to kiostdetool/kioskConfigDialog.h
diff --git a/kiosktool/kioskConfigDialog_ui.ui b/kiostdetool/kioskConfigDialog_ui.ui
similarity index 100%
rename from kiosktool/kioskConfigDialog_ui.ui
rename to kiostdetool/kioskConfigDialog_ui.ui
diff --git a/kiosktool/kiosk_data.xml b/kiostdetool/kiosk_data.xml
similarity index 100%
rename from kiosktool/kiosk_data.xml
rename to kiostdetool/kiosk_data.xml
diff --git a/kiosktool/kioskdata.cpp b/kiostdetool/kioskdata.cpp
similarity index 100%
rename from kiosktool/kioskdata.cpp
rename to kiostdetool/kioskdata.cpp
diff --git a/kiosktool/kioskdata.h b/kiostdetool/kioskdata.h
similarity index 100%
rename from kiosktool/kioskdata.h
rename to kiostdetool/kioskdata.h
diff --git a/kiosktool/kioskgui.cpp b/kiostdetool/kioskgui.cpp
similarity index 100%
rename from kiosktool/kioskgui.cpp
rename to kiostdetool/kioskgui.cpp
diff --git a/kiosktool/kioskgui.h b/kiostdetool/kioskgui.h
similarity index 100%
rename from kiosktool/kioskgui.h
rename to kiostdetool/kioskgui.h
diff --git a/kiosktool/kioskrun.cpp b/kiostdetool/kioskrun.cpp
similarity index 100%
rename from kiosktool/kioskrun.cpp
rename to kiostdetool/kioskrun.cpp
diff --git a/kiosktool/kioskrun.h b/kiostdetool/kioskrun.h
similarity index 100%
rename from kiosktool/kioskrun.h
rename to kiostdetool/kioskrun.h
diff --git a/kiosktool/kiosksync.cpp b/kiostdetool/kiosksync.cpp
similarity index 100%
rename from kiosktool/kiosksync.cpp
rename to kiostdetool/kiosksync.cpp
diff --git a/kiosktool/kiosksync.h b/kiostdetool/kiosksync.h
similarity index 100%
rename from kiosktool/kiosksync.h
rename to kiostdetool/kiosksync.h
diff --git a/kiosktool/kiosktool-tdedirs.cpp b/kiostdetool/kiostdetool-tdedirs.cpp
similarity index 100%
rename from kiosktool/kiosktool-tdedirs.cpp
rename to kiostdetool/kiostdetool-tdedirs.cpp
diff --git a/kiosktool/kiosktool.desktop b/kiostdetool/kiostdetool.desktop
similarity index 100%
rename from kiosktool/kiosktool.desktop
rename to kiostdetool/kiostdetool.desktop
diff --git a/kiosktool/kiosktoolui.rc b/kiostdetool/kiostdetoolui.rc
similarity index 100%
rename from kiosktool/kiosktoolui.rc
rename to kiostdetool/kiostdetoolui.rc
diff --git a/kiosktool/logo.png b/kiostdetool/logo.png
similarity index 100%
rename from kiosktool/logo.png
rename to kiostdetool/logo.png
diff --git a/kiosktool/main.cpp b/kiostdetool/main.cpp
similarity index 100%
rename from kiosktool/main.cpp
rename to kiostdetool/main.cpp
diff --git a/kiosktool/mainview.ui b/kiostdetool/mainview.ui
similarity index 100%
rename from kiosktool/mainview.ui
rename to kiostdetool/mainview.ui
diff --git a/kiosktool/menueditComponent.cpp b/kiostdetool/menueditComponent.cpp
similarity index 100%
rename from kiosktool/menueditComponent.cpp
rename to kiostdetool/menueditComponent.cpp
diff --git a/kiosktool/menueditComponent.h b/kiostdetool/menueditComponent.h
similarity index 100%
rename from kiosktool/menueditComponent.h
rename to kiostdetool/menueditComponent.h
diff --git a/kiosktool/pageWidget.cpp b/kiostdetool/pageWidget.cpp
similarity index 100%
rename from kiosktool/pageWidget.cpp
rename to kiostdetool/pageWidget.cpp
diff --git a/kiosktool/pageWidget.h b/kiostdetool/pageWidget.h
similarity index 100%
rename from kiosktool/pageWidget.h
rename to kiostdetool/pageWidget.h
diff --git a/kiosktool/panelComponent.cpp b/kiostdetool/panelComponent.cpp
similarity index 100%
rename from kiosktool/panelComponent.cpp
rename to kiostdetool/panelComponent.cpp
diff --git a/kiosktool/panelComponent.h b/kiostdetool/panelComponent.h
similarity index 100%
rename from kiosktool/panelComponent.h
rename to kiostdetool/panelComponent.h
diff --git a/kiosktool/profilePropsPage.cpp b/kiostdetool/profilePropsPage.cpp
similarity index 100%
rename from kiosktool/profilePropsPage.cpp
rename to kiostdetool/profilePropsPage.cpp
diff --git a/kiosktool/profilePropsPage.h b/kiostdetool/profilePropsPage.h
similarity index 100%
rename from kiosktool/profilePropsPage.h
rename to kiostdetool/profilePropsPage.h
diff --git a/kiosktool/profilePropsPage_ui.ui b/kiostdetool/profilePropsPage_ui.ui
similarity index 100%
rename from kiosktool/profilePropsPage_ui.ui
rename to kiostdetool/profilePropsPage_ui.ui
diff --git a/kiosktool/profileSelectionPage_ui.ui b/kiostdetool/profileSelectionPage_ui.ui
similarity index 100%
rename from kiosktool/profileSelectionPage_ui.ui
rename to kiostdetool/profileSelectionPage_ui.ui
diff --git a/kiosktool/screensaverComponent.cpp b/kiostdetool/screensaverComponent.cpp
similarity index 100%
rename from kiosktool/screensaverComponent.cpp
rename to kiostdetool/screensaverComponent.cpp
diff --git a/kiosktool/screensaverComponent.h b/kiostdetool/screensaverComponent.h
similarity index 100%
rename from kiosktool/screensaverComponent.h
rename to kiostdetool/screensaverComponent.h
diff --git a/kiosktool/userManagement.cpp b/kiostdetool/userManagement.cpp
similarity index 100%
rename from kiosktool/userManagement.cpp
rename to kiostdetool/userManagement.cpp
diff --git a/kiosktool/userManagement.h b/kiostdetool/userManagement.h
similarity index 100%
rename from kiosktool/userManagement.h
rename to kiostdetool/userManagement.h
diff --git a/kiosktool/userManagementGroup_ui.ui b/kiostdetool/userManagementGroup_ui.ui
similarity index 100%
rename from kiosktool/userManagementGroup_ui.ui
rename to kiostdetool/userManagementGroup_ui.ui
diff --git a/kiosktool/userManagementUser_ui.ui b/kiostdetool/userManagementUser_ui.ui
similarity index 100%
rename from kiosktool/userManagementUser_ui.ui
rename to kiostdetool/userManagementUser_ui.ui
diff --git a/kiosktool/userManagement_ui.ui b/kiostdetool/userManagement_ui.ui
similarity index 100%
rename from kiosktool/userManagement_ui.ui
rename to kiostdetool/userManagement_ui.ui
diff --git a/po/bg/kiosktool.po b/po/bg/kiostdetool.po
similarity index 100%
rename from po/bg/kiosktool.po
rename to po/bg/kiostdetool.po
diff --git a/po/br/kiosktool.po b/po/br/kiostdetool.po
similarity index 100%
rename from po/br/kiosktool.po
rename to po/br/kiostdetool.po
diff --git a/po/ca/kiosktool.po b/po/ca/kiostdetool.po
similarity index 100%
rename from po/ca/kiosktool.po
rename to po/ca/kiostdetool.po
diff --git a/po/cs/kiosktool.po b/po/cs/kiostdetool.po
similarity index 100%
rename from po/cs/kiosktool.po
rename to po/cs/kiostdetool.po
diff --git a/po/cy/kiosktool.po b/po/cy/kiostdetool.po
similarity index 100%
rename from po/cy/kiosktool.po
rename to po/cy/kiostdetool.po
diff --git a/po/da/kiosktool.po b/po/da/kiostdetool.po
similarity index 100%
rename from po/da/kiosktool.po
rename to po/da/kiostdetool.po
diff --git a/po/de/kiosktool.po b/po/de/kiostdetool.po
similarity index 100%
rename from po/de/kiosktool.po
rename to po/de/kiostdetool.po
diff --git a/po/en_GB/kiosktool.po b/po/en_GB/kiostdetool.po
similarity index 100%
rename from po/en_GB/kiosktool.po
rename to po/en_GB/kiostdetool.po
diff --git a/po/es/kiosktool.po b/po/es/kiostdetool.po
similarity index 100%
rename from po/es/kiosktool.po
rename to po/es/kiostdetool.po
diff --git a/po/et/kiosktool.po b/po/et/kiostdetool.po
similarity index 100%
rename from po/et/kiosktool.po
rename to po/et/kiostdetool.po
diff --git a/po/fr/kiosktool.po b/po/fr/kiostdetool.po
similarity index 100%
rename from po/fr/kiosktool.po
rename to po/fr/kiostdetool.po
diff --git a/po/ga/kiosktool.po b/po/ga/kiostdetool.po
similarity index 100%
rename from po/ga/kiosktool.po
rename to po/ga/kiostdetool.po
diff --git a/po/is/kiosktool.po b/po/is/kiostdetool.po
similarity index 100%
rename from po/is/kiosktool.po
rename to po/is/kiostdetool.po
diff --git a/po/it/kiosktool.po b/po/it/kiostdetool.po
similarity index 100%
rename from po/it/kiosktool.po
rename to po/it/kiostdetool.po
diff --git a/po/lt/kiosktool.po b/po/lt/kiostdetool.po
similarity index 100%
rename from po/lt/kiosktool.po
rename to po/lt/kiostdetool.po
diff --git a/po/mt/kiosktool.po b/po/mt/kiostdetool.po
similarity index 100%
rename from po/mt/kiosktool.po
rename to po/mt/kiostdetool.po
diff --git a/po/nl/kiosktool.po b/po/nl/kiostdetool.po
similarity index 100%
rename from po/nl/kiosktool.po
rename to po/nl/kiostdetool.po
diff --git a/po/pt/kiosktool.po b/po/pt/kiostdetool.po
similarity index 100%
rename from po/pt/kiosktool.po
rename to po/pt/kiostdetool.po
diff --git a/po/pt_BR/kiosktool.po b/po/pt_BR/kiostdetool.po
similarity index 100%
rename from po/pt_BR/kiosktool.po
rename to po/pt_BR/kiostdetool.po
diff --git a/po/ro/kiosktool.po b/po/ro/kiostdetool.po
similarity index 100%
rename from po/ro/kiosktool.po
rename to po/ro/kiostdetool.po
diff --git a/po/ru/kiosktool.po b/po/ru/kiostdetool.po
similarity index 100%
rename from po/ru/kiosktool.po
rename to po/ru/kiostdetool.po
diff --git a/po/sr/kiosktool.po b/po/sr/kiostdetool.po
similarity index 100%
rename from po/sr/kiosktool.po
rename to po/sr/kiostdetool.po
diff --git a/po/sr@Latn/kiosktool.po b/po/sr@Latn/kiostdetool.po
similarity index 100%
rename from po/sr@Latn/kiosktool.po
rename to po/sr@Latn/kiostdetool.po
diff --git a/po/sv/kiosktool.po b/po/sv/kiostdetool.po
similarity index 100%
rename from po/sv/kiosktool.po
rename to po/sv/kiostdetool.po
diff --git a/po/ta/kiosktool.po b/po/ta/kiostdetool.po
similarity index 100%
rename from po/ta/kiosktool.po
rename to po/ta/kiostdetool.po
diff --git a/po/tr/kiosktool.po b/po/tr/kiostdetool.po
similarity index 100%
rename from po/tr/kiosktool.po
rename to po/tr/kiostdetool.po
diff --git a/po/xx/kiosktool.po b/po/xx/kiostdetool.po
similarity index 100%
rename from po/xx/kiosktool.po
rename to po/xx/kiostdetool.po