Move aggregation methods to Result::Segment
diff --git a/lib/Krawfish/Result/Aggregate.pm b/lib/Krawfish/Result/Segment/Aggregate.pm
similarity index 92%
rename from lib/Krawfish/Result/Aggregate.pm
rename to lib/Krawfish/Result/Segment/Aggregate.pm
index 6a49c5d..1df6c08 100644
--- a/lib/Krawfish/Result/Aggregate.pm
+++ b/lib/Krawfish/Result/Segment/Aggregate.pm
@@ -1,13 +1,13 @@
-package Krawfish::Result::Aggregate;
+package Krawfish::Result::Segment::Aggregate;
use parent 'Krawfish::Result';
-use Hash::Merge qw( merge );
+# use Hash::Merge qw( merge );
use strict;
use warnings;
use constant DEBUG => 0;
-# TODO: Rename to Krawfish::Result::Segment::Aggregate
-
+# Aggregate values of matches per document and
+# per match.
# TODO:
# See https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations.html
diff --git a/lib/Krawfish/Result/Aggregate/Base.pm b/lib/Krawfish/Result/Segment/Aggregate/Base.pm
similarity index 77%
rename from lib/Krawfish/Result/Aggregate/Base.pm
rename to lib/Krawfish/Result/Segment/Aggregate/Base.pm
index 5e9e298..f8e43da 100644
--- a/lib/Krawfish/Result/Aggregate/Base.pm
+++ b/lib/Krawfish/Result/Segment/Aggregate/Base.pm
@@ -1,4 +1,4 @@
-package Krawfish::Result::Aggregate::Base;
+package Krawfish::Result::Segment::Aggregate::Base;
use strict;
use warnings;
diff --git a/lib/Krawfish/Result/Aggregate/Classes.pm b/lib/Krawfish/Result/Segment/Aggregate/Classes.pm
similarity index 100%
rename from lib/Krawfish/Result/Aggregate/Classes.pm
rename to lib/Krawfish/Result/Segment/Aggregate/Classes.pm
diff --git a/lib/Krawfish/Result/Aggregate/Content.pm b/lib/Krawfish/Result/Segment/Aggregate/Content.pm
similarity index 100%
rename from lib/Krawfish/Result/Aggregate/Content.pm
rename to lib/Krawfish/Result/Segment/Aggregate/Content.pm
diff --git a/lib/Krawfish/Result/Aggregate/Count.pm b/lib/Krawfish/Result/Segment/Aggregate/Count.pm
similarity index 61%
rename from lib/Krawfish/Result/Aggregate/Count.pm
rename to lib/Krawfish/Result/Segment/Aggregate/Count.pm
index e6c46d5..04c1c29 100644
--- a/lib/Krawfish/Result/Aggregate/Count.pm
+++ b/lib/Krawfish/Result/Segment/Aggregate/Count.pm
@@ -1,9 +1,12 @@
-package Krawfish::Result::Aggregate::Count;
-use parent 'Krawfish::Result::Aggregate::Base';
+package Krawfish::Result::Segment::Aggregate::Count;
+use parent 'Krawfish::Result::Segment::Aggregate::Base';
use Krawfish::Log;
use strict;
use warnings;
+# TODO: Rename to frequencies
+# TODO: Support virtual corpus classes
+
use constant DEBUG => 0;
# Add to totalResources immediately
diff --git a/lib/Krawfish/Result/Aggregate/Facets.pm b/lib/Krawfish/Result/Segment/Aggregate/Facets.pm
similarity index 95%
rename from lib/Krawfish/Result/Aggregate/Facets.pm
rename to lib/Krawfish/Result/Segment/Aggregate/Facets.pm
index fad66b3..106ddfd 100644
--- a/lib/Krawfish/Result/Aggregate/Facets.pm
+++ b/lib/Krawfish/Result/Segment/Aggregate/Facets.pm
@@ -1,5 +1,5 @@
-package Krawfish::Result::Aggregate::Facets;
-use parent 'Krawfish::Result::Aggregate::Base';
+package Krawfish::Result::Segment::Aggregate::Facets;
+use parent 'Krawfish::Result::Segment::Aggregate::Base';
use Krawfish::Log;
use strict;
use warnings;
diff --git a/lib/Krawfish/Result/Aggregate/Length.pm b/lib/Krawfish/Result/Segment/Aggregate/Length.pm
similarity index 89%
rename from lib/Krawfish/Result/Aggregate/Length.pm
rename to lib/Krawfish/Result/Segment/Aggregate/Length.pm
index bccaaa0..7f9572b 100644
--- a/lib/Krawfish/Result/Aggregate/Length.pm
+++ b/lib/Krawfish/Result/Segment/Aggregate/Length.pm
@@ -1,5 +1,5 @@
-package Krawfish::Result::Aggregate::Length;
-use parent 'Krawfish::Result::Aggregate::Base';
+package Krawfish::Result::Segment::Aggregate::Length;
+use parent 'Krawfish::Result::Segment::Aggregate::Base';
use Krawfish::Log;
use strict;
use warnings;
diff --git a/lib/Krawfish/Result/Aggregate/Values.pm b/lib/Krawfish/Result/Segment/Aggregate/Values.pm
similarity index 94%
rename from lib/Krawfish/Result/Aggregate/Values.pm
rename to lib/Krawfish/Result/Segment/Aggregate/Values.pm
index 7b4477f..82f4a82 100644
--- a/lib/Krawfish/Result/Aggregate/Values.pm
+++ b/lib/Krawfish/Result/Segment/Aggregate/Values.pm
@@ -1,5 +1,5 @@
-package Krawfish::Result::Aggregate::Values;
-use parent 'Krawfish::Result::Aggregate::Base';
+package Krawfish::Result::Segment::Aggregate::Values;
+use parent 'Krawfish::Result::Segment::Aggregate::Base';
use Krawfish::Log;
use strict;
use warnings;