Improve folder structure

src/lib/Concrete/ListEnumerable.vala

@@ -1,23 +0,0 @@
-
-//  namespace Invercargill {
-
-//      internal class ListEnumerable<T> : Enumerable<T> {
-
-//          private List<T> list;
-
-//          public ListEnumerable(owned List<T> input) {
-//              list = input;
-//          }
-
-//          public override bool iterate_if (Invercargill.PredicateDelegate<T> handler) {
-//              foreach (var item in list) {
-//                  if(!handler(item)) {
-//                      break;
-//                  }
-//              }
-//              return true;
-//          }
-
-//      }
-
-//  }

src/lib/Concrete/ConcatEnumerable.vala → src/lib/Modifiers/ConcatEnumerable.vala

@@ -1,7 +1,7 @@
 
 namespace Invercargill {
 
-    internal class ConcatEnumerable<T> : Enumerable<T> {
+    private class ConcatEnumerable<T> : Enumerable<T> {
 
         private Enumerable<T> e1;
         private Enumerable<T> e2;

src/lib/Concrete/PairEnumerable.vala → src/lib/Modifiers/PairEnumerable.vala

@@ -1,6 +1,6 @@
 namespace Invercargill {
 
-    public class PairEnumerable<T1, T2> : Enumerable<Pair<T1, T2>> {
+    private class PairEnumerable<T1, T2> : Enumerable<Pair<T1, T2>> {
 
         private Enumerable<T1> e1;
         private Enumerable<T2> e2;

src/lib/Modifiers/SealedEnumerable.vala

@@ -0,0 +1,11 @@
+namespace Invercargill {
+
+    private class SealedEnumerable<T> : ProxyEnumerable<T> {
+
+        public SealedEnumerable (Enumerable<T> source) {
+            inner = source;
+        }
+
+    }
+
+}

src/lib/Concrete/ZipperEnumerable.vala → src/lib/Modifiers/ZipperEnumerable.vala

@@ -1,6 +1,6 @@
 namespace Invercargill {
 
-    public class ZipperEnumerable<T> : Enumerable<T> {
+    private class ZipperEnumerable<T> : Enumerable<T> {
 
         private Enumerable<T> e1;
         private Enumerable<T> e2;

src/lib/meson.build

@@ -27,40 +27,41 @@ sources += files('ValueMapper.vala')
 sources += files('KeyValuePair.vala')
 sources += files('Attempt.vala')
 sources += files('Cache.vala')
+sources += files('EnumerableProxy.vala')
 
-sources += files('Queries/Query.vala')
-sources += files('Queries/Transform.vala')
-sources += files('Queries/Filter.vala')
-sources += files('Queries/Merge.vala')
-sources += files('Queries/Sort.vala')
-sources += files('Queries/Skip.vala')
-sources += files('Queries/Take.vala')
-sources += files('Queries/Parallel.vala')
-sources += files('Queries/Unique.vala')
-sources += files('Queries/Position.vala')
-sources += files('Queries/FilterTransform.vala')
-sources += files('Queries/From.vala')
-sources += files('Queries/Until.vala')
+sources += files('Modifiers/Query.vala')
+sources += files('Modifiers/Transform.vala')
+sources += files('Modifiers/Filter.vala')
+sources += files('Modifiers/Merge.vala')
+sources += files('Modifiers/Sort.vala')
+sources += files('Modifiers/Skip.vala')
+sources += files('Modifiers/Take.vala')
+sources += files('Modifiers/Parallel.vala')
+sources += files('Modifiers/Unique.vala')
+sources += files('Modifiers/Position.vala')
+sources += files('Modifiers/FilterTransform.vala')
+sources += files('Modifiers/From.vala')
+sources += files('Modifiers/Until.vala')
+sources += files('Modifiers/CacheEnumerable.vala')
+sources += files('Modifiers/ConcatEnumerable.vala')
+sources += files('Modifiers/PairEnumerable.vala')
+sources += files('Modifiers/SealedEnumerable.vala')
+sources += files('Modifiers/ZipperEnumerable.vala')
 
-sources += files('Concrete/ArrayEnumerable.vala')
-sources += files('Concrete/GeeEnumerable.vala')
-sources += files('Concrete/GenericArrayEnumerable.vala')
-sources += files('Concrete/ListEnumerable.vala')
-sources += files('Concrete/RangeEnumerable.vala')
-sources += files('Concrete/ConcatEnumerable.vala')
-sources += files('Concrete/PairEnumerable.vala')
-sources += files('Concrete/DirEnumerable.vala')
-sources += files('Concrete/ZipperEnumerable.vala')
-sources += files('Concrete/EmptyEnumerable.vala')
-sources += files('Concrete/Generator.vala')
-sources += files('Concrete/Numbers/NumberEnumerable.vala')
-sources += files('Concrete/Numbers/Implementations.vala')
-sources += files('Concrete/ProxyEnumerable.vala')
-sources += files('Concrete/SealedEnumerable.vala')
-sources += files('Concrete/EquatableEnumerable.vala')
-sources += files('Concrete/AttemptEnumerable.vala')
-sources += files('Concrete/CacheEnumerable.vala')
-sources += files('Concrete/PropertyGroupEnumerable.vala')
+sources += files('Wrappers/ArrayEnumerable.vala')
+sources += files('Wrappers/GeeEnumerable.vala')
+sources += files('Wrappers/GenericArrayEnumerable.vala')
+sources += files('Wrappers/DirEnumerable.vala')
+
+sources += files('Generators/RangeEnumerable.vala')
+sources += files('Generators/EmptyEnumerable.vala')
+sources += files('Generators/Generator.vala')
+
+sources += files('Promotions/Numbers/NumberEnumerable.vala')
+sources += files('Promotions/Numbers/Implementations.vala')
+sources += files('Promotions/EquatableEnumerable.vala')
+sources += files('Promotions/AttemptEnumerable.vala')
+sources += files('Promotions/PropertyGroupEnumerable.vala')
 
 sources += files('Collections/Collection.vala')
 sources += files('Collections/Series.vala')