diff --git a/gramps2/src/.xvpics/family48.png b/gramps2/src/.xvpics/family48.png
deleted file mode 100644
index 5b54f3102..000000000
Binary files a/gramps2/src/.xvpics/family48.png and /dev/null differ
diff --git a/gramps2/src/.xvpics/icon-people02d-24x24.png b/gramps2/src/.xvpics/icon-people02d-24x24.png
deleted file mode 100644
index b40d17e61..000000000
Binary files a/gramps2/src/.xvpics/icon-people02d-24x24.png and /dev/null differ
diff --git a/gramps2/src/.xvpics/icon-people02d-48x48.png b/gramps2/src/.xvpics/icon-people02d-48x48.png
deleted file mode 100644
index b40d17e61..000000000
Binary files a/gramps2/src/.xvpics/icon-people02d-48x48.png and /dev/null differ
diff --git a/gramps2/src/.xvpics/people48.png b/gramps2/src/.xvpics/people48.png
deleted file mode 100644
index a91135c5c..000000000
Binary files a/gramps2/src/.xvpics/people48.png and /dev/null differ
diff --git a/gramps2/src/.xvpics/people48.xpm b/gramps2/src/.xvpics/people48.xpm
deleted file mode 100644
index 8d66cad4b..000000000
Binary files a/gramps2/src/.xvpics/people48.xpm and /dev/null differ
diff --git a/gramps2/src/.xvpics/place.png b/gramps2/src/.xvpics/place.png
deleted file mode 100644
index fc8316601..000000000
Binary files a/gramps2/src/.xvpics/place.png and /dev/null differ
diff --git a/gramps2/src/GrampsLogger/Makefile.am b/gramps2/src/GrampsLogger/Makefile.am
new file mode 100644
index 000000000..da91e9487
--- /dev/null
+++ b/gramps2/src/GrampsLogger/Makefile.am
@@ -0,0 +1,22 @@
+# This is the src/RelLib level Makefile for Gramps
+# We could use GNU make's ':=' syntax for nice wildcard use,
+# but that is not necessarily portable.
+# If not using GNU make, then list all .py files individually
+
+pkgdatadir = $(datadir)/@PACKAGE@/TreeViews
+
+pkgdata_PYTHON = \
+	_ErrorReportAssistant.py\
+	_ErrorView.py\
+	_GtkHandler.py\
+	_init__.py\
+	_RotateHandler.py
+
+pkgpyexecdir = @pkgpyexecdir@/RelLib
+pkgpythondir = @pkgpythondir@/RelLib
+
+GRAMPS_PY_MODPATH = "../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgdata_PYTHON));
diff --git a/gramps2/src/Makefile.am b/gramps2/src/Makefile.am
index a7c0c7f4e..840eb4800 100644
--- a/gramps2/src/Makefile.am
+++ b/gramps2/src/Makefile.am
@@ -1,7 +1,7 @@
 # $Id$
 
 # This is the src level Makefile for Gramps
-SUBDIRS = docgen plugins dates data po GrampsDb RelLib ObjectSelector
+SUBDIRS = docgen plugins dates data po GrampsDb RelLib ObjectSelector GrampsLogger TreeView
 
 # For intl. support, how do we compile?
 MOSTLYCLEANFILES = 
@@ -23,101 +23,118 @@ docfiles = \
 	GrampsDbBase.py 
 
 gdir_PYTHON = \
-	accent.py \
 	AddMedia.py\
 	AddrEdit.py\
-	AddSpouse.py\
 	ansel_utf8.py\
-	Assistant.py \
+	ArgHandler.py\
+	Assistant.py\
 	AttrEdit.py\
 	AutoComp.py\
 	BaseDoc.py\
 	Bookmarks.py\
-	CalSdn.py\
 	ColumnOrder.py\
-	ChooseParents.py\
-	const.py\
-	DateEdit.py\
-	Date.py\
-	DateParser.py\
-	DateHandler.py\
+	const.py.in\
 	DateDisplay.py\
+	DateEdit.py\
+	DateHandler.py\
+	DateParser.py\
+	Date.py\
 	DdTargets.py\
 	DisplayModels.py\
+	DisplayState.py\
+	DisplayTabs.py\
 	DisplayTrace.py\
+	EditEventRef.py\
+	EditFamily.py\
+	EditMedia.py\
+	EditMediaRef.py\
 	EditPerson.py\
 	EditPlace.py\
+	EditPrimary.py\
+	EditRepository.py\
+	EditSecondary.py\
 	EditSource.py\
+	EditSourceRef.py\
 	Errors.py\
 	EventEdit.py\
+	events24.png\
+	events.png\
+	EventView.py\
+	Exporter.py\
+	FamilyList.py\
 	FamilyView.py\
 	FontScale.py\
 	GenericFilter.py\
 	GnomeMime.py\
 	GrampsCfg.py\
+	GrampsDb\
 	GrampsDisplay.py\
-	GrampsMime.py\
+	GrampsGconfKeys.py\
+	GrampsIniKeys.py\
+	GrampsKeys.py\
+	GrampsLocale.py\
 	gramps_main.py\
+	GrampsMime.py\
 	gramps.py\
-	ImageSelect.py\
+	GrampsWidgets.py\
 	ImgManip.py\
 	latin_ansel.py\
-	ListBox.py\
 	ListModel.py\
 	LocEdit.py\
-	Marriage.py\
+	locked.png\
+	MapView.py\
 	MediaView.py\
 	MergeData.py\
 	MergePeople.py\
 	NameDisplay.py\
 	NameEdit.py\
+	Navigation.py\
 	NoteEdit.py\
+	ObjectSelector\
+	Options.py\
+	PageView.py\
 	PaperMenu.py\
 	PedView.py\
-	PersonView.py\
 	PeopleModel.py\
+	PersonView.py\
 	PlaceView.py\
-	Plugins.py\
 	PluginMgr.py\
+	plugins.glade\
+	Plugins.py\
 	PythonMime.py\
 	QuestionDialog.py\
+	RecentFiles.py\
 	Relationship.py\
 	RelImage.py\
+	ReportOptions.py\
 	Report.py\
 	ReportUtils.py\
+	RepositoryView.py\
 	ScratchPad.py\
 	SelectChild.py\
+	SelectEvent.py\
 	SelectObject.py\
+	SelectPerson.py\
 	Sort.py\
 	soundex.py\
 	Sources.py\
 	SourceView.py\
+	Spell.py\
 	SpreadSheetDoc.py\
 	StartupDialog.py\
+	stock_link.png\
 	StyleEditor.py\
 	SubstKeywords.py\
-	TarFile.py\
 	TipOfDay.py\
-	TransTable.py\
+	Tool.py\
+	ToolTips.py\
+	TransUtils.py\
 	TreeTips.py\
 	UrlEdit.py\
 	Utils.py\
-	Witness.py\
-	SelectPerson.py\
-	ArgHandler.py\
-	Exporter.py\
-	GrampsKeys.py\
-	GrampsIniKeys.py\
-	GrampsGconfKeys.py\
-	RecentFiles.py\
-	ReportOptions.py\
-	EventView.py\
-	SelectEvent.py\
-	Spell.py\
-	Options.py\
-	Tool.py\
-	TransUtils.py\
-	WindowUtils.py
+	ViewManager.py\
+	WindowUtils.py\
+	Witness.py
 
 # Could use GNU make's ':=' syntax for nice wildcard use.
 # If not using GNU make, then list all files individually
@@ -131,17 +148,9 @@ GLADEFILES = \
 	scratchpad.glade
 
 GRAPHICS = \
-	bad.png\
-	caution.png\
-	edit.png\
-	edit_sm.png \
-	family48.png\
-	good.png\
-	home.png\
 	logo.png\
 	gramps.png \
 	media.png\
-	people48.png\
 	place.png\
 	sources.png\
 	splash.jpg\
diff --git a/gramps2/src/ObjectSelector/Makefile.am b/gramps2/src/ObjectSelector/Makefile.am
index ef982f1d3..384a7f018 100644
--- a/gramps2/src/ObjectSelector/Makefile.am
+++ b/gramps2/src/ObjectSelector/Makefile.am
@@ -6,24 +6,23 @@
 pkgdatadir = $(datadir)/@PACKAGE@/ObjectSelector
 
 pkgdata_PYTHON = \
-	_Constants.py\
 	_Factories.py\
 	_FamilyFilterFrame.py\
 	_FamilyFrame.py\
 	_FamilyPreviewFrame.py\
 	_FamilyTreeFrame.py\
 	_FilterFrameBase.py\
-	_FilterSpec.py\
 	_FilterSpecBase.py\
+	__init__.py\
 	_ObjectFrameBase.py\
-	_ObjectSelectorResult.py\
 	_ObjectSelectorWindow.py\
 	_PersonFilterFrame.py\
 	_PersonFilterSpec.py\
 	_PersonFrame.py\
 	_PersonPreviewFrame.py\
 	_PersonTreeFrame.py\
-	__init__.py
+	_PreviewFrameBase.py\
+	_TreeFrameBase.py
 
 pkgpyexecdir = @pkgpyexecdir@/ObjectSelector
 pkgpythondir = @pkgpythondir@/ObjectSelector
diff --git a/gramps2/src/RelLib/Makefile.am b/gramps2/src/RelLib/Makefile.am
index ecd1770ec..f791811ba 100644
--- a/gramps2/src/RelLib/Makefile.am
+++ b/gramps2/src/RelLib/Makefile.am
@@ -11,6 +11,8 @@ pkgdata_PYTHON = \
 	_AttributeBase.py\
 	_Attribute.py\
 	_BaseObject.py\
+	_CalSdn.py \
+	_Date.py \
 	_DateBase.py\
 	_Event.py\
 	_EventRef.py\
diff --git a/gramps2/src/TreeViews/Makefile.am b/gramps2/src/TreeViews/Makefile.am
new file mode 100644
index 000000000..352e4b778
--- /dev/null
+++ b/gramps2/src/TreeViews/Makefile.am
@@ -0,0 +1,19 @@
+# This is the src/RelLib level Makefile for Gramps
+# We could use GNU make's ':=' syntax for nice wildcard use,
+# but that is not necessarily portable.
+# If not using GNU make, then list all .py files individually
+
+pkgdatadir = $(datadir)/@PACKAGE@/TreeViews
+
+pkgdata_PYTHON = \
+	__init__.py\
+	_PersonTreeView.py
+
+pkgpyexecdir = @pkgpyexecdir@/RelLib
+pkgpythondir = @pkgpythondir@/RelLib
+
+GRAMPS_PY_MODPATH = "../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgdata_PYTHON));
diff --git a/gramps2/src/family48.png b/gramps2/src/family48.png
deleted file mode 100644
index 982b70b6c..000000000
Binary files a/gramps2/src/family48.png and /dev/null differ