diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index b95de6a98..0db0695df 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,6 @@
+2006-03-21  Alex Roitman  <shura@gramps-project.org>
+	* various: rename doc to data; move most of src/data to data.
+
 2006-03-20  Don Allingham  <don@gramps-project.org>
 	* src/const.py.in: fix path combination
 	* src/Config/__init__.py: actually pay attention to no_gconf
diff --git a/gramps2/Makefile.am b/gramps2/Makefile.am
index cc199fa17..b6c78e281 100644
--- a/gramps2/Makefile.am
+++ b/gramps2/Makefile.am
@@ -1,7 +1,7 @@
 # This is the top level Makefile for Gramps
 # $Id$
 
-SUBDIRS = m4 po src doc example help
+SUBDIRS = m4 po src data example help
 
 EXTRA_DIST = \
 	config.rpath autogen.sh gramps.spec.in gramps.spec \
diff --git a/gramps2/configure.in b/gramps2/configure.in
index 60387b9a2..74ca8136c 100644
--- a/gramps2/configure.in
+++ b/gramps2/configure.in
@@ -210,9 +210,9 @@ src/data/Makefile
 src/glade/Makefile
 src/images/Makefile
 src/data/templates/Makefile
-doc/Makefile
-doc/man/Makefile
-doc/man/fr/Makefile
+data/Makefile
+data/man/Makefile
+data/man/fr/Makefile
 example/Makefile
 example/gramps/Makefile
 ])
diff --git a/gramps2/data/Makefile.am b/gramps2/data/Makefile.am
new file mode 100644
index 000000000..e83a39f83
--- /dev/null
+++ b/gramps2/data/Makefile.am
@@ -0,0 +1,98 @@
+# This is the data level Makefile for gramps
+# $Id$
+
+SUBDIRS = man
+
+# Rules for files with translatable strings
+# These are taken care of by the intltool
+desktopdir = $(datadir)/applications
+desktop_in_files = gramps.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+@INTLTOOL_DESKTOP_RULE@
+
+keys_in_files = gramps.keys.in
+keys_files = $(keys_in_files:.keys.in=.keys)
+@INTLTOOL_KEYS_RULE@
+
+# Rules for files with translatable strings
+# These are taken care of by the intltool
+xml_in_files = gramps.xml.in
+xml_files = $(xml_in_files:.xml.in=.xml)
+@INTLTOOL_XML_RULE@
+
+schemasdir = $(GCONF_SCHEMA_FILE_DIR)
+schemas_in_files = gramps.schemas.in
+schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
+@INTLTOOL_SCHEMAS_RULE@
+
+applicationsdir = $(datadir)/application-registry
+applications_DATA = gramps.applications
+
+mimedir = $(datadir)/mime-info
+mime_DATA = $(keys_files) gramps.mime
+
+xmldir = $(SHARED_MIME_DIR)/packages
+xml_DATA = $(xml_files)
+
+pngdir = $(datadir)/icons/gnome/48x48/mimetypes
+png_DATA = \
+	gnome-mime-application-x-gramps.png \
+	gnome-mime-application-x-gedcom.png \
+	gnome-mime-application-x-gramps-package.png \
+	gnome-mime-application-x-gramps-xml.png \
+	gnome-mime-application-x-geneweb.png
+
+EXTRA_DIST = \
+	$(png_DATA) \
+	$(applications_DATA) \
+	$(keys_in_files) \
+	$(desktop_in_files) \
+	$(schemas_in_files) \
+	$(mime_DATA) \
+	$(xml_DATA) \
+	$(desktop_DATA) \
+	$(schemas_DATA) \
+	$(xml_in_files)
+
+CLEANFILES = \
+	$(desktop_DATA) \
+	$(keys_files) \
+	$(xml_files) \
+	$(schemas_DATA)
+
+# Conditionally enable/disable gconf schemas or mime types,
+# or disable both in a packager mode
+GCONF_SCHEMAS_INSTALLATION =
+GCONF_SCHEMAS_UNINSTALLATION = 
+SHARED_MIME_INSTALLATION =
+SHARED_MIME_UNINSTALLATION =
+
+if !PACKAGER_MODE
+if GCONF_SCHEMAS_INSTALL
+GCONF_SCHEMAS_INSTALLATION += \
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
+		$(GCONFTOOL) --makefile-install-rule $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/gramps.schemas ;\
+	pkill gconfd ; echo Restarting gconfd
+
+GCONF_SCHEMAS_UNINSTALLATION += \
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
+		$(GCONFTOOL) --makefile-uninstall-rule $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/gramps.schemas
+endif
+if SHARED_MIME_INSTALL
+SHARED_MIME_INSTALLATION += \
+	update-mime-database $(DESTDIR)$(SHARED_MIME_DIR)
+SHARED_MIME_UNINSTALLATION += \
+	update-mime-database $(DESTDIR)$(SHARED_MIME_DIR)
+endif
+endif
+
+
+install-data-hook:
+	$(SHARED_MIME_INSTALLATION)
+	$(GCONF_SCHEMAS_INSTALLATION)
+
+uninstall-local:
+	$(GCONF_SCHEMAS_UNINSTALLATION)
+
+uninstall-hook:
+	$(SHARED_MIME_UNINSTALLATION)
diff --git a/gramps2/src/data/gnome-mime-application-x-gedcom.png b/gramps2/data/gnome-mime-application-x-gedcom.png
similarity index 100%
rename from gramps2/src/data/gnome-mime-application-x-gedcom.png
rename to gramps2/data/gnome-mime-application-x-gedcom.png
diff --git a/gramps2/src/data/gnome-mime-application-x-geneweb.png b/gramps2/data/gnome-mime-application-x-geneweb.png
similarity index 100%
rename from gramps2/src/data/gnome-mime-application-x-geneweb.png
rename to gramps2/data/gnome-mime-application-x-geneweb.png
diff --git a/gramps2/src/data/gnome-mime-application-x-gramps-package.png b/gramps2/data/gnome-mime-application-x-gramps-package.png
similarity index 100%
rename from gramps2/src/data/gnome-mime-application-x-gramps-package.png
rename to gramps2/data/gnome-mime-application-x-gramps-package.png
diff --git a/gramps2/src/data/gnome-mime-application-x-gramps-xml.png b/gramps2/data/gnome-mime-application-x-gramps-xml.png
similarity index 100%
rename from gramps2/src/data/gnome-mime-application-x-gramps-xml.png
rename to gramps2/data/gnome-mime-application-x-gramps-xml.png
diff --git a/gramps2/src/data/gnome-mime-application-x-gramps.png b/gramps2/data/gnome-mime-application-x-gramps.png
similarity index 100%
rename from gramps2/src/data/gnome-mime-application-x-gramps.png
rename to gramps2/data/gnome-mime-application-x-gramps.png
diff --git a/gramps2/src/data/gramps.applications b/gramps2/data/gramps.applications
similarity index 100%
rename from gramps2/src/data/gramps.applications
rename to gramps2/data/gramps.applications
diff --git a/gramps2/src/data/gramps.desktop.in b/gramps2/data/gramps.desktop.in
similarity index 100%
rename from gramps2/src/data/gramps.desktop.in
rename to gramps2/data/gramps.desktop.in
diff --git a/gramps2/src/data/gramps.keys.in b/gramps2/data/gramps.keys.in
similarity index 100%
rename from gramps2/src/data/gramps.keys.in
rename to gramps2/data/gramps.keys.in
diff --git a/gramps2/src/data/gramps.mime b/gramps2/data/gramps.mime
similarity index 100%
rename from gramps2/src/data/gramps.mime
rename to gramps2/data/gramps.mime
diff --git a/gramps2/src/data/gramps.schemas.in b/gramps2/data/gramps.schemas.in
similarity index 100%
rename from gramps2/src/data/gramps.schemas.in
rename to gramps2/data/gramps.schemas.in
diff --git a/gramps2/src/data/gramps.xml.in b/gramps2/data/gramps.xml.in
similarity index 100%
rename from gramps2/src/data/gramps.xml.in
rename to gramps2/data/gramps.xml.in
diff --git a/gramps2/doc/grampsxml.dtd b/gramps2/data/grampsxml.dtd
similarity index 100%
rename from gramps2/doc/grampsxml.dtd
rename to gramps2/data/grampsxml.dtd
diff --git a/gramps2/doc/grampsxml.rng b/gramps2/data/grampsxml.rng
similarity index 100%
rename from gramps2/doc/grampsxml.rng
rename to gramps2/data/grampsxml.rng
diff --git a/gramps2/doc/man/Makefile.am b/gramps2/data/man/Makefile.am
similarity index 77%
rename from gramps2/doc/man/Makefile.am
rename to gramps2/data/man/Makefile.am
index 8421ecb25..db9d739ed 100644
--- a/gramps2/doc/man/Makefile.am
+++ b/gramps2/data/man/Makefile.am
@@ -8,6 +8,6 @@ man_MANS = $(man_IN_FILES:.1.in=.1)
 EXTRA_DIST = $(man_MANS) $(man_IN_FILES)
 
 gramps.1: $(top_builddir)/config.status gramps.1.in
-	cd $(top_builddir) && CONFIG_FILES=doc/man/$@ $(SHELL) ./config.status
+	cd $(top_builddir) && CONFIG_FILES=data/man/$@ $(SHELL) ./config.status
 
 CLEANFILES=$(man_MANS)
diff --git a/gramps2/doc/man/fr/Makefile.am b/gramps2/data/man/fr/Makefile.am
similarity index 77%
rename from gramps2/doc/man/fr/Makefile.am
rename to gramps2/data/man/fr/Makefile.am
index 5a8eb859f..87f88d91f 100644
--- a/gramps2/doc/man/fr/Makefile.am
+++ b/gramps2/data/man/fr/Makefile.am
@@ -8,6 +8,6 @@ mandir = @mandir@/fr
 EXTRA_DIST = $(man_MANS) $(man_IN_FILES)
 
 gramps.1: $(top_builddir)/config.status gramps.1.in
-	cd $(top_builddir) && CONFIG_FILES=doc/man/fr/$@ $(SHELL) ./config.status
+	cd $(top_builddir) && CONFIG_FILES=data/man/fr/$@ $(SHELL) ./config.status
 
 CLEANFILES=$(man_MANS)
diff --git a/gramps2/doc/man/fr/gramps.1.in b/gramps2/data/man/fr/gramps.1.in
similarity index 100%
rename from gramps2/doc/man/fr/gramps.1.in
rename to gramps2/data/man/fr/gramps.1.in
diff --git a/gramps2/doc/man/gramps.1.in b/gramps2/data/man/gramps.1.in
similarity index 100%
rename from gramps2/doc/man/gramps.1.in
rename to gramps2/data/man/gramps.1.in
diff --git a/gramps2/doc/Makefile.am b/gramps2/doc/Makefile.am
deleted file mode 100644
index 0e4242f7e..000000000
--- a/gramps2/doc/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-# Process this file with automake to produce Makefile.in
-
-SUBDIRS = man
diff --git a/gramps2/doc/gramps.xsd b/gramps2/doc/gramps.xsd
deleted file mode 100644
index f66037f50..000000000
--- a/gramps2/doc/gramps.xsd
+++ /dev/null
@@ -1,387 +0,0 @@
-<!--
-  This is a first attempt to give a W3C's XML schema for Gramp's database files.
--->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-targetNamespace="http://gramps.sourceforge.net/database"
-xmlns:g="http://gramps.sourceforge.net/database"
-elementFormDefault="qualified">
-  <xsd:element name="database" type="g:Database" />
-  <xsd:complexType name="Address">
-    <xsd:sequence>
-      <xsd:group ref="g:Date" minOccurs="0" />
-      <xsd:element name="street" minOccurs='0' type="xsd:string" />
-      <xsd:element name="city" minOccurs='0' type="xsd:string" />
-      <xsd:element name="state" minOccurs='0' type="xsd:string" />
-      <xsd:element name="country" minOccurs='0'
-      type="xsd:string" />
-      <xsd:element name="postal" minOccurs='0' type="xsd:string" />
-      <xsd:element name="note" type="g:Note" minOccurs='0' />
-      <xsd:element name="sourceref" type="g:SourceReference"
-      minOccurs='0' />
-    </xsd:sequence>
-    <xsd:attributeGroup ref="g:Property" />
-  </xsd:complexType>
-  <xsd:complexType name="Attribute">
-    <xsd:all>
-      <xsd:element name="note" type="g:Note" minOccurs="0" />
-      <xsd:element name="sourceref" type="g:SourceReference"
-      minOccurs="0" />
-    </xsd:all>
-    <xsd:attribute name="type" type="xsd:string" use="optional" />
-    <xsd:attribute name="value" type="xsd:string" use="optional" />
-    <xsd:attributeGroup ref="g:Property" />
-  </xsd:complexType>
-  <xsd:complexType name="Bookmarks">
-    <xsd:sequence>
-      <xsd:element name="bookmark" type="g:RefType" minOccurs="0"
-      maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="ChildOf">
-    <xsd:sequence />
-    <xsd:attribute name="ref" type="g:ID" />
-    <xsd:attribute name="mrel" type="g:RelationType"
-    use="optional" />
-    <xsd:attribute name="frel" type="g:RelationType"
-    use="optional" />
-  </xsd:complexType>
-  <xsd:complexType name="Coordinate">
-    <xsd:sequence />
-    <xsd:attribute name="long" type="xsd:decimal" />
-    <xsd:attribute name="lat" type="xsd:decimal" />
-  </xsd:complexType>
-  <xsd:complexType name="Created">
-    <xsd:sequence />
-    <xsd:attribute name="date" type="xsd:string" />
-    <xsd:attribute name="version" type="xsd:string" />
-    <xsd:attribute name="people" type="xsd:nonNegativeInteger" />
-    <xsd:attribute name="families" type="xsd:nonNegativeInteger" />
-    <xsd:attribute name="sources" type="xsd:nonNegativeInteger" />
-    <xsd:attribute name="places" type="xsd:nonNegativeInteger" />
-  </xsd:complexType>
-  <xsd:complexType name="Database">
-    <xsd:all>
-      <xsd:element name="header" type="g:Header" minOccurs="1"
-      maxOccurs="1" />
-      <xsd:element name="people" type="g:People" minOccurs="0"
-      maxOccurs="1" />
-      <xsd:element name="families" type="g:Families" minOccurs="0"
-      maxOccurs="1" />
-      <xsd:element name="sources" type="g:Sources" minOccurs="0"
-      maxOccurs="1" />
-      <xsd:element name="places" type="g:Places" minOccurs="0"
-      maxOccurs="1" />
-      <xsd:element name="objects" type="g:Objects" minOccurs="0"
-      maxOccurs="1" />
-      <xsd:element name="bookmarks" type="g:Bookmarks"
-      minOccurs="0" maxOccurs="1" />
-    </xsd:all>
-  </xsd:complexType>
-  <xsd:complexType name="DateValue">
-    <xsd:sequence />
-    <xsd:attribute name="val" type="g:DateValueType" />
-    <xsd:attribute name="type" type="g:DateType" use="optional" />
-  </xsd:complexType>
-  <xsd:complexType name="DateRange">
-    <xsd:sequence />
-    <xsd:attribute name="start" type="g:DateValueType" />
-    <xsd:attribute name="stop" type="g:DateValueType" />
-  </xsd:complexType>
-  <xsd:complexType name="DateString">
-    <xsd:sequence />
-  </xsd:complexType>
-  <xsd:complexType name="Event">
-    <xsd:sequence>
-      <xsd:group ref="g:Date" minOccurs="0" />
-      <xsd:element name="place" type="g:RefType" minOccurs="0" />
-      <xsd:element name="description" minOccurs="0"
-      type="xsd:string" />
-      <xsd:element name="cause" minOccurs="0" type="xsd:string" />
-      <xsd:element name="note" type="g:Note" minOccurs="0" />
-      <xsd:element name="sourceref" type="g:SourceReference"
-      minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-    <xsd:attribute name="type" type="g:EventType" />
-  </xsd:complexType>
-  <xsd:complexType name="Families">
-    <xsd:sequence>
-      <xsd:element name="family" type="g:Family" minOccurs="0"
-      maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="Family">
-    <xsd:sequence>
-      <xsd:element name="father" minOccurs="0" type="g:RefType" />
-      <xsd:element name="mother" minOccurs="0" type="g:RefType" />
-      <xsd:element name="event" type="g:Event" minOccurs="0"
-      maxOccurs="unbounded" />
-      <xsd:element name="objref" type="g:ID" minOccurs="0"
-      maxOccurs="unbounded" />
-      <xsd:element name="child" minOccurs="0" maxOccurs="unbounded"
-      type="g:RefType" />
-      <xsd:element name="attribute" type="g:Attribute"
-      minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="note" type="g:Note" minOccurs="0" />
-    </xsd:sequence>
-    <xsd:attribute name="id" type="g:ID" />
-    <xsd:attribute name="type" type="g:MarriageType"
-    use="optional" />
-  </xsd:complexType>
-  <xsd:complexType name="Header">
-    <xsd:all>
-      <xsd:element name="created" type="g:Created" minOccurs="1"
-      maxOccurs="1" />
-      <xsd:element name="researcher" type="g:Researcher"
-      minOccurs="0" maxOccurs="1" />
-    </xsd:all>
-  </xsd:complexType>
-  <xsd:complexType name="Location">
-    <xsd:sequence />
-    <xsd:attribute name="city" type="xsd:string" use="optional" />
-    <xsd:attribute name="county" type="xsd:string"
-    use="optional" />
-    <xsd:attribute name="state" type="xsd:string" use="optional" />
-    <xsd:attribute name="country" type="xsd:string"
-    use="optional" />
-    <xsd:attribute name="parish" type="xsd:string"
-    use="optional" />
-  </xsd:complexType>
-  <xsd:complexType name="Name">
-    <xsd:all>
-      <xsd:element name="first" minOccurs='0' type="xsd:string" />
-      <xsd:element name="last" minOccurs='0' type="xsd:string" />
-      <xsd:element name="suffix" minOccurs='0' type="xsd:string" />
-      <xsd:element name="title" minOccurs='0' type="xsd:string" />
-      <xsd:element name="note" minOccurs='0' type="xsd:string" />
-      <xsd:element name="sourceref" type="g:SourceReference"
-      minOccurs="0" />
-    </xsd:all>
-    <xsd:attribute name="type" type="g:NameType" />
-    <xsd:attributeGroup ref="g:Property" />
-  </xsd:complexType>
-  <xsd:complexType name="Objects">
-    <xsd:sequence>
-      <xsd:element name="object" type="g:Object" minOccurs="0"
-      maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="Object">
-    <xsd:sequence>
-      <xsd:element name="attribute" type="g:Attribute"
-      minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-    <xsd:attribute name="id" type="g:ID" />
-    <xsd:attribute name="src" type="xsd:string" use="optional" />
-    <xsd:attribute name="mime" type="xsd:string" use="optional" />
-    <xsd:attribute name="description" type="xsd:string"
-    use="optional" />
-  </xsd:complexType>
-  <xsd:complexType name="People">
-    <xsd:sequence>
-      <xsd:element name="person" type="g:Person" minOccurs="0"
-      maxOccurs="unbounded" />
-    </xsd:sequence>
-    <xsd:attribute name="default" type="g:ID" use="optional" />
-  </xsd:complexType>
-  <xsd:complexType name="Person">
-    <xsd:sequence>
-      <xsd:element name="gender" type="g:Gender" minOccurs="1"
-      maxOccurs="1" />
-      <xsd:element name="name" type="g:Name" minOccurs='0' />
-      <xsd:element name="aka" type="g:Name" minOccurs='0'
-      maxOccurs='unbounded' />
-      <xsd:element name="nick" type="xsd:string" minOccurs="0" />
-      <xsd:element name="uid" type="xsd:string" minOccurs="0" />
-      <xsd:element name="event" type="g:Event" minOccurs='0'
-      maxOccurs='unbounded' />
-      <xsd:element name="objref" type="g:RefType" minOccurs='0'
-      maxOccurs='unbounded' />
-      <xsd:element name="url" type="g:Url" minOccurs='0'
-      maxOccurs='unbounded' />
-      <xsd:element name="address" type="g:Address" minOccurs='0'
-      maxOccurs='unbounded' />
-      <xsd:element name="childof" type="g:ChildOf" minOccurs='0'
-      maxOccurs='unbounded' />
-      <xsd:element name="parentin" minOccurs='0'
-      maxOccurs='unbounded' type="g:RefType" />
-      <xsd:element name="sourceref" type="g:SourceReference"
-      minOccurs='0' />
-      <xsd:element name="attribute" type="g:Attribute"
-      minOccurs='0' maxOccurs='unbounded' />
-      <xsd:element name="note" type="g:Note" minOccurs='0' />
-    </xsd:sequence>
-    <xsd:attribute name="id" type="g:ID" />
-  </xsd:complexType>
-  <xsd:complexType name="Places">
-    <xsd:sequence>
-      <xsd:element name="placeobj" type="g:Place" minOccurs="0"
-      maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="Place">
-    <xsd:sequence>
-      <xsd:element name="coord" type="g:Coordinate"
-      minOccurs="0" />
-      <xsd:element name="location" type="g:Location" minOccurs="0"
-      maxOccurs="unbounded" />
-      <xsd:element name="objref" type="g:ID" minOccurs="0"
-      maxOccurs="unbounded" />
-      <xsd:element name="url" type="g:Url" minOccurs="0"
-      maxOccurs="unbounded" />
-      <xsd:element name="note" type="g:Note" minOccurs="0" />
-    </xsd:sequence>
-    <xsd:attribute name="id" type="g:ID" />
-    <xsd:attribute name="title" type="xsd:string" />
-  </xsd:complexType>
-  <xsd:complexType name="RefType">
-    <xsd:sequence />
-    <xsd:attribute name="ref" type="g:ID" />
-  </xsd:complexType>
-  <xsd:complexType name="Researcher">
-    <xsd:sequence>
-      <xsd:element name="resname" minOccurs="1" maxOccurs="1"
-      type="xsd:string" />
-      <xsd:element name="resaddr" minOccurs="0" maxOccurs="1"
-      type="xsd:string" />
-      <xsd:element name="rescity" minOccurs="0" maxOccurs="1"
-      type="xsd:string" />
-      <xsd:element name="resstate" minOccurs="0" maxOccurs="1"
-      type="xsd:string" />
-      <xsd:element name="rescountry" minOccurs="0" maxOccurs="1"
-      type="xsd:string" />
-      <xsd:element name="respostal" minOccurs="0" maxOccurs="1"
-      type="xsd:string" />
-      <xsd:element name="resphone" minOccurs="0" maxOccurs="1"
-      type="xsd:string" />
-      <xsd:element name="resemail" minOccurs="0" maxOccurs="1"
-      type="xsd:string" />
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="Sources">
-    <xsd:sequence>
-      <xsd:element name="source" type="g:Source" minOccurs="0"
-      maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="Source">
-    <xsd:all>
-      <xsd:element name="sauthor" minOccurs="0"
-      type="xsd:string" />
-      <xsd:element name="stitle" minOccurs="0" type="xsd:string" />
-      <xsd:element name="spubinfo" minOccurs="0"
-      type="xsd:string" />
-      <xsd:element name="scallno" minOccurs="0"
-      type="xsd:string" />
-    </xsd:all>
-    <xsd:attribute name="id" type="g:ID" />
-  </xsd:complexType>
-  <xsd:complexType name="SourceReference">
-    <xsd:sequence>
-      <xsd:element name="spage" type="xsd:string" minOccurs="0" />
-      <xsd:element name="scomments" type="xsd:string"
-      minOccurs="0" />
-      <xsd:element name="stext" type="xsd:string" minOccurs="0" />
-      <xsd:group ref="g:Date" minOccurs="0" />
-    </xsd:sequence>
-    <xsd:attribute name="ref" type="g:ID" />
-  </xsd:complexType>
-  <xsd:complexType name="Url">
-    <xsd:sequence />
-    <xsd:attribute name="href" type="xsd:string" />
-    <xsd:attribute name="description" type="xsd:string"
-    use="optional" />
-    <xsd:attributeGroup ref="g:Property" />
-  </xsd:complexType>
-  <!--
-                  ==================== 
-                         GROUPS
-                  ==================== 
-    -->
-  <xsd:group name="Date">
-    <xsd:choice>
-      <xsd:element name="dateval" type="g:DateValue" />
-      <xsd:element name="datestr" type="g:DateString" />
-      <xsd:element name="daterange" type="g:DateRange" />
-    </xsd:choice>
-  </xsd:group>
-  <xsd:attributeGroup name="Property">
-    <xsd:attribute name="confidence" type="xsd:integer"
-    use="optional" />
-    <xsd:attribute name="privacy" type="xsd:integer"
-    use="optional" />
-  </xsd:attributeGroup>
-  <!--
-                  ==================== 
-                     SIMPLE TYPES 
-                  ==================== 
-    -->
-  <xsd:simpleType name="DateType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="about" />
-      <xsd:enumeration value="before" />
-      <xsd:enumeration value="after" />
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="DateValueType">
-    <xsd:restriction base="xsd:string" />
-  </xsd:simpleType>
-  <xsd:simpleType name="EventType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="Annulment" />
-      <xsd:enumeration value="Baptism" />
-      <xsd:enumeration value="Birth" />
-      <xsd:enumeration value="Burial" />
-      <xsd:enumeration value="Christening" />
-      <xsd:enumeration value="Cremation" />
-      <xsd:enumeration value="Death" />
-      <xsd:enumeration value="Degree" />
-      <xsd:enumeration value="Divorce" />
-      <xsd:enumeration value="Education" />
-      <xsd:enumeration value="Engagement" />
-      <xsd:enumeration value="Graduation" />
-      <xsd:enumeration value="Immi" />
-      <xsd:enumeration value="Marriage" />
-      <xsd:enumeration value="Occupation" />
-      <xsd:enumeration value="Religion" />
-      <xsd:enumeration value="SUBM" />
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="Gender">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="M" />
-      <xsd:enumeration value="F" />
-      <xsd:enumeration value="U" />
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ID">
-    <xsd:restriction base="xsd:string" />
-  </xsd:simpleType>
-  <xsd:simpleType name="MarriageType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="Married" />
-      <xsd:enumeration value="Unmarried" />
-      <xsd:enumeration value="Partners" />
-      <xsd:enumeration value="Other" />
-      <xsd:enumeration value="Unknown" />
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="NameType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="Birth Name" />
-      <xsd:enumeration value="Also Known As" />
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="Note">
-    <xsd:restriction base="xsd:string" />
-  </xsd:simpleType>
-  <xsd:simpleType name="RelationType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="Adopted" />
-      <xsd:enumeration value="Birth" />
-      <xsd:enumeration value="Foster" />
-      <xsd:enumeration value="Other" />
-      <xsd:enumeration value="Stepchild" />
-      <xsd:enumeration value="Unknown" />
-    </xsd:restriction>
-  </xsd:simpleType>
-</xsd:schema>
diff --git a/gramps2/po/POTFILES.in b/gramps2/po/POTFILES.in
index 399835cc5..b9cae8fc3 100644
--- a/gramps2/po/POTFILES.in
+++ b/gramps2/po/POTFILES.in
@@ -305,8 +305,8 @@ src/plugins/writeftree.glade
 #
 #	Files to extract from and then merge into
 #
-src/data/gramps.desktop.in
-src/data/gramps.keys.in
-src/data/gramps.xml.in
-src/data/gramps.schemas.in
+data/gramps.desktop.in
+data/gramps.keys.in
+data/gramps.xml.in
+data/gramps.schemas.in
 src/data/tips.xml.in
diff --git a/gramps2/src/ImgManip.py b/gramps2/src/ImgManip.py
index 7cd472a35..cdd6a51cd 100644
--- a/gramps2/src/ImgManip.py
+++ b/gramps2/src/ImgManip.py
@@ -156,7 +156,7 @@ def get_thumbnail_image(path,mtype=None):
             return Mime.find_mime_type_pixbuf(mtype)
         else:
             return gtk.gdk.pixbuf_new_from_file(os.path.join(
-                const.data_dir,"document.png"))
+                const.image_dir,"document.png"))
 
 def get_thumbnail_path(path,mtype=None):
     filename = _build_thumb_path(path)
diff --git a/gramps2/src/data/Makefile.am b/gramps2/src/data/Makefile.am
index fa559107e..b1aa964cc 100644
--- a/gramps2/src/data/Makefile.am
+++ b/gramps2/src/data/Makefile.am
@@ -1,4 +1,4 @@
-# This is the src/data level Makefile
+# This is the src/data level Makefile for gramps
 # $Id$
 #
 SUBDIRS = templates
@@ -6,7 +6,6 @@ pkgdatadir = $(datadir)/@PACKAGE@/data
 
 dist_pkgdata_DATA = \
 	gedcom.xml \
-	somerights20.gif \
 	papersize.xml \
 	system_filters.xml \
 	tips.xml\
@@ -15,97 +14,13 @@ dist_pkgdata_DATA = \
 	main3.css\
 	main4.css\
 	main5.css\
-	main6.css\
-	document.png
-
-# Conditionally enable/disable gconf schemas or mime types,
-# or disable both in a packager mode
-GCONF_SCHEMAS_INSTALLATION =
-GCONF_SCHEMAS_UNINSTALLATION = 
-SHARED_MIME_INSTALLATION =
-SHARED_MIME_UNINSTALLATION =
-
-if !PACKAGER_MODE
-if GCONF_SCHEMAS_INSTALL
-GCONF_SCHEMAS_INSTALLATION += \
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
-		$(GCONFTOOL) --makefile-install-rule $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/gramps.schemas ;\
-	pkill gconfd ; echo Restarting gconfd
-
-GCONF_SCHEMAS_UNINSTALLATION += \
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
-		$(GCONFTOOL) --makefile-uninstall-rule $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/gramps.schemas
-endif
-if SHARED_MIME_INSTALL
-SHARED_MIME_INSTALLATION += \
-	update-mime-database $(DESTDIR)$(SHARED_MIME_DIR)
-SHARED_MIME_UNINSTALLATION += \
-	update-mime-database $(DESTDIR)$(SHARED_MIME_DIR)
-endif
-endif
+	main6.css
 
 # Rules for files with translatable strings
 # These are taken care of by the intltool
-desktopdir = $(datadir)/applications
-desktop_in_files = gramps.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
-
-keys_in_files = gramps.keys.in
-keys_files = $(keys_in_files:.keys.in=.keys)
-@INTLTOOL_KEYS_RULE@
-
-xml_in_files = gramps.xml.in tips.xml.in
+xml_in_files = tips.xml.in
 xml_files = $(xml_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
-schemasdir = $(GCONF_SCHEMA_FILE_DIR)
-schemas_in_files = gramps.schemas.in
-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-@INTLTOOL_SCHEMAS_RULE@
-
-applicationsdir = $(datadir)/application-registry
-applications_DATA = gramps.applications
-
-mimedir = $(datadir)/mime-info
-mime_DATA = $(keys_files) gramps.mime
-
-xmldir = $(SHARED_MIME_DIR)/packages
-xml_DATA = $(xml_files)
-
-pngdir = $(datadir)/icons/gnome/48x48/mimetypes
-png_DATA = \
-	gnome-mime-application-x-gramps.png \
-	gnome-mime-application-x-gedcom.png \
-	gnome-mime-application-x-gramps-package.png \
-	gnome-mime-application-x-gramps-xml.png \
-	gnome-mime-application-x-geneweb.png
-
-EXTRA_DIST = \
-	$(png_DATA) \
-	gramps.svg \
-	$(applications_DATA) \
-	$(keys_in_files) \
-	$(desktop_in_files) \
-	$(schemas_in_files) \
-	$(mime_DATA) \
-	$(xml_DATA) \
-	$(desktop_DATA) \
-	$(schemas_DATA) \
-	$(xml_in_files)
-
-CLEANFILES = \
-	$(desktop_DATA) \
-	$(keys_files) \
-	$(xml_files) \
-	$(schemas_DATA)
-
-install-data-hook:
-	$(SHARED_MIME_INSTALLATION)
-	$(GCONF_SCHEMAS_INSTALLATION)
-
-uninstall-local:
-	$(GCONF_SCHEMAS_UNINSTALLATION)
-
-uninstall-hook:
-	$(SHARED_MIME_UNINSTALLATION)
+EXTRA_DIST = $(xml_in_files)
+CLEANFILES = $(xml_files)
diff --git a/gramps2/src/data/gramps.png b/gramps2/src/data/gramps.png
deleted file mode 100644
index 09b81f69a..000000000
Binary files a/gramps2/src/data/gramps.png and /dev/null differ
diff --git a/gramps2/src/images/Makefile.am b/gramps2/src/images/Makefile.am
index 3e00d16ff..97d49699e 100644
--- a/gramps2/src/images/Makefile.am
+++ b/gramps2/src/images/Makefile.am
@@ -1,6 +1,6 @@
+# This is the src/images level Makefile for Gramps
 # $Id: Makefile.am 6057 2006-03-03 12:49:39Z loshawlos $
 
-# This is the src level Makefile for Gramps
 SUBDIRS = 
 pkgdatadir = $(datadir)/@PACKAGE@/images
 
@@ -30,7 +30,8 @@ dist_pkgdata_DATA = \
 	stock_link.png\
 	stock_lock-open.png\
 	stock_lock.png\
-	tools.png
-
-
+	tools.png\
+	somerights20.gif \
+	document.png
 
+EXTRA_DIST = gramps.svg 
diff --git a/gramps2/src/data/document.png b/gramps2/src/images/document.png
similarity index 100%
rename from gramps2/src/data/document.png
rename to gramps2/src/images/document.png
diff --git a/gramps2/src/data/gramps.svg b/gramps2/src/images/gramps.svg
similarity index 100%
rename from gramps2/src/data/gramps.svg
rename to gramps2/src/images/gramps.svg
diff --git a/gramps2/src/data/somerights20.gif b/gramps2/src/images/somerights20.gif
similarity index 100%
rename from gramps2/src/data/somerights20.gif
rename to gramps2/src/images/somerights20.gif