diff --git a/core/document.cpp b/core/document.cpp
index a6543851e..00a7ace5e 100644
--- a/core/document.cpp
+++ b/core/document.cpp
@@ -28,9 +28,9 @@
 #include "document.h"
 #include "page.h"
 #include "link.h"
-#include "settings.h"
-#include "generator_pdf.h"  // PDF generator
-//#include "generator_ps.H" // PS generator
+#include "conf/settings.h"
+#include "generator_pdf/generator_pdf.h"  // PDF generator
+//#include "generator_ps/generator_ps.H" // PS generator
 
 // structures used internally by KPDFDocument for local variables storage
 class KPDFDocumentPrivate
diff --git a/core/generator_pdf/generator_pdf.cpp b/core/generator_pdf/generator_pdf.cpp
index c13890ed3..ae724d401 100644
--- a/core/generator_pdf/generator_pdf.cpp
+++ b/core/generator_pdf/generator_pdf.cpp
@@ -31,9 +31,9 @@
 // local includes
 #include "generator_pdf.h"
 #include "gp_outputdev.h"
-#include "document.h" //for PAGEVIEW_ID
-#include "page.h"
-#include "settings.h"
+#include "core/document.h" //for PAGEVIEW_ID
+#include "core/page.h"
+#include "conf/settings.h"
 
 // id for DATA_READY ThreadedGenerator Event
 #define TGE_DATAREADY_ID 6969
diff --git a/core/generator_pdf/generator_pdf.h b/core/generator_pdf/generator_pdf.h
index ea796fe29..c4c2964ee 100644
--- a/core/generator_pdf/generator_pdf.h
+++ b/core/generator_pdf/generator_pdf.h
@@ -15,9 +15,9 @@
 #include <qcolor.h>
 #include <qstring.h>
 #include <qthread.h>
-#include "generator.h"
-#include "document.h"
-#include "link.h"
+#include "core/generator.h"
+#include "core/document.h"
+#include "core/link.h"
 
 class PDFDoc;
 class GList;
diff --git a/core/generator_pdf/gp_outputdev.cpp b/core/generator_pdf/gp_outputdev.cpp
index edc10c054..ee0d2121a 100644
--- a/core/generator_pdf/gp_outputdev.cpp
+++ b/core/generator_pdf/gp_outputdev.cpp
@@ -25,8 +25,8 @@
 
 #include "gp_outputdev.h"
 #include "generator_pdf.h"
-#include "page.h"
-#include "link.h"
+#include "core/page.h"
+#include "core/link.h"
 #include "xpdf/Link.h"
 #include "xpdf/GfxState.h"
 #include "xpdf/TextOutputDev.h"
diff --git a/core/link.cpp b/core/link.cpp
index f62b3531b..cc56be1f8 100644
--- a/core/link.cpp
+++ b/core/link.cpp
@@ -13,14 +13,3 @@
 KPDFLink::~KPDFLink()
 {
 }
-
-/*
-void KPDFLink::copyString( char * &dest, const char * src ) const
-{
-    if ( src )
-    {
-        dest = new char[ strlen(src) + 1 ];
-        strcpy( &dest[0], src );
-    }
-}
-*/
diff --git a/core/link.h b/core/link.h
index 82e55bb30..df49bdf71 100644
--- a/core/link.h
+++ b/core/link.h
@@ -15,7 +15,6 @@
 
 /**
  * @short Encapsulates data that describes a link.
- * ### MERGE: MOVE definition/implementation to kpdflink.h/.cpp
  * ### TODO: recomment
  */
 class KPDFLink
@@ -33,7 +32,7 @@ class KPDFLink
 class KPDFLinkGoto : public KPDFLink
 {
     public:
-        // define a 'Viewport' TODO improve this
+        // define a 'Viewport' TODO MERGE WITH PAGE DEFINED VIEWPORT
         struct Viewport {
             int page;
             bool fitWidth, fitHeight;
diff --git a/core/page.cpp b/core/page.cpp
index bcba8ee70..278215ed8 100644
--- a/core/page.cpp
+++ b/core/page.cpp
@@ -23,7 +23,7 @@
 // local includes
 #include "page.h"
 #include "link.h"
-#include "settings.h"
+#include "conf/settings.h"
 #include "xpdf/TextOutputDev.h"
 
 
diff --git a/ui/pageview.cpp b/ui/pageview.cpp
index bfc6110d5..beaf07614 100644
--- a/ui/pageview.cpp
+++ b/ui/pageview.cpp
@@ -39,10 +39,10 @@
 
 #include "pageview.h"
 #include "pageviewutils.h"
-#include "page.h"
-#include "link.h"
-#include "generator.h"
-#include "settings.h"
+#include "core/page.h"
+#include "core/link.h"
+#include "core/generator.h"
+#include "conf/settings.h"
 
 #define ROUND(x) (int(x + 0.5))
 
diff --git a/ui/pageview.h b/ui/pageview.h
index 7c25ea990..caac20079 100644
--- a/ui/pageview.h
+++ b/ui/pageview.h
@@ -22,7 +22,7 @@
 #include <qscrollview.h>
 #include <qvaluevector.h>
 
-#include "document.h"
+#include "core/document.h"
 
 class KURL;
 class KActionCollection;
diff --git a/ui/pageviewutils.cpp b/ui/pageviewutils.cpp
index a546df9ed..56707a2fb 100644
--- a/ui/pageviewutils.cpp
+++ b/ui/pageviewutils.cpp
@@ -17,8 +17,8 @@
 
 // local includes
 #include "pageviewutils.h"
-#include "page.h"
-#include "settings.h"
+#include "core/page.h"
+#include "core/settings.h"
 
 PageViewMessage::PageViewMessage( QWidget * parent )
     : QWidget( parent, "pageViewMessage" ), m_timer( 0 )
diff --git a/ui/presentationwidget.cpp b/ui/presentationwidget.cpp
index cfacd6824..3d47e7394 100644
--- a/ui/presentationwidget.cpp
+++ b/ui/presentationwidget.cpp
@@ -25,10 +25,10 @@
 
 // local includes
 #include "presentationwidget.h"
-#include "document.h"   // for PRESENTATION_ID
-#include "generator.h"
-#include "page.h"
-#include "settings.h"
+#include "core/document.h"   // for PRESENTATION_ID
+#include "core/generator.h"
+#include "core/page.h"
+#include "conf/settings.h"
 
 
 // comment this to disable the top-right progress indicator
diff --git a/ui/presentationwidget.h b/ui/presentationwidget.h
index 67bffa812..0c7a7c4ec 100644
--- a/ui/presentationwidget.h
+++ b/ui/presentationwidget.h
@@ -14,7 +14,7 @@
 #include <qpixmap.h>
 #include <qstringlist.h>
 #include <qvaluevector.h>
-#include "document.h"
+#include "core/document.h"
 
 class PresentationFrame;
 class KToolBar;
diff --git a/ui/propertiesdialog.cpp b/ui/propertiesdialog.cpp
index 84d6f6b64..0e4d9c8ae 100644
--- a/ui/propertiesdialog.cpp
+++ b/ui/propertiesdialog.cpp
@@ -7,13 +7,14 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
+// qt/kde includes
 #include <klocale.h>
-
 #include <qlabel.h>
 
-#include "document.h"
-#include "properties.h"
+// local includes
 #include "propertiesdialog.h"
+#include "properties.h"
+#include "core/document.h"
 
 propertiesDialog::propertiesDialog(QWidget *parent, KPDFDocument *doc) : KDialogBase(parent, 0, true, i18n( "Unknown file." ), Ok)
 {
diff --git a/ui/searchwidget.cpp b/ui/searchwidget.cpp
index 89958d141..739cde215 100644
--- a/ui/searchwidget.cpp
+++ b/ui/searchwidget.cpp
@@ -21,8 +21,8 @@
 
 // local includes
 #include "searchwidget.h"
-#include "document.h"
-#include "settings.h"
+#include "core/document.h"
+#include "conf/settings.h"
 
 // uncomment following to enable the case switching button
 //#define SW_ENABLE_CASE_BUTTON
diff --git a/ui/thumbnaillist.cpp b/ui/thumbnaillist.cpp
index ef035244f..9b98d977c 100644
--- a/ui/thumbnaillist.cpp
+++ b/ui/thumbnaillist.cpp
@@ -7,6 +7,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
+// qt/kde includes
 #include <qtimer.h>
 #include <qpainter.h>
 #include <klocale.h>
@@ -15,9 +16,10 @@
 #include <kaction.h>
 #include <kactioncollection.h>
 
+// local includes
 #include "thumbnaillist.h"
-#include "generator.h"
-#include "page.h"
+#include "core/generator.h"
+#include "core/page.h"
 
 // ThumbnailWidget represents a single thumbnail in the ThumbnailList
 class ThumbnailWidget : public QWidget
diff --git a/ui/thumbnaillist.h b/ui/thumbnaillist.h
index 7d1f05c50..83d8bb8e3 100644
--- a/ui/thumbnaillist.h
+++ b/ui/thumbnaillist.h
@@ -13,7 +13,7 @@
 #include <qscrollview.h>
 #include <qvaluevector.h>
 #include <qvbox.h>
-#include "document.h"
+#include "core/document.h"
 
 class QTimer;
 class KActionCollection;
diff --git a/ui/toc.cpp b/ui/toc.cpp
index 57f7eae7d..fcb1abcad 100644
--- a/ui/toc.cpp
+++ b/ui/toc.cpp
@@ -13,8 +13,8 @@
 
 // local includes
 #include "toc.h"
-#include "page.h"
-#include "document.h"
+#include "core/page.h"
+#include "core/document.h"
 
 // uncomment following to enable a 2nd column showing the page referred by
 // each tree entry
diff --git a/ui/toc.h b/ui/toc.h
index e22f2ee9c..8cdad1695 100644
--- a/ui/toc.h
+++ b/ui/toc.h
@@ -12,7 +12,7 @@
 
 #include <klistview.h>
 
-#include "document.h"
+#include "core/document.h"
 
 class TOC : public KListView, public KPDFDocumentObserver
 {