diff --git a/src/qtgui/recoll_fr.ts b/src/qtgui/i18n/recoll_fr.ts
similarity index 100%
rename from src/qtgui/recoll_fr.ts
rename to src/qtgui/i18n/recoll_fr.ts
diff --git a/src/qtgui/recoll_ru.ts b/src/qtgui/i18n/recoll_ru.ts
similarity index 100%
rename from src/qtgui/recoll_ru.ts
rename to src/qtgui/i18n/recoll_ru.ts
diff --git a/src/qtgui/recoll_uk.ts b/src/qtgui/i18n/recoll_uk.ts
similarity index 100%
rename from src/qtgui/recoll_uk.ts
rename to src/qtgui/i18n/recoll_uk.ts
diff --git a/src/qtgui/main.cpp b/src/qtgui/main.cpp
index b3705909..bb235933 100644
--- a/src/qtgui/main.cpp
+++ b/src/qtgui/main.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: main.cpp,v 1.49 2006-09-13 13:53:35 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: main.cpp,v 1.50 2006-09-22 07:37:38 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -49,7 +49,7 @@ static char rcsid[] = "@(#$Id: main.cpp,v 1.49 2006-09-13 13:53:35 dockes Exp $
 #ifdef WITH_KDE
 #include "rclversion.h"
 #endif
-#include "rclmain.h"
+#include "rclmain_w.h"
 #include "guiutils.h"
 
 #ifdef WITH_KDE
diff --git a/src/qtgui/recollmain.ui b/src/qtgui/rclmain.ui
similarity index 100%
rename from src/qtgui/recollmain.ui
rename to src/qtgui/rclmain.ui
diff --git a/src/qtgui/rclmain.cpp b/src/qtgui/rclmain_w.cpp
similarity index 99%
rename from src/qtgui/rclmain.cpp
rename to src/qtgui/rclmain_w.cpp
index c967c7bb..d939a5d6 100644
--- a/src/qtgui/rclmain.cpp
+++ b/src/qtgui/rclmain_w.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: rclmain.cpp,v 1.35 2006-09-22 07:29:34 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: rclmain_w.cpp,v 1.1 2006-09-22 07:41:35 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -61,8 +61,8 @@ using std::pair;
 #include "reslist.h"
 #include "transcode.h"
 
-#include "rclmain.h"
-#include "moc_rclmain.cpp"
+#include "rclmain_w.h"
+#include "moc_rclmain_w.cpp"
 
 extern "C" int XFlush(void *);
 
diff --git a/src/qtgui/rclmain.h b/src/qtgui/rclmain_w.h
similarity index 96%
rename from src/qtgui/rclmain.h
rename to src/qtgui/rclmain_w.h
index bf882611..f37ae9ff 100644
--- a/src/qtgui/rclmain.h
+++ b/src/qtgui/rclmain_w.h
@@ -14,8 +14,8 @@
  *   Free Software Foundation, Inc.,
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-#ifndef RCLMAIN_H
-#define RCLMAIN_H
+#ifndef RCLMAIN_W_H
+#define RCLMAIN_W_H
 
 #include <qvariant.h>
 #include <qmainwindow.h>
@@ -28,7 +28,7 @@
 #include "rcldb.h"
 #include "searchdata.h"
 
-#include "recollmain.h"
+#include "rclmain.h"
 
 class RclMain : public RclMainBase
 {
@@ -79,4 +79,4 @@ private:
     virtual void init();
 };
 
-#endif // RCLMAIN_H
+#endif // RCLMAIN_W_H