diff --git a/ChangeLog b/ChangeLog
index bdcd4a484b8..6e9d41a936c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 /* ChangeLog,v 1.214 2004/11/12 00:42:21 gsherman Exp */
 ------------------------------------------------------------------------------
 Version 0.8 'Joesephine' .... development version
+2006-01-08 [gsherman] 0.7.9.7
+** Moved providers to the src directory
 2006-01-08 [timlinux] 0.7.9.6
 ** refactored libqgis into core and gui libs.
 2006-01-01 [timlinux] 0.7.9.5
diff --git a/Makefile.am b/Makefile.am
index 836d0dab55d..66688817059 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,7 @@ docdatadir = $(datadir)/$(PACKAGE)/doc
 docdata_DATA = AUTHORS
 
 if HAVE_QT4
-SUBDIRS = src providers plugins doc tools i18n helpviewer resources images
+SUBDIRS = src plugins doc tools i18n helpviewer resources images
 endif
 
 pkginclude_HEADERS = qgsconfig.h
diff --git a/configure.in b/configure.in
index d0afba02be9..68a4873d3e9 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl ---------------------------------------------------------------------------
 MAJOR_VERSION=0
 MINOR_VERSION=7
 MICRO_VERSION=9
-EXTRA_VERSION=6
+EXTRA_VERSION=7
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}
 else
@@ -473,13 +473,6 @@ AC_CONFIG_FILES([
   plugins/north_arrow/Makefile
   plugins/scale_bar/Makefile
   plugins/spit/Makefile
-  providers/Makefile 
-  providers/delimitedtext/Makefile
-  providers/gpx/Makefile
-  providers/grass/Makefile
-  providers/ogr/Makefile
-  providers/postgres/Makefile
-  providers/wms/Makefile
   resources/Makefile
   src/Makefile 
   src/composer/Makefile
@@ -493,6 +486,13 @@ AC_CONFIG_FILES([
   src/ui/Makefile
   src/widgets/Makefile
   src/widgets/projectionselector/Makefile
+  src/providers/Makefile 
+  src/providers/delimitedtext/Makefile
+  src/providers/gpx/Makefile
+  src/providers/grass/Makefile
+  src/providers/ogr/Makefile
+  src/providers/postgres/Makefile
+  src/providers/wms/Makefile
   tools/Makefile
   tools/mapserver_export/Makefile
   tools/qgis_config/Makefile
diff --git a/plugins/grass/Makefile.am b/plugins/grass/Makefile.am
index 681a92ae09e..c155415d9c0 100644
--- a/plugins/grass/Makefile.am
+++ b/plugins/grass/Makefile.am
@@ -85,8 +85,8 @@ grassplugin_la_SOURCES = qgsgrassplugin.cpp \
 			 qgsgrassattributes.h \
 			 qgsgrassregion.cpp \
 			 qgsgrassregion.h \
-			 ../../providers/grass/qgsgrass.h \
-			 ../../providers/grass/qgsgrassprovider.h \
+			 ../../src/providers/grass/qgsgrass.h \
+			 ../../src/providers/grass/qgsgrassprovider.h \
 			 $(plugin_UI)
 
 nodist_grassplugin_la_SOURCES = $(plugin_MOC)
@@ -114,7 +114,7 @@ qgsgrassregionbase.h: qgsgrassregionbase.ui
 BUILT_SOURCES = $(plugin_MOC) $(plugin_UI)
 
 
-grassplugin_la_LIBADD = $(QT_LDADD) ../../providers/grass/libqgisgrass.la $(GRASS_LIB) $(PG_LIB) $(GDAL_LDADD) ../../src/libqgis_gui.la ../../src/core/libqgis_core.la ../../src/raster/libqgis_raster.la
+grassplugin_la_LIBADD = $(QT_LDADD) ../../src/providers/grass/libqgisgrass.la $(GRASS_LIB) $(PG_LIB) $(GDAL_LDADD) ../../src/libqgis_gui.la ../../src/core/libqgis_core.la ../../src/raster/libqgis_raster.la
 grassplugin_la_LDFLAGS = -avoid-version -module
 grassplugin_la_CXXFLAGS = $(PREFIX) $(CXXFLAGS) -I$(GRASS_INC) $(DEFS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I$(PG_INC)  $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/legend/ -I../../src/raster -I../../src/ui 
 
diff --git a/plugins/grass/qgsgrassattributes.cpp b/plugins/grass/qgsgrassattributes.cpp
index 5543e6a6eeb..1ff20798b46 100644
--- a/plugins/grass/qgsgrassattributes.cpp
+++ b/plugins/grass/qgsgrassattributes.cpp
@@ -52,8 +52,8 @@ extern "C" {
 #include <Vect.h>
 }
 
-#include "../../providers/grass/qgsgrass.h"
-#include "../../providers/grass/qgsgrassprovider.h"
+#include "../../src/providers/grass/qgsgrass.h"
+#include "../../src/providers/grass/qgsgrassprovider.h"
 #include "qgsgrassedit.h"
 #include "qgsgrassattributes.h"
 
diff --git a/plugins/grass/qgsgrassedit.cpp b/plugins/grass/qgsgrassedit.cpp
index a9c33fa1d82..9a8586c3396 100644
--- a/plugins/grass/qgsgrassedit.cpp
+++ b/plugins/grass/qgsgrassedit.cpp
@@ -55,8 +55,8 @@ extern "C" {
 #include <Vect.h>
 }
 
-#include "../../providers/grass/qgsgrass.h"
-#include "../../providers/grass/qgsgrassprovider.h"
+#include "../../src/providers/grass/qgsgrass.h"
+#include "../../src/providers/grass/qgsgrassprovider.h"
 #include "qgsgrassattributes.h"
 #include "qgsgrassedit.h"
 
diff --git a/plugins/grass/qgsgrassmapcalc.cpp b/plugins/grass/qgsgrassmapcalc.cpp
index 637c784843e..cbe2e516c0e 100644
--- a/plugins/grass/qgsgrassmapcalc.cpp
+++ b/plugins/grass/qgsgrassmapcalc.cpp
@@ -55,8 +55,8 @@ extern "C" {
 #include <Vect.h>
 }
 
-#include "../../providers/grass/qgsgrass.h"
-#include "../../providers/grass/qgsgrassprovider.h"
+#include "../../src/providers/grass/qgsgrass.h"
+#include "../../src/providers/grass/qgsgrassprovider.h"
 #include "qgsgrassattributes.h"
 #include "qgsgrassmodule.h"
 #include "qgsgrasstools.h"
diff --git a/plugins/grass/qgsgrassmodule.cpp b/plugins/grass/qgsgrassmodule.cpp
index 687532bf6cb..8444754084d 100644
--- a/plugins/grass/qgsgrassmodule.cpp
+++ b/plugins/grass/qgsgrassmodule.cpp
@@ -76,8 +76,8 @@ extern "C" {
 #include <Vect.h>
 }
 
-#include "../../providers/grass/qgsgrass.h"
-#include "../../providers/grass/qgsgrassprovider.h"
+#include "../../src/providers/grass/qgsgrass.h"
+#include "../../src/providers/grass/qgsgrassprovider.h"
 #include "qgsgrassattributes.h"
 #include "qgsgrassmodule.h"
 #include "qgsgrassmapcalc.h"
diff --git a/plugins/grass/qgsgrassnewmapset.cpp b/plugins/grass/qgsgrassnewmapset.cpp
index 78f21a57793..5ccb041b8f5 100644
--- a/plugins/grass/qgsgrassnewmapset.cpp
+++ b/plugins/grass/qgsgrassnewmapset.cpp
@@ -54,7 +54,7 @@
 #include "qgsspatialrefsys.h"
 #include "../../src/widgets/projectionselector/qgsprojectionselector.h"
 
-#include "../../providers/grass/qgsgrass.h"
+#include "../../src/providers/grass/qgsgrass.h"
 #include "qgsgrassnewmapset.h"
 
 bool QgsGrassNewMapset::mRunning = false;
diff --git a/plugins/grass/qgsgrassplugin.cpp b/plugins/grass/qgsgrassplugin.cpp
index 84626ca9231..cfc346dc571 100644
--- a/plugins/grass/qgsgrassplugin.cpp
+++ b/plugins/grass/qgsgrassplugin.cpp
@@ -54,8 +54,8 @@ extern "C" {
 }
 
 #include "qgsgrassplugin.h"
-#include "../../providers/grass/qgsgrass.h"
-#include "../../providers/grass/qgsgrassprovider.h"
+#include "../../src/providers/grass/qgsgrass.h"
+#include "../../src/providers/grass/qgsgrassprovider.h"
 
 //the gui subclass
 #include "qgsgrassattributes.h"
diff --git a/plugins/grass/qgsgrassregion.cpp b/plugins/grass/qgsgrassregion.cpp
index f01b11c951b..2efc9cbaf3c 100644
--- a/plugins/grass/qgsgrassregion.cpp
+++ b/plugins/grass/qgsgrassregion.cpp
@@ -55,7 +55,7 @@ extern "C" {
 #include <gis.h>
 }
 
-#include "../../providers/grass/qgsgrass.h"
+#include "../../src/providers/grass/qgsgrass.h"
 #include "qgsgrassplugin.h"
 #include "qgsgrassregion.h"
 
diff --git a/plugins/grass/qgsgrassselect.cpp b/plugins/grass/qgsgrassselect.cpp
index 27cab908f67..86179cf527d 100644
--- a/plugins/grass/qgsgrassselect.cpp
+++ b/plugins/grass/qgsgrassselect.cpp
@@ -32,7 +32,7 @@ extern "C" {
 #include <Vect.h>
 }
 
-#include "../../providers/grass/qgsgrass.h"
+#include "../../src/providers/grass/qgsgrass.h"
 #include "qgsgrassselect.h"
 
 QgsGrassSelect::QgsGrassSelect(int type):QgsGrassSelectBase()
diff --git a/plugins/grass/qgsgrasstools.cpp b/plugins/grass/qgsgrasstools.cpp
index 463c7f0bd37..bc6f2825d35 100644
--- a/plugins/grass/qgsgrasstools.cpp
+++ b/plugins/grass/qgsgrasstools.cpp
@@ -63,8 +63,8 @@ extern "C" {
 #include <Vect.h>
 }
 
-#include "../../providers/grass/qgsgrass.h"
-#include "../../providers/grass/qgsgrassprovider.h"
+#include "../../src/providers/grass/qgsgrass.h"
+#include "../../src/providers/grass/qgsgrassprovider.h"
 #include "qgsgrassattributes.h"
 #include "qgsgrasstools.h"
 #include "qgsgrassmodule.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index daf4de51803..f93f1a55096 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,8 +16,13 @@
 if HAVE_QTMAC
 MAC = mac
 endif
-
-SUBDIRS = core ui legend raster composer widgets  $(MAC)
+# NOTE - the order of the SUBDIRS is important. Currently the providers
+#        depend on the existence of libqgis_gui. Since the gui classes
+#        have not been moved into their own directory, the current directory
+#        (.) must be specified immediately before the providers
+#        subdirectory. Once the gui subdirectory is implemented, there is
+#        no need for the current directory to be in the SUBDIRS list
+SUBDIRS =  core ui legend raster composer widgets . providers $(MAC) 
 
 if !HAVE_QTMAC
 PREFIX=-DPREFIX=\"$(prefix)\"
diff --git a/providers/.cvsignore b/src/providers/.cvsignore
similarity index 100%
rename from providers/.cvsignore
rename to src/providers/.cvsignore
diff --git a/providers/Makefile.am b/src/providers/Makefile.am
similarity index 100%
rename from providers/Makefile.am
rename to src/providers/Makefile.am
diff --git a/providers/delimitedtext/.cvsignore b/src/providers/delimitedtext/.cvsignore
similarity index 100%
rename from providers/delimitedtext/.cvsignore
rename to src/providers/delimitedtext/.cvsignore
diff --git a/providers/delimitedtext/Makefile.am b/src/providers/delimitedtext/Makefile.am
similarity index 79%
rename from providers/delimitedtext/Makefile.am
rename to src/providers/delimitedtext/Makefile.am
index 717010013ba..aabb8693c3a 100644
--- a/providers/delimitedtext/Makefile.am
+++ b/src/providers/delimitedtext/Makefile.am
@@ -1,6 +1,6 @@
 ## $Id$
 
-INCLUDES = -I../../src/core/ -I../../src/
+INCLUDES = -I../../core/ -I../../
 
 plugindir = ${pkglibdir}
 plugin_LTLIBRARIES = delimitedtextprovider.la 
@@ -8,7 +8,7 @@ plugin_LTLIBRARIES = delimitedtextprovider.la
 delimitedtextprovider_la_SOURCES = qgsdelimitedtextprovider.cpp
 
 
-delimitedtextprovider_la_LIBADD = $(QT_LDADD)  $(GDAL_LIB) $(GEOS_LDADD) ../../src/libqgis_gui.la ../../src/core/libqgis_core.la
+delimitedtextprovider_la_LIBADD = $(QT_LDADD)  $(GDAL_LIB) $(GEOS_LDADD) ../../libqgis_gui.la ../../core/libqgis_core.la
 delimitedtextprovider_la_LDFLAGS = -avoid-version -module
 delimitedtextprovider_la_CXXFLAGS = $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS)
 
diff --git a/providers/delimitedtext/delimitedtext.pro b/src/providers/delimitedtext/delimitedtext.pro
similarity index 100%
rename from providers/delimitedtext/delimitedtext.pro
rename to src/providers/delimitedtext/delimitedtext.pro
diff --git a/providers/delimitedtext/qgsdelimitedtextprovider.cpp b/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
similarity index 100%
rename from providers/delimitedtext/qgsdelimitedtextprovider.cpp
rename to src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
diff --git a/providers/delimitedtext/qgsdelimitedtextprovider.h b/src/providers/delimitedtext/qgsdelimitedtextprovider.h
similarity index 100%
rename from providers/delimitedtext/qgsdelimitedtextprovider.h
rename to src/providers/delimitedtext/qgsdelimitedtextprovider.h
diff --git a/providers/gpx/.cvsignore b/src/providers/gpx/.cvsignore
similarity index 100%
rename from providers/gpx/.cvsignore
rename to src/providers/gpx/.cvsignore
diff --git a/providers/gpx/Makefile.am b/src/providers/gpx/Makefile.am
similarity index 74%
rename from providers/gpx/Makefile.am
rename to src/providers/gpx/Makefile.am
index cca7724cc82..b780cc6636e 100644
--- a/providers/gpx/Makefile.am
+++ b/src/providers/gpx/Makefile.am
@@ -2,7 +2,7 @@
 
 if HAVE_EXPAT
 
-INCLUDES = -I../../src/core -I../../src
+INCLUDES = -I../../core -I../../
 
 plugindir = ${pkglibdir}
 plugin_LTLIBRARIES = gpxprovider.la 
@@ -11,7 +11,7 @@ gpxprovider_la_SOURCES = qgsgpxprovider.cpp		\
 	gpsdata.cpp
 
 
-gpxprovider_la_LIBADD = $(QT_LDADD) $(GEOS_LDADD) ../../src/core/libqgis_core.la
+gpxprovider_la_LIBADD = $(QT_LDADD) $(GEOS_LDADD) ../../core/libqgis_core.la
 gpxprovider_la_LDFLAGS = -avoid-version -module
 gpxprovider_la_CXXFLAGS = $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(GDAL_CFLAGS)
 
diff --git a/providers/gpx/gpsdata.cpp b/src/providers/gpx/gpsdata.cpp
similarity index 100%
rename from providers/gpx/gpsdata.cpp
rename to src/providers/gpx/gpsdata.cpp
diff --git a/providers/gpx/gpsdata.h b/src/providers/gpx/gpsdata.h
similarity index 100%
rename from providers/gpx/gpsdata.h
rename to src/providers/gpx/gpsdata.h
diff --git a/providers/gpx/gpx.pro b/src/providers/gpx/gpx.pro
similarity index 100%
rename from providers/gpx/gpx.pro
rename to src/providers/gpx/gpx.pro
diff --git a/providers/gpx/qgsgpxprovider.cpp b/src/providers/gpx/qgsgpxprovider.cpp
similarity index 100%
rename from providers/gpx/qgsgpxprovider.cpp
rename to src/providers/gpx/qgsgpxprovider.cpp
diff --git a/providers/gpx/qgsgpxprovider.h b/src/providers/gpx/qgsgpxprovider.h
similarity index 100%
rename from providers/gpx/qgsgpxprovider.h
rename to src/providers/gpx/qgsgpxprovider.h
diff --git a/providers/grass/.cvsignore b/src/providers/grass/.cvsignore
similarity index 100%
rename from providers/grass/.cvsignore
rename to src/providers/grass/.cvsignore
diff --git a/providers/grass/Makefile.am b/src/providers/grass/Makefile.am
similarity index 85%
rename from providers/grass/Makefile.am
rename to src/providers/grass/Makefile.am
index 9fbee55a03e..3ac8f277719 100644
--- a/providers/grass/Makefile.am
+++ b/src/providers/grass/Makefile.am
@@ -2,7 +2,7 @@
 ## $Id$
 ##
 
-INCLUDES = -I../../src/core -I../../src
+INCLUDES = -I../../core -I../../
 
 lib_LTLIBRARIES = libqgisgrass.la
 
@@ -30,7 +30,7 @@ libqgisgrass_la_SOURCES = qgsgrassprovider.cpp \
 			qgsgrass.cpp \
 			qgsgrass.h
 
-libqgisgrass_la_LIBADD = $(QT_LDADD) $(GRASS_LIB) ../../src/core/libqgis_core.la ../../src/libqgis_gui.la
+libqgisgrass_la_LIBADD = $(QT_LDADD) $(GRASS_LIB) ../../core/libqgis_core.la ../../libqgis_gui.la
 libqgisgrass_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
 libqgisgrass_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) -I$(GRASS_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(GDAL_CFLAGS)
 if HAVE_POSTGRESQL
diff --git a/providers/grass/provider.cpp b/src/providers/grass/provider.cpp
similarity index 100%
rename from providers/grass/provider.cpp
rename to src/providers/grass/provider.cpp
diff --git a/providers/grass/qgsgrass.cpp b/src/providers/grass/qgsgrass.cpp
similarity index 100%
rename from providers/grass/qgsgrass.cpp
rename to src/providers/grass/qgsgrass.cpp
diff --git a/providers/grass/qgsgrass.h b/src/providers/grass/qgsgrass.h
similarity index 100%
rename from providers/grass/qgsgrass.h
rename to src/providers/grass/qgsgrass.h
diff --git a/providers/grass/qgsgrassprovider.cpp b/src/providers/grass/qgsgrassprovider.cpp
similarity index 100%
rename from providers/grass/qgsgrassprovider.cpp
rename to src/providers/grass/qgsgrassprovider.cpp
diff --git a/providers/grass/qgsgrassprovider.h b/src/providers/grass/qgsgrassprovider.h
similarity index 100%
rename from providers/grass/qgsgrassprovider.h
rename to src/providers/grass/qgsgrassprovider.h
diff --git a/providers/mysql/README b/src/providers/mysql/README
similarity index 100%
rename from providers/mysql/README
rename to src/providers/mysql/README
diff --git a/providers/mysql/mysql.pro b/src/providers/mysql/mysql.pro
similarity index 100%
rename from providers/mysql/mysql.pro
rename to src/providers/mysql/mysql.pro
diff --git a/providers/mysql/qgsmysqlprovider.cpp b/src/providers/mysql/qgsmysqlprovider.cpp
similarity index 100%
rename from providers/mysql/qgsmysqlprovider.cpp
rename to src/providers/mysql/qgsmysqlprovider.cpp
diff --git a/providers/mysql/qgsmysqlprovider.h b/src/providers/mysql/qgsmysqlprovider.h
similarity index 100%
rename from providers/mysql/qgsmysqlprovider.h
rename to src/providers/mysql/qgsmysqlprovider.h
diff --git a/providers/mysql/testmysql.cpp b/src/providers/mysql/testmysql.cpp
similarity index 100%
rename from providers/mysql/testmysql.cpp
rename to src/providers/mysql/testmysql.cpp
diff --git a/providers/ogr/.cvsignore b/src/providers/ogr/.cvsignore
similarity index 100%
rename from providers/ogr/.cvsignore
rename to src/providers/ogr/.cvsignore
diff --git a/providers/ogr/.indent.pro b/src/providers/ogr/.indent.pro
similarity index 100%
rename from providers/ogr/.indent.pro
rename to src/providers/ogr/.indent.pro
diff --git a/providers/ogr/Makefile.am b/src/providers/ogr/Makefile.am
similarity index 78%
rename from providers/ogr/Makefile.am
rename to src/providers/ogr/Makefile.am
index 9e78994eb2e..7f45fa9ca5b 100644
--- a/providers/ogr/Makefile.am
+++ b/src/providers/ogr/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I../../src/core/ -I../../src
+INCLUDES = -I../../core/ -I../../
 
 plugindir = ${pkglibdir}
 plugin_LTLIBRARIES = ogrprovider.la 
@@ -6,7 +6,7 @@ plugin_LTLIBRARIES = ogrprovider.la
 ogrprovider_la_SOURCES = qgsogrprovider.cpp			\
 			 qgsogrprovider.h
 
-ogrprovider_la_LIBADD = $(QT_LDADD)  $(GDAL_LDADD) $(GEOS_LDADD) ../../src/core/libqgis_core.la ../../src/libqgis_gui.la
+ogrprovider_la_LIBADD = $(QT_LDADD)  $(GDAL_LDADD) $(GEOS_LDADD) ../../core/libqgis_core.la ../../libqgis_gui.la
 ogrprovider_la_LDFLAGS = -avoid-version -module
 ogrprovider_la_CXXFLAGS := $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS)
 
diff --git a/providers/ogr/ogr.pro b/src/providers/ogr/ogr.pro
similarity index 100%
rename from providers/ogr/ogr.pro
rename to src/providers/ogr/ogr.pro
diff --git a/providers/ogr/qgsogrfactory.cpp b/src/providers/ogr/qgsogrfactory.cpp
similarity index 100%
rename from providers/ogr/qgsogrfactory.cpp
rename to src/providers/ogr/qgsogrfactory.cpp
diff --git a/providers/ogr/qgsogrfactory.h b/src/providers/ogr/qgsogrfactory.h
similarity index 100%
rename from providers/ogr/qgsogrfactory.h
rename to src/providers/ogr/qgsogrfactory.h
diff --git a/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
similarity index 100%
rename from providers/ogr/qgsogrprovider.cpp
rename to src/providers/ogr/qgsogrprovider.cpp
diff --git a/providers/ogr/qgsogrprovider.h b/src/providers/ogr/qgsogrprovider.h
similarity index 100%
rename from providers/ogr/qgsogrprovider.h
rename to src/providers/ogr/qgsogrprovider.h
diff --git a/providers/postgres/.cvsignore b/src/providers/postgres/.cvsignore
similarity index 100%
rename from providers/postgres/.cvsignore
rename to src/providers/postgres/.cvsignore
diff --git a/providers/postgres/Makefile.am b/src/providers/postgres/Makefile.am
similarity index 90%
rename from providers/postgres/Makefile.am
rename to src/providers/postgres/Makefile.am
index 65a01749959..5bf02c67a2c 100644
--- a/providers/postgres/Makefile.am
+++ b/src/providers/postgres/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I../../src/core/ -I../../src/
+INCLUDES = -I../../core/ -I../../
 
 %.moc.cpp: %.h
 	$(MOC) -o $@ $<
@@ -27,7 +27,7 @@ postgresprovider_la_SOURCES =					\
 
 BUILT_SOURCES = $(postgresprovider_MOC)
                                 
-postgresprovider_la_LIBADD = $(QT_LDADD) $(PG_LIB) $(GEOS_LDADD) ../../src/core/libqgis_core.la ../../src/libqgis_gui.la
+postgresprovider_la_LIBADD = $(QT_LDADD) $(PG_LIB) $(GEOS_LDADD) ../../core/libqgis_core.la ../../libqgis_gui.la
 postgresprovider_la_LDFLAGS = -avoid-version -module
 postgresprovider_la_CXXFLAGS = $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(GDAL_CFLAGS)
 
diff --git a/providers/postgres/postgres.pro b/src/providers/postgres/postgres.pro
similarity index 100%
rename from providers/postgres/postgres.pro
rename to src/providers/postgres/postgres.pro
diff --git a/providers/postgres/qgspostgisbox2d.cpp b/src/providers/postgres/qgspostgisbox2d.cpp
similarity index 100%
rename from providers/postgres/qgspostgisbox2d.cpp
rename to src/providers/postgres/qgspostgisbox2d.cpp
diff --git a/providers/postgres/qgspostgisbox2d.h b/src/providers/postgres/qgspostgisbox2d.h
similarity index 100%
rename from providers/postgres/qgspostgisbox2d.h
rename to src/providers/postgres/qgspostgisbox2d.h
diff --git a/providers/postgres/qgspostgisbox3d.cpp b/src/providers/postgres/qgspostgisbox3d.cpp
similarity index 100%
rename from providers/postgres/qgspostgisbox3d.cpp
rename to src/providers/postgres/qgspostgisbox3d.cpp
diff --git a/providers/postgres/qgspostgisbox3d.h b/src/providers/postgres/qgspostgisbox3d.h
similarity index 100%
rename from providers/postgres/qgspostgisbox3d.h
rename to src/providers/postgres/qgspostgisbox3d.h
diff --git a/providers/postgres/qgspostgrescountthread.cpp b/src/providers/postgres/qgspostgrescountthread.cpp
similarity index 100%
rename from providers/postgres/qgspostgrescountthread.cpp
rename to src/providers/postgres/qgspostgrescountthread.cpp
diff --git a/providers/postgres/qgspostgrescountthread.h b/src/providers/postgres/qgspostgrescountthread.h
similarity index 100%
rename from providers/postgres/qgspostgrescountthread.h
rename to src/providers/postgres/qgspostgrescountthread.h
diff --git a/providers/postgres/qgspostgresextentthread.cpp b/src/providers/postgres/qgspostgresextentthread.cpp
similarity index 100%
rename from providers/postgres/qgspostgresextentthread.cpp
rename to src/providers/postgres/qgspostgresextentthread.cpp
diff --git a/providers/postgres/qgspostgresextentthread.h b/src/providers/postgres/qgspostgresextentthread.h
similarity index 100%
rename from providers/postgres/qgspostgresextentthread.h
rename to src/providers/postgres/qgspostgresextentthread.h
diff --git a/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
similarity index 100%
rename from providers/postgres/qgspostgresprovider.cpp
rename to src/providers/postgres/qgspostgresprovider.cpp
diff --git a/providers/postgres/qgspostgresprovider.h b/src/providers/postgres/qgspostgresprovider.h
similarity index 100%
rename from providers/postgres/qgspostgresprovider.h
rename to src/providers/postgres/qgspostgresprovider.h
diff --git a/providers/providers.pro b/src/providers/providers.pro
similarity index 100%
rename from providers/providers.pro
rename to src/providers/providers.pro
diff --git a/providers/wms/.cvsignore b/src/providers/wms/.cvsignore
similarity index 100%
rename from providers/wms/.cvsignore
rename to src/providers/wms/.cvsignore
diff --git a/providers/wms/Makefile.am b/src/providers/wms/Makefile.am
similarity index 81%
rename from providers/wms/Makefile.am
rename to src/providers/wms/Makefile.am
index 673a632a9ba..25be63a08de 100644
--- a/providers/wms/Makefile.am
+++ b/src/providers/wms/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I../../src -I../../src/raster -I../../src/core
+INCLUDES = -I../../ -I../../raster -I../../core
 
 %.moc.cpp: %.h
 	$(MOC) -o $@ $<
@@ -11,8 +11,8 @@ plugin_LTLIBRARIES     = wmsprovider.la
 
 wmsprovider_MOC =	qgswmsprovider.moc.cpp			\
 			qgshttptransaction.moc.cpp \
-		../../src/core/qgsdataprovider.moc.cpp		\
-		../../src/core/qgsrasterdataprovider.moc.cpp		
+		../../core/qgsdataprovider.moc.cpp		\
+		../../core/qgsrasterdataprovider.moc.cpp		
                 
 wmsprovider_la_SOURCES =					\
 		qgswmsprovider.cpp				\
diff --git a/providers/wms/qgshttptransaction.cpp b/src/providers/wms/qgshttptransaction.cpp
similarity index 100%
rename from providers/wms/qgshttptransaction.cpp
rename to src/providers/wms/qgshttptransaction.cpp
diff --git a/providers/wms/qgshttptransaction.h b/src/providers/wms/qgshttptransaction.h
similarity index 100%
rename from providers/wms/qgshttptransaction.h
rename to src/providers/wms/qgshttptransaction.h
diff --git a/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
similarity index 100%
rename from providers/wms/qgswmsprovider.cpp
rename to src/providers/wms/qgswmsprovider.cpp
diff --git a/providers/wms/qgswmsprovider.h b/src/providers/wms/qgswmsprovider.h
similarity index 100%
rename from providers/wms/qgswmsprovider.h
rename to src/providers/wms/qgswmsprovider.h
diff --git a/providers/wms/wms.pro b/src/providers/wms/wms.pro
similarity index 100%
rename from providers/wms/wms.pro
rename to src/providers/wms/wms.pro