diff --git a/Makefile.am b/Makefile.am
index bb2e418..6c41c8b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ####### tdevelop will overwrite this part!!! (begin)##########
 
-SUBDIRS = ksquirrel po pics 
+SUBDIRS = src po pics 
 
 EXTRA_DIST = ksquirrel.kdevprj admin AUTHORS COPYING ChangeLog INSTALL README TODO ksquirrel.lsm 
 
diff --git a/configure.in b/configure.in
index e9a305c..3e2b90d 100644
--- a/configure.in
+++ b/configure.in
@@ -268,13 +268,15 @@ AM_CONDITIONAL(SQ_HAVE_KEXIF, test x$have_kexif = xyes)
 KDE_CREATE_SUBDIRSLIST
 AC_CONFIG_FILES([ Makefile ])
 AC_CONFIG_FILES([ doc/Makefile ])
+AC_CONFIG_FILES([ doc/en/Makefile ])
 AC_CONFIG_FILES([ doc/ru/Makefile ])
-AC_CONFIG_FILES([ ksquirrel/Makefile ])
-AC_CONFIG_FILES([ ksquirrel/imageedit/Makefile ])
-AC_CONFIG_FILES([ ksquirrel/ksquirrel-libs-configurator/Makefile ])
-AC_CONFIG_FILES([ ksquirrel/ksquirrelpart/Makefile ])
-AC_CONFIG_FILES([ ksquirrel/mime/Makefile ])
-AC_CONFIG_FILES([ ksquirrel/sidebar/Makefile ])
+AC_CONFIG_FILES([ doc/man/Makefile ])
+AC_CONFIG_FILES([ src/Makefile ])
+AC_CONFIG_FILES([ src/imageedit/Makefile ])
+AC_CONFIG_FILES([ src/ksquirrel-libs-configurator/Makefile ])
+AC_CONFIG_FILES([ src/ksquirrelpart/Makefile ])
+AC_CONFIG_FILES([ src/mime/Makefile ])
+AC_CONFIG_FILES([ src/sidebar/Makefile ])
 AC_CONFIG_FILES([ pics/Makefile ])
 AC_CONFIG_FILES([ pics/imageedit/Makefile ])
 AC_CONFIG_FILES([ pics/menu/Makefile ])
diff --git a/ksquirrel/CMakeL10n.txt b/src/CMakeL10n.txt
similarity index 100%
rename from ksquirrel/CMakeL10n.txt
rename to src/CMakeL10n.txt
diff --git a/ksquirrel/Makefile.am b/src/Makefile.am
similarity index 98%
rename from ksquirrel/Makefile.am
rename to src/Makefile.am
index ed15456..21152aa 100644
--- a/ksquirrel/Makefile.am
+++ b/src/Makefile.am
@@ -45,7 +45,7 @@ ksquirrel_SOURCES += sq_utils_asm_scale.S
 
 AM_CCASFLAGS = -I$(srcdir) $(KSQUIRREL_ASM_DEFS)
 
-INCLUDES = $(all_includes) -I$(srcdir) -I$(top_srcdir)/ksquirrel/sidebar -I$(top_srcdir)/ksquirrel/imageedit
+INCLUDES = $(all_includes) -I$(srcdir) -I$(top_srcdir)/src/sidebar -I$(top_srcdir)/src/imageedit
 # ksquirrelpart
 
 # These paths are KDE specific. Use them:
diff --git a/ksquirrel/dolphksquirrel-dir.desktop b/src/dolphksquirrel-dir.desktop
similarity index 100%
rename from ksquirrel/dolphksquirrel-dir.desktop
rename to src/dolphksquirrel-dir.desktop
diff --git a/ksquirrel/file_broken.xpm b/src/file_broken.xpm
similarity index 100%
rename from ksquirrel/file_broken.xpm
rename to src/file_broken.xpm
diff --git a/ksquirrel/fmt_filters.cpp b/src/fmt_filters.cpp
similarity index 100%
rename from ksquirrel/fmt_filters.cpp
rename to src/fmt_filters.cpp
diff --git a/ksquirrel/fmt_filters.h b/src/fmt_filters.h
similarity index 100%
rename from ksquirrel/fmt_filters.h
rename to src/fmt_filters.h
diff --git a/ksquirrel/hi16-app-ksquirrel.png b/src/hi16-app-ksquirrel.png
similarity index 100%
rename from ksquirrel/hi16-app-ksquirrel.png
rename to src/hi16-app-ksquirrel.png
diff --git a/ksquirrel/hi32-app-ksquirrel.png b/src/hi32-app-ksquirrel.png
similarity index 100%
rename from ksquirrel/hi32-app-ksquirrel.png
rename to src/hi32-app-ksquirrel.png
diff --git a/ksquirrel/imageedit/Makefile.am b/src/imageedit/Makefile.am
similarity index 91%
rename from ksquirrel/imageedit/Makefile.am
rename to src/imageedit/Makefile.am
index fe318b1..e513dd1 100644
--- a/ksquirrel/imageedit/Makefile.am
+++ b/src/imageedit/Makefile.am
@@ -12,4 +12,4 @@ EXTRA_DIST = sq_bcglabel.h sq_converter.h sq_imagebcg.ui.h sq_imageconvert.ui.h
 
 ####### tdevelop will overwrite this part!!! (end)############
 
-INCLUDES = $(all_includes) -I$(srcdir) -I$(top_srcdir)/ksquirrel
+INCLUDES = $(all_includes) -I$(srcdir) -I$(top_srcdir)/src
diff --git a/ksquirrel/imageedit/sq_bcglabel.cpp b/src/imageedit/sq_bcglabel.cpp
similarity index 100%
rename from ksquirrel/imageedit/sq_bcglabel.cpp
rename to src/imageedit/sq_bcglabel.cpp
diff --git a/ksquirrel/imageedit/sq_bcglabel.h b/src/imageedit/sq_bcglabel.h
similarity index 100%
rename from ksquirrel/imageedit/sq_bcglabel.h
rename to src/imageedit/sq_bcglabel.h
diff --git a/ksquirrel/imageedit/sq_converter.cpp b/src/imageedit/sq_converter.cpp
similarity index 100%
rename from ksquirrel/imageedit/sq_converter.cpp
rename to src/imageedit/sq_converter.cpp
diff --git a/ksquirrel/imageedit/sq_converter.h b/src/imageedit/sq_converter.h
similarity index 100%
rename from ksquirrel/imageedit/sq_converter.h
rename to src/imageedit/sq_converter.h
diff --git a/ksquirrel/imageedit/sq_imagebcg.ui b/src/imageedit/sq_imagebcg.ui
similarity index 100%
rename from ksquirrel/imageedit/sq_imagebcg.ui
rename to src/imageedit/sq_imagebcg.ui
diff --git a/ksquirrel/imageedit/sq_imagebcg.ui.h b/src/imageedit/sq_imagebcg.ui.h
similarity index 100%
rename from ksquirrel/imageedit/sq_imagebcg.ui.h
rename to src/imageedit/sq_imagebcg.ui.h
diff --git a/ksquirrel/imageedit/sq_imageconvert.ui b/src/imageedit/sq_imageconvert.ui
similarity index 100%
rename from ksquirrel/imageedit/sq_imageconvert.ui
rename to src/imageedit/sq_imageconvert.ui
diff --git a/ksquirrel/imageedit/sq_imageconvert.ui.h b/src/imageedit/sq_imageconvert.ui.h
similarity index 100%
rename from ksquirrel/imageedit/sq_imageconvert.ui.h
rename to src/imageedit/sq_imageconvert.ui.h
diff --git a/ksquirrel/imageedit/sq_imageedit.h b/src/imageedit/sq_imageedit.h
similarity index 100%
rename from ksquirrel/imageedit/sq_imageedit.h
rename to src/imageedit/sq_imageedit.h
diff --git a/ksquirrel/imageedit/sq_imageeditoptions.ui b/src/imageedit/sq_imageeditoptions.ui
similarity index 100%
rename from ksquirrel/imageedit/sq_imageeditoptions.ui
rename to src/imageedit/sq_imageeditoptions.ui
diff --git a/ksquirrel/imageedit/sq_imageeditoptions.ui.h b/src/imageedit/sq_imageeditoptions.ui.h
similarity index 100%
rename from ksquirrel/imageedit/sq_imageeditoptions.ui.h
rename to src/imageedit/sq_imageeditoptions.ui.h
diff --git a/ksquirrel/imageedit/sq_imagefilter.ui b/src/imageedit/sq_imagefilter.ui
similarity index 100%
rename from ksquirrel/imageedit/sq_imagefilter.ui
rename to src/imageedit/sq_imagefilter.ui
diff --git a/ksquirrel/imageedit/sq_imagefilter.ui.h b/src/imageedit/sq_imagefilter.ui.h
similarity index 100%
rename from ksquirrel/imageedit/sq_imagefilter.ui.h
rename to src/imageedit/sq_imagefilter.ui.h
diff --git a/ksquirrel/imageedit/sq_label.cpp b/src/imageedit/sq_label.cpp
similarity index 100%
rename from ksquirrel/imageedit/sq_label.cpp
rename to src/imageedit/sq_label.cpp
diff --git a/ksquirrel/imageedit/sq_label.h b/src/imageedit/sq_label.h
similarity index 100%
rename from ksquirrel/imageedit/sq_label.h
rename to src/imageedit/sq_label.h
diff --git a/ksquirrel/imageedit/sq_writeoption.ui b/src/imageedit/sq_writeoption.ui
similarity index 100%
rename from ksquirrel/imageedit/sq_writeoption.ui
rename to src/imageedit/sq_writeoption.ui
diff --git a/ksquirrel/konqksquirrel-dir.desktop b/src/konqksquirrel-dir.desktop
similarity index 100%
rename from ksquirrel/konqksquirrel-dir.desktop
rename to src/konqksquirrel-dir.desktop
diff --git a/ksquirrel/ksquirrel-libs-configurator/Makefile.am b/src/ksquirrel-libs-configurator/Makefile.am
similarity index 100%
rename from ksquirrel/ksquirrel-libs-configurator/Makefile.am
rename to src/ksquirrel-libs-configurator/Makefile.am
diff --git a/ksquirrel/ksquirrel-libs-configurator/klc.cpp b/src/ksquirrel-libs-configurator/klc.cpp
similarity index 100%
rename from ksquirrel/ksquirrel-libs-configurator/klc.cpp
rename to src/ksquirrel-libs-configurator/klc.cpp
diff --git a/ksquirrel/ksquirrel-libs-configurator/klc.ui b/src/ksquirrel-libs-configurator/klc.ui
similarity index 100%
rename from ksquirrel/ksquirrel-libs-configurator/klc.ui
rename to src/ksquirrel-libs-configurator/klc.ui
diff --git a/ksquirrel/ksquirrel-libs-configurator/klc.ui.h b/src/ksquirrel-libs-configurator/klc.ui.h
similarity index 100%
rename from ksquirrel/ksquirrel-libs-configurator/klc.ui.h
rename to src/ksquirrel-libs-configurator/klc.ui.h
diff --git a/ksquirrel/ksquirrel-libs-configurator/ksquirrel-libs-configurator b/src/ksquirrel-libs-configurator/ksquirrel-libs-configurator
similarity index 100%
rename from ksquirrel/ksquirrel-libs-configurator/ksquirrel-libs-configurator
rename to src/ksquirrel-libs-configurator/ksquirrel-libs-configurator
diff --git a/ksquirrel/ksquirrel-libs-configurator/main.cpp b/src/ksquirrel-libs-configurator/main.cpp
similarity index 100%
rename from ksquirrel/ksquirrel-libs-configurator/main.cpp
rename to src/ksquirrel-libs-configurator/main.cpp
diff --git a/ksquirrel/ksquirrel.cpp b/src/ksquirrel.cpp
similarity index 100%
rename from ksquirrel/ksquirrel.cpp
rename to src/ksquirrel.cpp
diff --git a/ksquirrel/ksquirrel.desktop b/src/ksquirrel.desktop
similarity index 100%
rename from ksquirrel/ksquirrel.desktop
rename to src/ksquirrel.desktop
diff --git a/ksquirrel/ksquirrel.h b/src/ksquirrel.h
similarity index 100%
rename from ksquirrel/ksquirrel.h
rename to src/ksquirrel.h
diff --git a/ksquirrel/ksquirrelpart/Makefile.am b/src/ksquirrelpart/Makefile.am
similarity index 100%
rename from ksquirrel/ksquirrelpart/Makefile.am
rename to src/ksquirrelpart/Makefile.am
diff --git a/ksquirrel/ksquirrelpart/file_broken.xpm b/src/ksquirrelpart/file_broken.xpm
similarity index 100%
rename from ksquirrel/ksquirrelpart/file_broken.xpm
rename to src/ksquirrelpart/file_broken.xpm
diff --git a/ksquirrel/ksquirrelpart/fmt_filters.cpp b/src/ksquirrelpart/fmt_filters.cpp
similarity index 100%
rename from ksquirrel/ksquirrelpart/fmt_filters.cpp
rename to src/ksquirrelpart/fmt_filters.cpp
diff --git a/ksquirrel/ksquirrelpart/fmt_filters.h b/src/ksquirrelpart/fmt_filters.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/fmt_filters.h
rename to src/ksquirrelpart/fmt_filters.h
diff --git a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp b/src/ksquirrelpart/ksquirrelpart.cpp
similarity index 100%
rename from ksquirrel/ksquirrelpart/ksquirrelpart.cpp
rename to src/ksquirrelpart/ksquirrelpart.cpp
diff --git a/ksquirrel/ksquirrelpart/ksquirrelpart.desktop b/src/ksquirrelpart/ksquirrelpart.desktop
similarity index 100%
rename from ksquirrel/ksquirrelpart/ksquirrelpart.desktop
rename to src/ksquirrelpart/ksquirrelpart.desktop
diff --git a/ksquirrel/ksquirrelpart/ksquirrelpart.h b/src/ksquirrelpart/ksquirrelpart.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/ksquirrelpart.h
rename to src/ksquirrelpart/ksquirrelpart.h
diff --git a/ksquirrel/ksquirrelpart/ksquirrelpart.rc b/src/ksquirrelpart/ksquirrelpart.rc
similarity index 100%
rename from ksquirrel/ksquirrelpart/ksquirrelpart.rc
rename to src/ksquirrelpart/ksquirrelpart.rc
diff --git a/ksquirrel/ksquirrelpart/sq_bcglabel.cpp b/src/ksquirrelpart/sq_bcglabel.cpp
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_bcglabel.cpp
rename to src/ksquirrelpart/sq_bcglabel.cpp
diff --git a/ksquirrel/ksquirrelpart/sq_bcglabel.h b/src/ksquirrelpart/sq_bcglabel.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_bcglabel.h
rename to src/ksquirrelpart/sq_bcglabel.h
diff --git a/ksquirrel/ksquirrelpart/sq_codecsettings.cpp b/src/ksquirrelpart/sq_codecsettings.cpp
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_codecsettings.cpp
rename to src/ksquirrelpart/sq_codecsettings.cpp
diff --git a/ksquirrel/ksquirrelpart/sq_codecsettings.h b/src/ksquirrelpart/sq_codecsettings.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_codecsettings.h
rename to src/ksquirrelpart/sq_codecsettings.h
diff --git a/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui b/src/ksquirrelpart/sq_codecsettingsskeleton.ui
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui
rename to src/ksquirrelpart/sq_codecsettingsskeleton.ui
diff --git a/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui.h b/src/ksquirrelpart/sq_codecsettingsskeleton.ui.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui.h
rename to src/ksquirrelpart/sq_codecsettingsskeleton.ui.h
diff --git a/ksquirrel/ksquirrelpart/sq_config.cpp b/src/ksquirrelpart/sq_config.cpp
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_config.cpp
rename to src/ksquirrelpart/sq_config.cpp
diff --git a/ksquirrel/ksquirrelpart/sq_config.h b/src/ksquirrelpart/sq_config.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_config.h
rename to src/ksquirrelpart/sq_config.h
diff --git a/ksquirrel/ksquirrelpart/sq_diroperator.cpp b/src/ksquirrelpart/sq_diroperator.cpp
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_diroperator.cpp
rename to src/ksquirrelpart/sq_diroperator.cpp
diff --git a/ksquirrel/ksquirrelpart/sq_diroperator.h b/src/ksquirrelpart/sq_diroperator.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_diroperator.h
rename to src/ksquirrelpart/sq_diroperator.h
diff --git a/ksquirrel/ksquirrelpart/sq_downloader.cpp b/src/ksquirrelpart/sq_downloader.cpp
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_downloader.cpp
rename to src/ksquirrelpart/sq_downloader.cpp
diff --git a/ksquirrel/ksquirrelpart/sq_downloader.h b/src/ksquirrelpart/sq_downloader.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_downloader.h
rename to src/ksquirrelpart/sq_downloader.h
diff --git a/ksquirrel/ksquirrelpart/sq_errorstring.cpp b/src/ksquirrelpart/sq_errorstring.cpp
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_errorstring.cpp
rename to src/ksquirrelpart/sq_errorstring.cpp
diff --git a/ksquirrel/ksquirrelpart/sq_errorstring.h b/src/ksquirrelpart/sq_errorstring.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_errorstring.h
rename to src/ksquirrelpart/sq_errorstring.h
diff --git a/ksquirrel/ksquirrelpart/sq_externaltool.cpp b/src/ksquirrelpart/sq_externaltool.cpp
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_externaltool.cpp
rename to src/ksquirrelpart/sq_externaltool.cpp
diff --git a/ksquirrel/ksquirrelpart/sq_externaltool.h b/src/ksquirrelpart/sq_externaltool.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_externaltool.h
rename to src/ksquirrelpart/sq_externaltool.h
diff --git a/ksquirrel/ksquirrelpart/sq_filedialog.cpp b/src/ksquirrelpart/sq_filedialog.cpp
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_filedialog.cpp
rename to src/ksquirrelpart/sq_filedialog.cpp
diff --git a/ksquirrel/ksquirrelpart/sq_filedialog.h b/src/ksquirrelpart/sq_filedialog.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_filedialog.h
rename to src/ksquirrelpart/sq_filedialog.h
diff --git a/ksquirrel/ksquirrelpart/sq_glparts.cpp b/src/ksquirrelpart/sq_glparts.cpp
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_glparts.cpp
rename to src/ksquirrelpart/sq_glparts.cpp
diff --git a/ksquirrel/ksquirrelpart/sq_glparts.h b/src/ksquirrelpart/sq_glparts.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_glparts.h
rename to src/ksquirrelpart/sq_glparts.h
diff --git a/ksquirrel/ksquirrelpart/sq_glselectionpainter.cpp b/src/ksquirrelpart/sq_glselectionpainter.cpp
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_glselectionpainter.cpp
rename to src/ksquirrelpart/sq_glselectionpainter.cpp
diff --git a/ksquirrel/ksquirrelpart/sq_glselectionpainter.h b/src/ksquirrelpart/sq_glselectionpainter.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_glselectionpainter.h
rename to src/ksquirrelpart/sq_glselectionpainter.h
diff --git a/ksquirrel/ksquirrelpart/sq_glu.cpp b/src/ksquirrelpart/sq_glu.cpp
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_glu.cpp
rename to src/ksquirrelpart/sq_glu.cpp
diff --git a/ksquirrel/ksquirrelpart/sq_glu.h b/src/ksquirrelpart/sq_glu.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_glu.h
rename to src/ksquirrelpart/sq_glu.h
diff --git a/ksquirrel/ksquirrelpart/sq_glview.cpp b/src/ksquirrelpart/sq_glview.cpp
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_glview.cpp
rename to src/ksquirrelpart/sq_glview.cpp
diff --git a/ksquirrel/ksquirrelpart/sq_glview.h b/src/ksquirrelpart/sq_glview.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_glview.h
rename to src/ksquirrelpart/sq_glview.h
diff --git a/ksquirrel/ksquirrelpart/sq_glwidget.cpp b/src/ksquirrelpart/sq_glwidget.cpp
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_glwidget.cpp
rename to src/ksquirrelpart/sq_glwidget.cpp
diff --git a/ksquirrel/ksquirrelpart/sq_glwidget.h b/src/ksquirrelpart/sq_glwidget.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_glwidget.h
rename to src/ksquirrelpart/sq_glwidget.h
diff --git a/ksquirrel/ksquirrelpart/sq_glwidget_helpers.cpp b/src/ksquirrelpart/sq_glwidget_helpers.cpp
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_glwidget_helpers.cpp
rename to src/ksquirrelpart/sq_glwidget_helpers.cpp
diff --git a/ksquirrel/ksquirrelpart/sq_glwidget_helpers.h b/src/ksquirrelpart/sq_glwidget_helpers.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_glwidget_helpers.h
rename to src/ksquirrelpart/sq_glwidget_helpers.h
diff --git a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp b/src/ksquirrelpart/sq_glwidget_stuff.cpp
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
rename to src/ksquirrelpart/sq_glwidget_stuff.cpp
diff --git a/ksquirrel/ksquirrelpart/sq_helpwidget.ui b/src/ksquirrelpart/sq_helpwidget.ui
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_helpwidget.ui
rename to src/ksquirrelpart/sq_helpwidget.ui
diff --git a/ksquirrel/ksquirrelpart/sq_helpwidget.ui.h b/src/ksquirrelpart/sq_helpwidget.ui.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_helpwidget.ui.h
rename to src/ksquirrelpart/sq_helpwidget.ui.h
diff --git a/ksquirrel/ksquirrelpart/sq_iconloader.cpp b/src/ksquirrelpart/sq_iconloader.cpp
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_iconloader.cpp
rename to src/ksquirrelpart/sq_iconloader.cpp
diff --git a/ksquirrel/ksquirrelpart/sq_iconloader.h b/src/ksquirrelpart/sq_iconloader.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_iconloader.h
rename to src/ksquirrelpart/sq_iconloader.h
diff --git a/ksquirrel/ksquirrelpart/sq_iconloader_pixmaps.h b/src/ksquirrelpart/sq_iconloader_pixmaps.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_iconloader_pixmaps.h
rename to src/ksquirrelpart/sq_iconloader_pixmaps.h
diff --git a/ksquirrel/ksquirrelpart/sq_imagebcg.ui b/src/ksquirrelpart/sq_imagebcg.ui
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_imagebcg.ui
rename to src/ksquirrelpart/sq_imagebcg.ui
diff --git a/ksquirrel/ksquirrelpart/sq_imagebcg.ui.h b/src/ksquirrelpart/sq_imagebcg.ui.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_imagebcg.ui.h
rename to src/ksquirrelpart/sq_imagebcg.ui.h
diff --git a/ksquirrel/ksquirrelpart/sq_imageedit.h b/src/ksquirrelpart/sq_imageedit.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_imageedit.h
rename to src/ksquirrelpart/sq_imageedit.h
diff --git a/ksquirrel/ksquirrelpart/sq_imagefilter.ui b/src/ksquirrelpart/sq_imagefilter.ui
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_imagefilter.ui
rename to src/ksquirrelpart/sq_imagefilter.ui
diff --git a/ksquirrel/ksquirrelpart/sq_imagefilter.ui.h b/src/ksquirrelpart/sq_imagefilter.ui.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_imagefilter.ui.h
rename to src/ksquirrelpart/sq_imagefilter.ui.h
diff --git a/ksquirrel/ksquirrelpart/sq_imageproperties.ui b/src/ksquirrelpart/sq_imageproperties.ui
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_imageproperties.ui
rename to src/ksquirrelpart/sq_imageproperties.ui
diff --git a/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h b/src/ksquirrelpart/sq_imageproperties.ui.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_imageproperties.ui.h
rename to src/ksquirrelpart/sq_imageproperties.ui.h
diff --git a/ksquirrel/ksquirrelpart/sq_label.cpp b/src/ksquirrelpart/sq_label.cpp
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_label.cpp
rename to src/ksquirrelpart/sq_label.cpp
diff --git a/ksquirrel/ksquirrelpart/sq_label.h b/src/ksquirrelpart/sq_label.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_label.h
rename to src/ksquirrelpart/sq_label.h
diff --git a/ksquirrel/ksquirrelpart/sq_library.h b/src/ksquirrelpart/sq_library.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_library.h
rename to src/ksquirrelpart/sq_library.h
diff --git a/ksquirrel/ksquirrelpart/sq_libraryhandler.cpp b/src/ksquirrelpart/sq_libraryhandler.cpp
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_libraryhandler.cpp
rename to src/ksquirrelpart/sq_libraryhandler.cpp
diff --git a/ksquirrel/ksquirrelpart/sq_libraryhandler.h b/src/ksquirrelpart/sq_libraryhandler.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_libraryhandler.h
rename to src/ksquirrelpart/sq_libraryhandler.h
diff --git a/ksquirrel/ksquirrelpart/sq_popupmenu.cpp b/src/ksquirrelpart/sq_popupmenu.cpp
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_popupmenu.cpp
rename to src/ksquirrelpart/sq_popupmenu.cpp
diff --git a/ksquirrel/ksquirrelpart/sq_popupmenu.h b/src/ksquirrelpart/sq_popupmenu.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_popupmenu.h
rename to src/ksquirrelpart/sq_popupmenu.h
diff --git a/ksquirrel/ksquirrelpart/sq_utils.cpp b/src/ksquirrelpart/sq_utils.cpp
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_utils.cpp
rename to src/ksquirrelpart/sq_utils.cpp
diff --git a/ksquirrel/ksquirrelpart/sq_utils.h b/src/ksquirrelpart/sq_utils.h
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_utils.h
rename to src/ksquirrelpart/sq_utils.h
diff --git a/ksquirrel/ksquirrelpart/sq_utils_asm_scale.S b/src/ksquirrelpart/sq_utils_asm_scale.S
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_utils_asm_scale.S
rename to src/ksquirrelpart/sq_utils_asm_scale.S
diff --git a/ksquirrel/ksquirrelpart/sq_utils_scale.cpp b/src/ksquirrelpart/sq_utils_scale.cpp
similarity index 100%
rename from ksquirrel/ksquirrelpart/sq_utils_scale.cpp
rename to src/ksquirrelpart/sq_utils_scale.cpp
diff --git a/ksquirrel/main.cpp b/src/main.cpp
similarity index 100%
rename from ksquirrel/main.cpp
rename to src/main.cpp
diff --git a/ksquirrel/mime/Makefile.am b/src/mime/Makefile.am
similarity index 100%
rename from ksquirrel/mime/Makefile.am
rename to src/mime/Makefile.am
diff --git a/ksquirrel/mime/ljpeg.desktop b/src/mime/ljpeg.desktop
similarity index 100%
rename from ksquirrel/mime/ljpeg.desktop
rename to src/mime/ljpeg.desktop
diff --git a/ksquirrel/mime/x-avs.desktop b/src/mime/x-avs.desktop
similarity index 100%
rename from ksquirrel/mime/x-avs.desktop
rename to src/mime/x-avs.desktop
diff --git a/ksquirrel/mime/x-cut.desktop b/src/mime/x-cut.desktop
similarity index 100%
rename from ksquirrel/mime/x-cut.desktop
rename to src/mime/x-cut.desktop
diff --git a/ksquirrel/mime/x-dicom.desktop b/src/mime/x-dicom.desktop
similarity index 100%
rename from ksquirrel/mime/x-dicom.desktop
rename to src/mime/x-dicom.desktop
diff --git a/ksquirrel/mime/x-dxf.desktop b/src/mime/x-dxf.desktop
similarity index 100%
rename from ksquirrel/mime/x-dxf.desktop
rename to src/mime/x-dxf.desktop
diff --git a/ksquirrel/mime/x-iff.desktop b/src/mime/x-iff.desktop
similarity index 100%
rename from ksquirrel/mime/x-iff.desktop
rename to src/mime/x-iff.desktop
diff --git a/ksquirrel/mime/x-jbig.desktop b/src/mime/x-jbig.desktop
similarity index 100%
rename from ksquirrel/mime/x-jbig.desktop
rename to src/mime/x-jbig.desktop
diff --git a/ksquirrel/mime/x-koala.desktop b/src/mime/x-koala.desktop
similarity index 100%
rename from ksquirrel/mime/x-koala.desktop
rename to src/mime/x-koala.desktop
diff --git a/ksquirrel/mime/x-leaf.desktop b/src/mime/x-leaf.desktop
similarity index 100%
rename from ksquirrel/mime/x-leaf.desktop
rename to src/mime/x-leaf.desktop
diff --git a/ksquirrel/mime/x-lif.desktop b/src/mime/x-lif.desktop
similarity index 100%
rename from ksquirrel/mime/x-lif.desktop
rename to src/mime/x-lif.desktop
diff --git a/ksquirrel/mime/x-mac.desktop b/src/mime/x-mac.desktop
similarity index 100%
rename from ksquirrel/mime/x-mac.desktop
rename to src/mime/x-mac.desktop
diff --git a/ksquirrel/mime/x-mdl.desktop b/src/mime/x-mdl.desktop
similarity index 100%
rename from ksquirrel/mime/x-mdl.desktop
rename to src/mime/x-mdl.desktop
diff --git a/ksquirrel/mime/x-msp.desktop b/src/mime/x-msp.desktop
similarity index 100%
rename from ksquirrel/mime/x-msp.desktop
rename to src/mime/x-msp.desktop
diff --git a/ksquirrel/mime/x-mtv.desktop b/src/mime/x-mtv.desktop
similarity index 100%
rename from ksquirrel/mime/x-mtv.desktop
rename to src/mime/x-mtv.desktop
diff --git a/ksquirrel/mime/x-neo.desktop b/src/mime/x-neo.desktop
similarity index 100%
rename from ksquirrel/mime/x-neo.desktop
rename to src/mime/x-neo.desktop
diff --git a/ksquirrel/mime/x-pi1.desktop b/src/mime/x-pi1.desktop
similarity index 100%
rename from ksquirrel/mime/x-pi1.desktop
rename to src/mime/x-pi1.desktop
diff --git a/ksquirrel/mime/x-pi3.desktop b/src/mime/x-pi3.desktop
similarity index 100%
rename from ksquirrel/mime/x-pi3.desktop
rename to src/mime/x-pi3.desktop
diff --git a/ksquirrel/mime/x-pict.desktop b/src/mime/x-pict.desktop
similarity index 100%
rename from ksquirrel/mime/x-pict.desktop
rename to src/mime/x-pict.desktop
diff --git a/ksquirrel/mime/x-pix.desktop b/src/mime/x-pix.desktop
similarity index 100%
rename from ksquirrel/mime/x-pix.desktop
rename to src/mime/x-pix.desktop
diff --git a/ksquirrel/mime/x-psp.desktop b/src/mime/x-psp.desktop
similarity index 100%
rename from ksquirrel/mime/x-psp.desktop
rename to src/mime/x-psp.desktop
diff --git a/ksquirrel/mime/x-pxr.desktop b/src/mime/x-pxr.desktop
similarity index 100%
rename from ksquirrel/mime/x-pxr.desktop
rename to src/mime/x-pxr.desktop
diff --git a/ksquirrel/mime/x-ras.desktop b/src/mime/x-ras.desktop
similarity index 100%
rename from ksquirrel/mime/x-ras.desktop
rename to src/mime/x-ras.desktop
diff --git a/ksquirrel/mime/x-ras.magic b/src/mime/x-ras.magic
similarity index 100%
rename from ksquirrel/mime/x-ras.magic
rename to src/mime/x-ras.magic
diff --git a/ksquirrel/mime/x-rawrgb.desktop b/src/mime/x-rawrgb.desktop
similarity index 100%
rename from ksquirrel/mime/x-rawrgb.desktop
rename to src/mime/x-rawrgb.desktop
diff --git a/ksquirrel/mime/x-sct.desktop b/src/mime/x-sct.desktop
similarity index 100%
rename from ksquirrel/mime/x-sct.desktop
rename to src/mime/x-sct.desktop
diff --git a/ksquirrel/mime/x-sun.desktop b/src/mime/x-sun.desktop
similarity index 100%
rename from ksquirrel/mime/x-sun.desktop
rename to src/mime/x-sun.desktop
diff --git a/ksquirrel/mime/x-sun.magic b/src/mime/x-sun.magic
similarity index 100%
rename from ksquirrel/mime/x-sun.magic
rename to src/mime/x-sun.magic
diff --git a/ksquirrel/mime/x-utah.desktop b/src/mime/x-utah.desktop
similarity index 100%
rename from ksquirrel/mime/x-utah.desktop
rename to src/mime/x-utah.desktop
diff --git a/ksquirrel/mime/x-utah.magic b/src/mime/x-utah.magic
similarity index 100%
rename from ksquirrel/mime/x-utah.magic
rename to src/mime/x-utah.magic
diff --git a/ksquirrel/mime/x-wal.desktop b/src/mime/x-wal.desktop
similarity index 100%
rename from ksquirrel/mime/x-wal.desktop
rename to src/mime/x-wal.desktop
diff --git a/ksquirrel/mime/x-wbmp.desktop b/src/mime/x-wbmp.desktop
similarity index 100%
rename from ksquirrel/mime/x-wbmp.desktop
rename to src/mime/x-wbmp.desktop
diff --git a/ksquirrel/mime/x-xim.desktop b/src/mime/x-xim.desktop
similarity index 100%
rename from ksquirrel/mime/x-xim.desktop
rename to src/mime/x-xim.desktop
diff --git a/ksquirrel/mime/x-xwd.desktop b/src/mime/x-xwd.desktop
similarity index 100%
rename from ksquirrel/mime/x-xwd.desktop
rename to src/mime/x-xwd.desktop
diff --git a/ksquirrel/sidebar/Makefile.am b/src/sidebar/Makefile.am
similarity index 94%
rename from ksquirrel/sidebar/Makefile.am
rename to src/sidebar/Makefile.am
index 49b3699..f2c04d1 100644
--- a/ksquirrel/sidebar/Makefile.am
+++ b/src/sidebar/Makefile.am
@@ -12,4 +12,4 @@ EXTRA_DIST = sq_mountview.h sq_multibar.cpp sq_multibar.h sq_treeview.cpp sq_tre
 
 ####### tdevelop will overwrite this part!!! (end)############
 
-INCLUDES = $(all_includes) -I$(srcdir) -I$(top_srcdir)/ksquirrel
+INCLUDES = $(all_includes) -I$(srcdir) -I$(top_srcdir)/src
diff --git a/ksquirrel/sidebar/sq_categoriesview.cpp b/src/sidebar/sq_categoriesview.cpp
similarity index 100%
rename from ksquirrel/sidebar/sq_categoriesview.cpp
rename to src/sidebar/sq_categoriesview.cpp
diff --git a/ksquirrel/sidebar/sq_categoriesview.h b/src/sidebar/sq_categoriesview.h
similarity index 100%
rename from ksquirrel/sidebar/sq_categoriesview.h
rename to src/sidebar/sq_categoriesview.h
diff --git a/ksquirrel/sidebar/sq_categorybrowsermenu.cpp b/src/sidebar/sq_categorybrowsermenu.cpp
similarity index 100%
rename from ksquirrel/sidebar/sq_categorybrowsermenu.cpp
rename to src/sidebar/sq_categorybrowsermenu.cpp
diff --git a/ksquirrel/sidebar/sq_categorybrowsermenu.h b/src/sidebar/sq_categorybrowsermenu.h
similarity index 100%
rename from ksquirrel/sidebar/sq_categorybrowsermenu.h
rename to src/sidebar/sq_categorybrowsermenu.h
diff --git a/ksquirrel/sidebar/sq_directorybasket.cpp b/src/sidebar/sq_directorybasket.cpp
similarity index 100%
rename from ksquirrel/sidebar/sq_directorybasket.cpp
rename to src/sidebar/sq_directorybasket.cpp
diff --git a/ksquirrel/sidebar/sq_directorybasket.h b/src/sidebar/sq_directorybasket.h
similarity index 100%
rename from ksquirrel/sidebar/sq_directorybasket.h
rename to src/sidebar/sq_directorybasket.h
diff --git a/ksquirrel/sidebar/sq_imagebasket.cpp b/src/sidebar/sq_imagebasket.cpp
similarity index 100%
rename from ksquirrel/sidebar/sq_imagebasket.cpp
rename to src/sidebar/sq_imagebasket.cpp
diff --git a/ksquirrel/sidebar/sq_imagebasket.h b/src/sidebar/sq_imagebasket.h
similarity index 100%
rename from ksquirrel/sidebar/sq_imagebasket.h
rename to src/sidebar/sq_imagebasket.h
diff --git a/ksquirrel/sidebar/sq_mountview.cpp b/src/sidebar/sq_mountview.cpp
similarity index 100%
rename from ksquirrel/sidebar/sq_mountview.cpp
rename to src/sidebar/sq_mountview.cpp
diff --git a/ksquirrel/sidebar/sq_mountview.h b/src/sidebar/sq_mountview.h
similarity index 100%
rename from ksquirrel/sidebar/sq_mountview.h
rename to src/sidebar/sq_mountview.h
diff --git a/ksquirrel/sidebar/sq_mountviewitem.cpp b/src/sidebar/sq_mountviewitem.cpp
similarity index 100%
rename from ksquirrel/sidebar/sq_mountviewitem.cpp
rename to src/sidebar/sq_mountviewitem.cpp
diff --git a/ksquirrel/sidebar/sq_mountviewitem.h b/src/sidebar/sq_mountviewitem.h
similarity index 100%
rename from ksquirrel/sidebar/sq_mountviewitem.h
rename to src/sidebar/sq_mountviewitem.h
diff --git a/ksquirrel/sidebar/sq_multibar.cpp b/src/sidebar/sq_multibar.cpp
similarity index 100%
rename from ksquirrel/sidebar/sq_multibar.cpp
rename to src/sidebar/sq_multibar.cpp
diff --git a/ksquirrel/sidebar/sq_multibar.h b/src/sidebar/sq_multibar.h
similarity index 100%
rename from ksquirrel/sidebar/sq_multibar.h
rename to src/sidebar/sq_multibar.h
diff --git a/ksquirrel/sidebar/sq_previewwidget.cpp b/src/sidebar/sq_previewwidget.cpp
similarity index 100%
rename from ksquirrel/sidebar/sq_previewwidget.cpp
rename to src/sidebar/sq_previewwidget.cpp
diff --git a/ksquirrel/sidebar/sq_previewwidget.h b/src/sidebar/sq_previewwidget.h
similarity index 100%
rename from ksquirrel/sidebar/sq_previewwidget.h
rename to src/sidebar/sq_previewwidget.h
diff --git a/ksquirrel/sidebar/sq_storagefile.cpp b/src/sidebar/sq_storagefile.cpp
similarity index 100%
rename from ksquirrel/sidebar/sq_storagefile.cpp
rename to src/sidebar/sq_storagefile.cpp
diff --git a/ksquirrel/sidebar/sq_storagefile.h b/src/sidebar/sq_storagefile.h
similarity index 100%
rename from ksquirrel/sidebar/sq_storagefile.h
rename to src/sidebar/sq_storagefile.h
diff --git a/ksquirrel/sidebar/sq_threaddirlister.cpp b/src/sidebar/sq_threaddirlister.cpp
similarity index 100%
rename from ksquirrel/sidebar/sq_threaddirlister.cpp
rename to src/sidebar/sq_threaddirlister.cpp
diff --git a/ksquirrel/sidebar/sq_threaddirlister.h b/src/sidebar/sq_threaddirlister.h
similarity index 100%
rename from ksquirrel/sidebar/sq_threaddirlister.h
rename to src/sidebar/sq_threaddirlister.h
diff --git a/ksquirrel/sidebar/sq_treeview.cpp b/src/sidebar/sq_treeview.cpp
similarity index 100%
rename from ksquirrel/sidebar/sq_treeview.cpp
rename to src/sidebar/sq_treeview.cpp
diff --git a/ksquirrel/sidebar/sq_treeview.h b/src/sidebar/sq_treeview.h
similarity index 100%
rename from ksquirrel/sidebar/sq_treeview.h
rename to src/sidebar/sq_treeview.h
diff --git a/ksquirrel/sidebar/sq_treeviewitem.cpp b/src/sidebar/sq_treeviewitem.cpp
similarity index 100%
rename from ksquirrel/sidebar/sq_treeviewitem.cpp
rename to src/sidebar/sq_treeviewitem.cpp
diff --git a/ksquirrel/sidebar/sq_treeviewitem.h b/src/sidebar/sq_treeviewitem.h
similarity index 100%
rename from ksquirrel/sidebar/sq_treeviewitem.h
rename to src/sidebar/sq_treeviewitem.h
diff --git a/ksquirrel/sidebar/sq_treeviewmenu.cpp b/src/sidebar/sq_treeviewmenu.cpp
similarity index 100%
rename from ksquirrel/sidebar/sq_treeviewmenu.cpp
rename to src/sidebar/sq_treeviewmenu.cpp
diff --git a/ksquirrel/sidebar/sq_treeviewmenu.h b/src/sidebar/sq_treeviewmenu.h
similarity index 100%
rename from ksquirrel/sidebar/sq_treeviewmenu.h
rename to src/sidebar/sq_treeviewmenu.h
diff --git a/ksquirrel/sq_archivehandler.cpp b/src/sq_archivehandler.cpp
similarity index 100%
rename from ksquirrel/sq_archivehandler.cpp
rename to src/sq_archivehandler.cpp
diff --git a/ksquirrel/sq_archivehandler.h b/src/sq_archivehandler.h
similarity index 100%
rename from ksquirrel/sq_archivehandler.h
rename to src/sq_archivehandler.h
diff --git a/ksquirrel/sq_bookmarkowner.cpp b/src/sq_bookmarkowner.cpp
similarity index 100%
rename from ksquirrel/sq_bookmarkowner.cpp
rename to src/sq_bookmarkowner.cpp
diff --git a/ksquirrel/sq_bookmarkowner.h b/src/sq_bookmarkowner.h
similarity index 100%
rename from ksquirrel/sq_bookmarkowner.h
rename to src/sq_bookmarkowner.h
diff --git a/ksquirrel/sq_codecsettings.cpp b/src/sq_codecsettings.cpp
similarity index 100%
rename from ksquirrel/sq_codecsettings.cpp
rename to src/sq_codecsettings.cpp
diff --git a/ksquirrel/sq_codecsettings.h b/src/sq_codecsettings.h
similarity index 100%
rename from ksquirrel/sq_codecsettings.h
rename to src/sq_codecsettings.h
diff --git a/ksquirrel/sq_codecsettingsskeleton.ui b/src/sq_codecsettingsskeleton.ui
similarity index 100%
rename from ksquirrel/sq_codecsettingsskeleton.ui
rename to src/sq_codecsettingsskeleton.ui
diff --git a/ksquirrel/sq_codecsettingsskeleton.ui.h b/src/sq_codecsettingsskeleton.ui.h
similarity index 100%
rename from ksquirrel/sq_codecsettingsskeleton.ui.h
rename to src/sq_codecsettingsskeleton.ui.h
diff --git a/ksquirrel/sq_config.cpp b/src/sq_config.cpp
similarity index 100%
rename from ksquirrel/sq_config.cpp
rename to src/sq_config.cpp
diff --git a/ksquirrel/sq_config.h b/src/sq_config.h
similarity index 100%
rename from ksquirrel/sq_config.h
rename to src/sq_config.h
diff --git a/ksquirrel/sq_dir.cpp b/src/sq_dir.cpp
similarity index 100%
rename from ksquirrel/sq_dir.cpp
rename to src/sq_dir.cpp
diff --git a/ksquirrel/sq_dir.h b/src/sq_dir.h
similarity index 100%
rename from ksquirrel/sq_dir.h
rename to src/sq_dir.h
diff --git a/ksquirrel/sq_diroperator.cpp b/src/sq_diroperator.cpp
similarity index 100%
rename from ksquirrel/sq_diroperator.cpp
rename to src/sq_diroperator.cpp
diff --git a/ksquirrel/sq_diroperator.h b/src/sq_diroperator.h
similarity index 100%
rename from ksquirrel/sq_diroperator.h
rename to src/sq_diroperator.h
diff --git a/ksquirrel/sq_dirthumbs.cpp b/src/sq_dirthumbs.cpp
similarity index 100%
rename from ksquirrel/sq_dirthumbs.cpp
rename to src/sq_dirthumbs.cpp
diff --git a/ksquirrel/sq_dirthumbs.h b/src/sq_dirthumbs.h
similarity index 100%
rename from ksquirrel/sq_dirthumbs.h
rename to src/sq_dirthumbs.h
diff --git a/ksquirrel/sq_downloader.cpp b/src/sq_downloader.cpp
similarity index 100%
rename from ksquirrel/sq_downloader.cpp
rename to src/sq_downloader.cpp
diff --git a/ksquirrel/sq_downloader.h b/src/sq_downloader.h
similarity index 100%
rename from ksquirrel/sq_downloader.h
rename to src/sq_downloader.h
diff --git a/ksquirrel/sq_dragprovider.cpp b/src/sq_dragprovider.cpp
similarity index 100%
rename from ksquirrel/sq_dragprovider.cpp
rename to src/sq_dragprovider.cpp
diff --git a/ksquirrel/sq_dragprovider.h b/src/sq_dragprovider.h
similarity index 100%
rename from ksquirrel/sq_dragprovider.h
rename to src/sq_dragprovider.h
diff --git a/ksquirrel/sq_errorstring.cpp b/src/sq_errorstring.cpp
similarity index 100%
rename from ksquirrel/sq_errorstring.cpp
rename to src/sq_errorstring.cpp
diff --git a/ksquirrel/sq_errorstring.h b/src/sq_errorstring.h
similarity index 100%
rename from ksquirrel/sq_errorstring.h
rename to src/sq_errorstring.h
diff --git a/ksquirrel/sq_externaltool.cpp b/src/sq_externaltool.cpp
similarity index 100%
rename from ksquirrel/sq_externaltool.cpp
rename to src/sq_externaltool.cpp
diff --git a/ksquirrel/sq_externaltool.h b/src/sq_externaltool.h
similarity index 100%
rename from ksquirrel/sq_externaltool.h
rename to src/sq_externaltool.h
diff --git a/ksquirrel/sq_externaltools.ui b/src/sq_externaltools.ui
similarity index 100%
rename from ksquirrel/sq_externaltools.ui
rename to src/sq_externaltools.ui
diff --git a/ksquirrel/sq_externaltools.ui.h b/src/sq_externaltools.ui.h
similarity index 100%
rename from ksquirrel/sq_externaltools.ui.h
rename to src/sq_externaltools.ui.h
diff --git a/ksquirrel/sq_filedetailview.cpp b/src/sq_filedetailview.cpp
similarity index 100%
rename from ksquirrel/sq_filedetailview.cpp
rename to src/sq_filedetailview.cpp
diff --git a/ksquirrel/sq_filedetailview.h b/src/sq_filedetailview.h
similarity index 100%
rename from ksquirrel/sq_filedetailview.h
rename to src/sq_filedetailview.h
diff --git a/ksquirrel/sq_filedialog.cpp b/src/sq_filedialog.cpp
similarity index 100%
rename from ksquirrel/sq_filedialog.cpp
rename to src/sq_filedialog.cpp
diff --git a/ksquirrel/sq_filedialog.h b/src/sq_filedialog.h
similarity index 100%
rename from ksquirrel/sq_filedialog.h
rename to src/sq_filedialog.h
diff --git a/ksquirrel/sq_fileiconview.cpp b/src/sq_fileiconview.cpp
similarity index 100%
rename from ksquirrel/sq_fileiconview.cpp
rename to src/sq_fileiconview.cpp
diff --git a/ksquirrel/sq_fileiconview.h b/src/sq_fileiconview.h
similarity index 100%
rename from ksquirrel/sq_fileiconview.h
rename to src/sq_fileiconview.h
diff --git a/ksquirrel/sq_fileiconviewbase.cpp b/src/sq_fileiconviewbase.cpp
similarity index 100%
rename from ksquirrel/sq_fileiconviewbase.cpp
rename to src/sq_fileiconviewbase.cpp
diff --git a/ksquirrel/sq_fileiconviewbase.h b/src/sq_fileiconviewbase.h
similarity index 100%
rename from ksquirrel/sq_fileiconviewbase.h
rename to src/sq_fileiconviewbase.h
diff --git a/ksquirrel/sq_filethumbview.cpp b/src/sq_filethumbview.cpp
similarity index 100%
rename from ksquirrel/sq_filethumbview.cpp
rename to src/sq_filethumbview.cpp
diff --git a/ksquirrel/sq_filethumbview.h b/src/sq_filethumbview.h
similarity index 100%
rename from ksquirrel/sq_filethumbview.h
rename to src/sq_filethumbview.h
diff --git a/ksquirrel/sq_filethumbviewitem.cpp b/src/sq_filethumbviewitem.cpp
similarity index 100%
rename from ksquirrel/sq_filethumbviewitem.cpp
rename to src/sq_filethumbviewitem.cpp
diff --git a/ksquirrel/sq_filethumbviewitem.h b/src/sq_filethumbviewitem.h
similarity index 100%
rename from ksquirrel/sq_filethumbviewitem.h
rename to src/sq_filethumbviewitem.h
diff --git a/ksquirrel/sq_filters.ui b/src/sq_filters.ui
similarity index 100%
rename from ksquirrel/sq_filters.ui
rename to src/sq_filters.ui
diff --git a/ksquirrel/sq_filters.ui.h b/src/sq_filters.ui.h
similarity index 100%
rename from ksquirrel/sq_filters.ui.h
rename to src/sq_filters.ui.h
diff --git a/ksquirrel/sq_glinfo.ui b/src/sq_glinfo.ui
similarity index 100%
rename from ksquirrel/sq_glinfo.ui
rename to src/sq_glinfo.ui
diff --git a/ksquirrel/sq_glinfo.ui.h b/src/sq_glinfo.ui.h
similarity index 100%
rename from ksquirrel/sq_glinfo.ui.h
rename to src/sq_glinfo.ui.h
diff --git a/ksquirrel/sq_glparts.cpp b/src/sq_glparts.cpp
similarity index 100%
rename from ksquirrel/sq_glparts.cpp
rename to src/sq_glparts.cpp
diff --git a/ksquirrel/sq_glparts.h b/src/sq_glparts.h
similarity index 100%
rename from ksquirrel/sq_glparts.h
rename to src/sq_glparts.h
diff --git a/ksquirrel/sq_glselectionpainter.cpp b/src/sq_glselectionpainter.cpp
similarity index 100%
rename from ksquirrel/sq_glselectionpainter.cpp
rename to src/sq_glselectionpainter.cpp
diff --git a/ksquirrel/sq_glselectionpainter.h b/src/sq_glselectionpainter.h
similarity index 100%
rename from ksquirrel/sq_glselectionpainter.h
rename to src/sq_glselectionpainter.h
diff --git a/ksquirrel/sq_glu.cpp b/src/sq_glu.cpp
similarity index 100%
rename from ksquirrel/sq_glu.cpp
rename to src/sq_glu.cpp
diff --git a/ksquirrel/sq_glu.h b/src/sq_glu.h
similarity index 100%
rename from ksquirrel/sq_glu.h
rename to src/sq_glu.h
diff --git a/ksquirrel/sq_glview.cpp b/src/sq_glview.cpp
similarity index 100%
rename from ksquirrel/sq_glview.cpp
rename to src/sq_glview.cpp
diff --git a/ksquirrel/sq_glview.h b/src/sq_glview.h
similarity index 100%
rename from ksquirrel/sq_glview.h
rename to src/sq_glview.h
diff --git a/ksquirrel/sq_glwidget.cpp b/src/sq_glwidget.cpp
similarity index 100%
rename from ksquirrel/sq_glwidget.cpp
rename to src/sq_glwidget.cpp
diff --git a/ksquirrel/sq_glwidget.h b/src/sq_glwidget.h
similarity index 100%
rename from ksquirrel/sq_glwidget.h
rename to src/sq_glwidget.h
diff --git a/ksquirrel/sq_glwidget_helpers.cpp b/src/sq_glwidget_helpers.cpp
similarity index 100%
rename from ksquirrel/sq_glwidget_helpers.cpp
rename to src/sq_glwidget_helpers.cpp
diff --git a/ksquirrel/sq_glwidget_helpers.h b/src/sq_glwidget_helpers.h
similarity index 100%
rename from ksquirrel/sq_glwidget_helpers.h
rename to src/sq_glwidget_helpers.h
diff --git a/ksquirrel/sq_glwidget_stuff.cpp b/src/sq_glwidget_stuff.cpp
similarity index 100%
rename from ksquirrel/sq_glwidget_stuff.cpp
rename to src/sq_glwidget_stuff.cpp
diff --git a/ksquirrel/sq_helpwidget.ui b/src/sq_helpwidget.ui
similarity index 100%
rename from ksquirrel/sq_helpwidget.ui
rename to src/sq_helpwidget.ui
diff --git a/ksquirrel/sq_helpwidget.ui.h b/src/sq_helpwidget.ui.h
similarity index 100%
rename from ksquirrel/sq_helpwidget.ui.h
rename to src/sq_helpwidget.ui.h
diff --git a/ksquirrel/sq_hloptions.cpp b/src/sq_hloptions.cpp
similarity index 100%
rename from ksquirrel/sq_hloptions.cpp
rename to src/sq_hloptions.cpp
diff --git a/ksquirrel/sq_hloptions.h b/src/sq_hloptions.h
similarity index 100%
rename from ksquirrel/sq_hloptions.h
rename to src/sq_hloptions.h
diff --git a/ksquirrel/sq_iconlistbox.cpp b/src/sq_iconlistbox.cpp
similarity index 100%
rename from ksquirrel/sq_iconlistbox.cpp
rename to src/sq_iconlistbox.cpp
diff --git a/ksquirrel/sq_iconlistbox.h b/src/sq_iconlistbox.h
similarity index 100%
rename from ksquirrel/sq_iconlistbox.h
rename to src/sq_iconlistbox.h
diff --git a/ksquirrel/sq_iconlistitem.cpp b/src/sq_iconlistitem.cpp
similarity index 100%
rename from ksquirrel/sq_iconlistitem.cpp
rename to src/sq_iconlistitem.cpp
diff --git a/ksquirrel/sq_iconlistitem.h b/src/sq_iconlistitem.h
similarity index 100%
rename from ksquirrel/sq_iconlistitem.h
rename to src/sq_iconlistitem.h
diff --git a/ksquirrel/sq_iconloader.cpp b/src/sq_iconloader.cpp
similarity index 100%
rename from ksquirrel/sq_iconloader.cpp
rename to src/sq_iconloader.cpp
diff --git a/ksquirrel/sq_iconloader.h b/src/sq_iconloader.h
similarity index 100%
rename from ksquirrel/sq_iconloader.h
rename to src/sq_iconloader.h
diff --git a/ksquirrel/sq_iconloader_pixmaps.h b/src/sq_iconloader_pixmaps.h
similarity index 100%
rename from ksquirrel/sq_iconloader_pixmaps.h
rename to src/sq_iconloader_pixmaps.h
diff --git a/ksquirrel/sq_imageloader.cpp b/src/sq_imageloader.cpp
similarity index 100%
rename from ksquirrel/sq_imageloader.cpp
rename to src/sq_imageloader.cpp
diff --git a/ksquirrel/sq_imageloader.h b/src/sq_imageloader.h
similarity index 100%
rename from ksquirrel/sq_imageloader.h
rename to src/sq_imageloader.h
diff --git a/ksquirrel/sq_imageproperties.ui b/src/sq_imageproperties.ui
similarity index 100%
rename from ksquirrel/sq_imageproperties.ui
rename to src/sq_imageproperties.ui
diff --git a/ksquirrel/sq_imageproperties.ui.h b/src/sq_imageproperties.ui.h
similarity index 100%
rename from ksquirrel/sq_imageproperties.ui.h
rename to src/sq_imageproperties.ui.h
diff --git a/ksquirrel/sq_kipiinterface.cpp b/src/sq_kipiinterface.cpp
similarity index 100%
rename from ksquirrel/sq_kipiinterface.cpp
rename to src/sq_kipiinterface.cpp
diff --git a/ksquirrel/sq_kipiinterface.h b/src/sq_kipiinterface.h
similarity index 100%
rename from ksquirrel/sq_kipiinterface.h
rename to src/sq_kipiinterface.h
diff --git a/ksquirrel/sq_kipimanager.cpp b/src/sq_kipimanager.cpp
similarity index 100%
rename from ksquirrel/sq_kipimanager.cpp
rename to src/sq_kipimanager.cpp
diff --git a/ksquirrel/sq_kipimanager.h b/src/sq_kipimanager.h
similarity index 100%
rename from ksquirrel/sq_kipimanager.h
rename to src/sq_kipimanager.h
diff --git a/ksquirrel/sq_library.h b/src/sq_library.h
similarity index 100%
rename from ksquirrel/sq_library.h
rename to src/sq_library.h
diff --git a/ksquirrel/sq_libraryhandler.cpp b/src/sq_libraryhandler.cpp
similarity index 100%
rename from ksquirrel/sq_libraryhandler.cpp
rename to src/sq_libraryhandler.cpp
diff --git a/ksquirrel/sq_libraryhandler.h b/src/sq_libraryhandler.h
similarity index 100%
rename from ksquirrel/sq_libraryhandler.h
rename to src/sq_libraryhandler.h
diff --git a/ksquirrel/sq_navigatordropmenu.cpp b/src/sq_navigatordropmenu.cpp
similarity index 100%
rename from ksquirrel/sq_navigatordropmenu.cpp
rename to src/sq_navigatordropmenu.cpp
diff --git a/ksquirrel/sq_navigatordropmenu.h b/src/sq_navigatordropmenu.h
similarity index 100%
rename from ksquirrel/sq_navigatordropmenu.h
rename to src/sq_navigatordropmenu.h
diff --git a/ksquirrel/sq_options.ui b/src/sq_options.ui
similarity index 100%
rename from ksquirrel/sq_options.ui
rename to src/sq_options.ui
diff --git a/ksquirrel/sq_options.ui.h b/src/sq_options.ui.h
similarity index 100%
rename from ksquirrel/sq_options.ui.h
rename to src/sq_options.ui.h
diff --git a/ksquirrel/sq_pixmapcache.cpp b/src/sq_pixmapcache.cpp
similarity index 100%
rename from ksquirrel/sq_pixmapcache.cpp
rename to src/sq_pixmapcache.cpp
diff --git a/ksquirrel/sq_pixmapcache.h b/src/sq_pixmapcache.h
similarity index 100%
rename from ksquirrel/sq_pixmapcache.h
rename to src/sq_pixmapcache.h
diff --git a/ksquirrel/sq_pluginsinfo.ui b/src/sq_pluginsinfo.ui
similarity index 100%
rename from ksquirrel/sq_pluginsinfo.ui
rename to src/sq_pluginsinfo.ui
diff --git a/ksquirrel/sq_pluginsinfo.ui.h b/src/sq_pluginsinfo.ui.h
similarity index 100%
rename from ksquirrel/sq_pluginsinfo.ui.h
rename to src/sq_pluginsinfo.ui.h
diff --git a/ksquirrel/sq_popupmenu.cpp b/src/sq_popupmenu.cpp
similarity index 100%
rename from ksquirrel/sq_popupmenu.cpp
rename to src/sq_popupmenu.cpp
diff --git a/ksquirrel/sq_popupmenu.h b/src/sq_popupmenu.h
similarity index 100%
rename from ksquirrel/sq_popupmenu.h
rename to src/sq_popupmenu.h
diff --git a/ksquirrel/sq_progress.cpp b/src/sq_progress.cpp
similarity index 100%
rename from ksquirrel/sq_progress.cpp
rename to src/sq_progress.cpp
diff --git a/ksquirrel/sq_progress.h b/src/sq_progress.h
similarity index 100%
rename from ksquirrel/sq_progress.h
rename to src/sq_progress.h
diff --git a/ksquirrel/sq_progressbox.cpp b/src/sq_progressbox.cpp
similarity index 100%
rename from ksquirrel/sq_progressbox.cpp
rename to src/sq_progressbox.cpp
diff --git a/ksquirrel/sq_progressbox.h b/src/sq_progressbox.h
similarity index 100%
rename from ksquirrel/sq_progressbox.h
rename to src/sq_progressbox.h
diff --git a/ksquirrel/sq_selectdeselectgroup.ui b/src/sq_selectdeselectgroup.ui
similarity index 100%
rename from ksquirrel/sq_selectdeselectgroup.ui
rename to src/sq_selectdeselectgroup.ui
diff --git a/ksquirrel/sq_selectdeselectgroup.ui.h b/src/sq_selectdeselectgroup.ui.h
similarity index 100%
rename from ksquirrel/sq_selectdeselectgroup.ui.h
rename to src/sq_selectdeselectgroup.ui.h
diff --git a/ksquirrel/sq_slideshow.ui b/src/sq_slideshow.ui
similarity index 100%
rename from ksquirrel/sq_slideshow.ui
rename to src/sq_slideshow.ui
diff --git a/ksquirrel/sq_slideshow.ui.h b/src/sq_slideshow.ui.h
similarity index 100%
rename from ksquirrel/sq_slideshow.ui.h
rename to src/sq_slideshow.ui.h
diff --git a/ksquirrel/sq_slideshowlisting.ui b/src/sq_slideshowlisting.ui
similarity index 100%
rename from ksquirrel/sq_slideshowlisting.ui
rename to src/sq_slideshowlisting.ui
diff --git a/ksquirrel/sq_slideshowlisting.ui.h b/src/sq_slideshowlisting.ui.h
similarity index 100%
rename from ksquirrel/sq_slideshowlisting.ui.h
rename to src/sq_slideshowlisting.ui.h
diff --git a/ksquirrel/sq_slideshowwidget.cpp b/src/sq_slideshowwidget.cpp
similarity index 100%
rename from ksquirrel/sq_slideshowwidget.cpp
rename to src/sq_slideshowwidget.cpp
diff --git a/ksquirrel/sq_slideshowwidget.h b/src/sq_slideshowwidget.h
similarity index 100%
rename from ksquirrel/sq_slideshowwidget.h
rename to src/sq_slideshowwidget.h
diff --git a/ksquirrel/sq_splashscreen.cpp b/src/sq_splashscreen.cpp
similarity index 100%
rename from ksquirrel/sq_splashscreen.cpp
rename to src/sq_splashscreen.cpp
diff --git a/ksquirrel/sq_splashscreen.h b/src/sq_splashscreen.h
similarity index 100%
rename from ksquirrel/sq_splashscreen.h
rename to src/sq_splashscreen.h
diff --git a/ksquirrel/sq_tabopendialog.ui b/src/sq_tabopendialog.ui
similarity index 100%
rename from ksquirrel/sq_tabopendialog.ui
rename to src/sq_tabopendialog.ui
diff --git a/ksquirrel/sq_tabopendialog.ui.h b/src/sq_tabopendialog.ui.h
similarity index 100%
rename from ksquirrel/sq_tabopendialog.ui.h
rename to src/sq_tabopendialog.ui.h
diff --git a/ksquirrel/sq_thumbnailcachemaster.ui b/src/sq_thumbnailcachemaster.ui
similarity index 100%
rename from ksquirrel/sq_thumbnailcachemaster.ui
rename to src/sq_thumbnailcachemaster.ui
diff --git a/ksquirrel/sq_thumbnailcachemaster.ui.h b/src/sq_thumbnailcachemaster.ui.h
similarity index 100%
rename from ksquirrel/sq_thumbnailcachemaster.ui.h
rename to src/sq_thumbnailcachemaster.ui.h
diff --git a/ksquirrel/sq_thumbnailinfo.h b/src/sq_thumbnailinfo.h
similarity index 100%
rename from ksquirrel/sq_thumbnailinfo.h
rename to src/sq_thumbnailinfo.h
diff --git a/ksquirrel/sq_thumbnailloadjob.cpp b/src/sq_thumbnailloadjob.cpp
similarity index 100%
rename from ksquirrel/sq_thumbnailloadjob.cpp
rename to src/sq_thumbnailloadjob.cpp
diff --git a/ksquirrel/sq_thumbnailloadjob.h b/src/sq_thumbnailloadjob.h
similarity index 100%
rename from ksquirrel/sq_thumbnailloadjob.h
rename to src/sq_thumbnailloadjob.h
diff --git a/ksquirrel/sq_thumbnailsize.cpp b/src/sq_thumbnailsize.cpp
similarity index 100%
rename from ksquirrel/sq_thumbnailsize.cpp
rename to src/sq_thumbnailsize.cpp
diff --git a/ksquirrel/sq_thumbnailsize.h b/src/sq_thumbnailsize.h
similarity index 100%
rename from ksquirrel/sq_thumbnailsize.h
rename to src/sq_thumbnailsize.h
diff --git a/ksquirrel/sq_thumbnailsunused.cpp b/src/sq_thumbnailsunused.cpp
similarity index 100%
rename from ksquirrel/sq_thumbnailsunused.cpp
rename to src/sq_thumbnailsunused.cpp
diff --git a/ksquirrel/sq_thumbnailsunused.h b/src/sq_thumbnailsunused.h
similarity index 100%
rename from ksquirrel/sq_thumbnailsunused.h
rename to src/sq_thumbnailsunused.h
diff --git a/ksquirrel/sq_utils.cpp b/src/sq_utils.cpp
similarity index 100%
rename from ksquirrel/sq_utils.cpp
rename to src/sq_utils.cpp
diff --git a/ksquirrel/sq_utils.h b/src/sq_utils.h
similarity index 100%
rename from ksquirrel/sq_utils.h
rename to src/sq_utils.h
diff --git a/ksquirrel/sq_utils_asm_scale.S b/src/sq_utils_asm_scale.S
similarity index 100%
rename from ksquirrel/sq_utils_asm_scale.S
rename to src/sq_utils_asm_scale.S
diff --git a/ksquirrel/sq_utils_scale.cpp b/src/sq_utils_scale.cpp
similarity index 100%
rename from ksquirrel/sq_utils_scale.cpp
rename to src/sq_utils_scale.cpp
diff --git a/ksquirrel/sq_version b/src/sq_version
similarity index 100%
rename from ksquirrel/sq_version
rename to src/sq_version
diff --git a/ksquirrel/sq_viewcache.ui b/src/sq_viewcache.ui
similarity index 100%
rename from ksquirrel/sq_viewcache.ui
rename to src/sq_viewcache.ui
diff --git a/ksquirrel/sq_viewcache.ui.h b/src/sq_viewcache.ui.h
similarity index 100%
rename from ksquirrel/sq_viewcache.ui.h
rename to src/sq_viewcache.ui.h
diff --git a/ksquirrel/sq_widgetstack.cpp b/src/sq_widgetstack.cpp
similarity index 100%
rename from ksquirrel/sq_widgetstack.cpp
rename to src/sq_widgetstack.cpp
diff --git a/ksquirrel/sq_widgetstack.h b/src/sq_widgetstack.h
similarity index 100%
rename from ksquirrel/sq_widgetstack.h
rename to src/sq_widgetstack.h
diff --git a/subdirs b/subdirs
index a671acc..e78abf8 100644
--- a/subdirs
+++ b/subdirs
@@ -1,4 +1,4 @@
 doc
-ksquirrel
+src
 pics
 po