diff --git a/configure.in b/configure.in
index bdc9f5102..5ff38450a 100644
--- a/configure.in
+++ b/configure.in
@@ -203,6 +203,13 @@ src/Models/Makefile
 src/Editors/Makefile
 src/Filters/Makefile
 src/Filters/Rules/Makefile
+src/Filters/Rules/Person/Makefile
+src/Filters/Rules/Family/Makefile
+src/Filters/Rules/Event/Makefile
+src/Filters/Rules/Source/Makefile
+src/Filters/Rules/Place/Makefile
+src/Filters/Rules/Media/Makefile
+src/Filters/Rules/Repository/Makefile
 src/DataViews/Makefile
 src/PluginUtils/Makefile
 src/plugins/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7fe31114b..afc6a5daf 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -298,63 +298,76 @@ src/Filters/_FilterWidget.py
 src/Filters/_GenericFilter.py
 src/Filters/_ParamFilter.py
 src/Filters/__init__.py
-src/Filters/Rules/_Disconnected.py
-src/Filters/Rules/_Everyone.py
-src/Filters/Rules/_FamilyWithIncompleteEvent.py
-src/Filters/Rules/_HasAttribute.py
-src/Filters/Rules/_HasBirth.py
-src/Filters/Rules/_HasCommonAncestorWith.py
-src/Filters/Rules/_HasCommonAncestorWithFilterMatch.py
-src/Filters/Rules/_HasCompleteRecord.py
-src/Filters/Rules/_HasDeath.py
-src/Filters/Rules/_HasEvent.py
-src/Filters/Rules/_HasFamilyAttribute.py
-src/Filters/Rules/_HasFamilyEvent.py
-src/Filters/Rules/_HasIdOf.py
-src/Filters/Rules/_HasNameOf.py
-src/Filters/Rules/_HasNote.py
-src/Filters/Rules/_HasNoteMatchingSubstringOf.py
-src/Filters/Rules/_HasRelationship.py
-src/Filters/Rules/_HasSourceOf.py
+src/Filters/Rules/_Everything.py
 src/Filters/Rules/_HasTextMatchingRegexpOf.py
 src/Filters/Rules/_HasTextMatchingSubstringOf.py
-src/Filters/Rules/_HasUnknownGender.py
-src/Filters/Rules/_HaveAltFamilies.py
-src/Filters/Rules/_HaveChildren.py
-src/Filters/Rules/_HavePhotos.py
-src/Filters/Rules/_IncompleteNames.py
-src/Filters/Rules/_IsAncestorOf.py
-src/Filters/Rules/_IsAncestorOfFilterMatch.py
-src/Filters/Rules/_IsBookmarked.py
-src/Filters/Rules/_IsChildOfFilterMatch.py
-src/Filters/Rules/_IsDefaultPerson.py
-src/Filters/Rules/_IsDescendantFamilyOf.py
-src/Filters/Rules/_IsDescendantOf.py
-src/Filters/Rules/_IsDescendantOfFilterMatch.py
-src/Filters/Rules/_IsFemale.py
-src/Filters/Rules/_IsLessThanNthGenerationAncestorOf.py
-src/Filters/Rules/_IsLessThanNthGenerationAncestorOfBookmarked.py
-src/Filters/Rules/_IsLessThanNthGenerationAncestorOfDefaultPerson.py
-src/Filters/Rules/_IsLessThanNthGenerationDescendantOf.py
-src/Filters/Rules/_IsMale.py
-src/Filters/Rules/_IsMoreThanNthGenerationAncestorOf.py
-src/Filters/Rules/_IsMoreThanNthGenerationDescendantOf.py
-src/Filters/Rules/_IsParentOfFilterMatch.py
-src/Filters/Rules/_IsSiblingOfFilterMatch.py
-src/Filters/Rules/_IsSpouseOfFilterMatch.py
-src/Filters/Rules/_IsWitness.py
-src/Filters/Rules/_MatchesFilter.py
-src/Filters/Rules/_MultipleMarriages.py
-src/Filters/Rules/_NeverMarried.py
-src/Filters/Rules/_NoBirthdate.py
-src/Filters/Rules/_PeoplePrivate.py
-src/Filters/Rules/_PersonWithIncompleteEvent.py
-src/Filters/Rules/_ProbablyAlive.py
-src/Filters/Rules/_RelationshipPathBetween.py
+src/Filters/Rules/_IsPrivate.py
 src/Filters/Rules/_Rule.py
 src/Filters/Rules/_RuleUtils.py
-src/Filters/Rules/_SearchName.py
 src/Filters/Rules/__init__.py
+src/Filters/Rules/Person/_Disconnected.py
+src/Filters/Rules/Person/_Everyone.py
+src/Filters/Rules/Person/_FamilyWithIncompleteEvent.py
+src/Filters/Rules/Person/_HasAttribute.py
+src/Filters/Rules/Person/_HasBirth.py
+src/Filters/Rules/Person/_HasCommonAncestorWith.py
+src/Filters/Rules/Person/_HasCommonAncestorWithFilterMatch.py
+src/Filters/Rules/Person/_HasCompleteRecord.py
+src/Filters/Rules/Person/_HasDeath.py
+src/Filters/Rules/Person/_HasEvent.py
+src/Filters/Rules/Person/_HasFamilyAttribute.py
+src/Filters/Rules/Person/_HasFamilyEvent.py
+src/Filters/Rules/Person/_HasIdOf.py
+src/Filters/Rules/Person/_HasNameOf.py
+src/Filters/Rules/Person/_HasNote.py
+src/Filters/Rules/Person/_HasNoteMatchingSubstringOf.py
+src/Filters/Rules/Person/_HasRelationship.py
+src/Filters/Rules/Person/_HasSourceOf.py
+src/Filters/Rules/Person/_HasTextMatchingRegexpOf.py
+src/Filters/Rules/Person/_HasTextMatchingSubstringOf.py
+src/Filters/Rules/Person/_HasUnknownGender.py
+src/Filters/Rules/Person/_HaveAltFamilies.py
+src/Filters/Rules/Person/_HaveChildren.py
+src/Filters/Rules/Person/_HavePhotos.py
+src/Filters/Rules/Person/_IncompleteNames.py
+src/Filters/Rules/Person/_IsAncestorOf.py
+src/Filters/Rules/Person/_IsAncestorOfFilterMatch.py
+src/Filters/Rules/Person/_IsBookmarked.py
+src/Filters/Rules/Person/_IsChildOfFilterMatch.py
+src/Filters/Rules/Person/_IsDefaultPerson.py
+src/Filters/Rules/Person/_IsDescendantFamilyOf.py
+src/Filters/Rules/Person/_IsDescendantOf.py
+src/Filters/Rules/Person/_IsDescendantOfFilterMatch.py
+src/Filters/Rules/Person/_IsFemale.py
+src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOf.py
+src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOfBookmarked.py
+src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOfDefaultPerson.py
+src/Filters/Rules/Person/_IsLessThanNthGenerationDescendantOf.py
+src/Filters/Rules/Person/_IsMale.py
+src/Filters/Rules/Person/_IsMoreThanNthGenerationAncestorOf.py
+src/Filters/Rules/Person/_IsMoreThanNthGenerationDescendantOf.py
+src/Filters/Rules/Person/_IsParentOfFilterMatch.py
+src/Filters/Rules/Person/_IsSiblingOfFilterMatch.py
+src/Filters/Rules/Person/_IsSpouseOfFilterMatch.py
+src/Filters/Rules/Person/_IsWitness.py
+src/Filters/Rules/Person/_MatchesFilter.py
+src/Filters/Rules/Person/_MultipleMarriages.py
+src/Filters/Rules/Person/_NeverMarried.py
+src/Filters/Rules/Person/_NoBirthdate.py
+src/Filters/Rules/Person/_PeoplePrivate.py
+src/Filters/Rules/Person/_PersonWithIncompleteEvent.py
+src/Filters/Rules/Person/_ProbablyAlive.py
+src/Filters/Rules/Person/_RelationshipPathBetween.py
+src/Filters/Rules/Person/_Rule.py
+src/Filters/Rules/Person/_RuleUtils.py
+src/Filters/Rules/Person/_SearchName.py
+src/Filters/Rules/Person/__init__.py
+src/Filters/Rules/Family/__init__.py
+src/Filters/Rules/Event/__init__.py
+src/Filters/Rules/Place/__init__.py
+src/Filters/Rules/Source/__init__.py
+src/Filters/Rules/Media/__init__.py
+src/Filters/Rules/Repository/__init__.py
 #
 #	Glade files
 #
diff --git a/src/Filters/Rules/_HasTextMatchingSubstringOf.py b/src/Filters/Rules/_HasTextMatchingSubstringOf.py
index 68a3c3888..7a117356c 100644
--- a/src/Filters/Rules/_HasTextMatchingSubstringOf.py
+++ b/src/Filters/Rules/_HasTextMatchingSubstringOf.py
@@ -44,8 +44,8 @@ class HasTextMatchingSubstringOf(Rule):
     labels      = [ _('Substring:'),
                     _('Case sensitive:'), 
                     _('Regular-Expression matching:')]
-    name        = _('People with records containing <substring>')
-    description = _("Matches people whose records contain text "
+    name        = _('Objects with records containing <substring>')
+    description = _("Matches objects whose records contain text "
                     "matching a substring")
     category    = _('General filters')