diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..943706f
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,20 @@
+name: Main
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install Dependencies
+        run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+
+      - name: Test (using kahlan)
+        run: ./vendor/bin/kahlan
diff --git a/.gitignore b/.gitignore
index 2084e22..ca44bd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /vendor/
 /coverage.json
 /composer.phar
+.idea
diff --git a/composer.json b/composer.json
index fc9f5c5..b6ca7a1 100644
--- a/composer.json
+++ b/composer.json
@@ -8,9 +8,7 @@
   ],
   "autoload": {
     "psr-4": {
-      "Eno\\": ["src", "src/elements/", "src/errors/"],
-      "Eno\\Errors\\": "src/errors",
-      "Eno\\Reporters\\": "src/reporters"
+      "Eno\\": "src"
     }
   },
   "autoload-dev": {
diff --git a/spec/elements/empty.spec.php b/spec/elements/empty.spec.php
index 9fd0a3d..94af34e 100644
--- a/spec/elements/empty.spec.php
+++ b/spec/elements/empty.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{EmptyElement, Section};
+use Eno\{Elements\EmptyElement, Elements\Section};
 
 describe('EmptyElement', function() {
   beforeAll(function() {
diff --git a/spec/elements/field.spec.php b/spec/elements/field.spec.php
index f46baaf..0239ef8 100644
--- a/spec/elements/field.spec.php
+++ b/spec/elements/field.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Field, Parser, Section};
+use Eno\{Elements\Field, Parser, Elements\Section};
 
 describe('Field', function() {
   beforeAll(function() {
diff --git a/spec/elements/fieldset.spec.php b/spec/elements/fieldset.spec.php
index 709960b..42c08b6 100644
--- a/spec/elements/fieldset.spec.php
+++ b/spec/elements/fieldset.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Field, Fieldset, Parser, Section};
+use Eno\{Elements\Field, Elements\Fieldset, Parser, Elements\Section};
 
 describe('Fieldset', function() {
   beforeAll(function() {
@@ -59,7 +59,7 @@
       });
 
       it('returns an element', function() {
-        expect($this->result)->toBeAnInstanceOf('Eno\\Field');
+        expect($this->result)->toBeAnInstanceOf('Eno\\Elements\\Field');
       });
 
       it('returns the right element', function() {
@@ -168,7 +168,7 @@
     describe("with [ 'element' => true ]", function() {
       it('returns the element', function() {
         $this->result = $this->fieldset->entry('eno', [ 'element' => true ]);
-        expect($this->result)->toBeAnInstanceOf('Eno\\Field');
+        expect($this->result)->toBeAnInstanceOf('Eno\\Elements\\Field');
       });
     });
 
@@ -179,7 +179,7 @@
         });
 
         it('returns the element', function() {
-          expect($this->result['element'])->toBeAnInstanceOf('Eno\\Field');
+          expect($this->result['element'])->toBeAnInstanceOf('Eno\\Elements\\Field');
         });
 
         it('returns the value', function() {
diff --git a/spec/elements/lazy_construction.spec.php b/spec/elements/lazy_construction.spec.php
index b611cf7..504e31d 100644
--- a/spec/elements/lazy_construction.spec.php
+++ b/spec/elements/lazy_construction.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Field, Fieldset, ListElement, Parser};
+use Eno\{Elements\Field, Elements\Fieldset, Elements\ListElement, Parser};
 
 describe('Fetching an empty element through fieldset()', function() {
   beforeEach(function() {
@@ -9,7 +9,7 @@
   });
 
   it('returns a fieldset', function() {
-    expect($this->fieldset)->toBeAnInstanceOf('Eno\\Fieldset');
+    expect($this->fieldset)->toBeAnInstanceOf('Eno\\Elements\\Fieldset');
   });
 
   it('returns a fieldset with enforceAllElements disabled', function() {
@@ -37,7 +37,7 @@
   });
 
   it('returns a fieldset as first element', function() {
-    expect($this->fieldsets[0])->toBeAnInstanceOf('Eno\\Fieldset');
+    expect($this->fieldsets[0])->toBeAnInstanceOf('Eno\\Elements\\Fieldset');
   });
 
   it('returns a fieldset with enforceAllElements disabled', function() {
@@ -63,7 +63,7 @@
   });
 
   it('returns a field as first element', function() {
-    expect($this->fields[0])->toBeAnInstanceOf('Eno\\Field');
+    expect($this->fields[0])->toBeAnInstanceOf('Eno\\Elements\\Field');
   });
 });
 
@@ -76,6 +76,6 @@
   });
 
   it('returns a list as first element', function() {
-    expect($this->lists[0])->toBeAnInstanceOf('Eno\\ListElement');
+    expect($this->lists[0])->toBeAnInstanceOf('Eno\\Elements\\ListElement');
   });
 });
diff --git a/spec/elements/list.spec.php b/spec/elements/list.spec.php
index 7827f25..b792158 100644
--- a/spec/elements/list.spec.php
+++ b/spec/elements/list.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Field, ListElement, Section};
+use Eno\{Elements\Field, Elements\ListElement, Elements\Section};
 
 describe('List', function() {
   beforeAll(function() {
@@ -110,7 +110,7 @@
 
       it('returns the elements', function() {
         foreach($this->result as $item) {
-          expect($item['element'])->toBeAnInstanceOf('Eno\\Field');
+          expect($item['element'])->toBeAnInstanceOf('Eno\\Elements\\Field');
         }
       });
 
diff --git a/spec/elements/section.spec.php b/spec/elements/section.spec.php
index 516b702..efb1c21 100644
--- a/spec/elements/section.spec.php
+++ b/spec/elements/section.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Field, Section};
+use Eno\{Elements\Field, Elements\Section};
 
 describe('Section', function() {
   beforeAll(function() {
@@ -77,7 +77,7 @@
 
     it('returns the elements of the section', function() {
       foreach($this->result as $element) {
-        expect($element)->toBeAnInstanceOf('Eno\\Field');
+        expect($element)->toBeAnInstanceOf('Eno\\Elements\\Field');
       }
     });
   });
diff --git a/spec/errors/analysis/duplicate_fieldset_entry_name.spec.php b/spec/errors/analysis/duplicate_fieldset_entry_name.spec.php
index 922f71b..c1f9c6f 100644
--- a/spec/errors/analysis/duplicate_fieldset_entry_name.spec.php
+++ b/spec/errors/analysis/duplicate_fieldset_entry_name.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Analysis::duplicateFieldsetEntryName', function() {
   beforeAll(function() {
diff --git a/spec/errors/analysis/fieldset_entry_in_field.spec.php b/spec/errors/analysis/fieldset_entry_in_field.spec.php
index 55f1435..7fabd19 100644
--- a/spec/errors/analysis/fieldset_entry_in_field.spec.php
+++ b/spec/errors/analysis/fieldset_entry_in_field.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Analysis::fieldsetEntryInField', function() {
   beforeAll(function() {
diff --git a/spec/errors/analysis/fieldset_entry_in_list.spec.php b/spec/errors/analysis/fieldset_entry_in_list.spec.php
index 17bb5f4..0d3658b 100644
--- a/spec/errors/analysis/fieldset_entry_in_list.spec.php
+++ b/spec/errors/analysis/fieldset_entry_in_list.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Analysis::fieldsetEntryInList', function() {
   beforeAll(function() {
diff --git a/spec/errors/analysis/list_item_in_field.spec.php b/spec/errors/analysis/list_item_in_field.spec.php
index bb8990f..2b39bb4 100644
--- a/spec/errors/analysis/list_item_in_field.spec.php
+++ b/spec/errors/analysis/list_item_in_field.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Analysis::listItemInField', function() {
   beforeAll(function() {
diff --git a/spec/errors/analysis/list_item_in_fieldset.spec.php b/spec/errors/analysis/list_item_in_fieldset.spec.php
index 16e2551..e5c1590 100644
--- a/spec/errors/analysis/list_item_in_fieldset.spec.php
+++ b/spec/errors/analysis/list_item_in_fieldset.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Analysis::listItemInFieldset', function() {
   beforeAll(function() {
diff --git a/spec/errors/analysis/missing_element_for_continuation.spec.php b/spec/errors/analysis/missing_element_for_continuation.spec.php
index e4beb0a..2d51385 100644
--- a/spec/errors/analysis/missing_element_for_continuation.spec.php
+++ b/spec/errors/analysis/missing_element_for_continuation.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Analysis::missingElementForContinuation', function() {
   beforeAll(function() {
diff --git a/spec/errors/analysis/missing_name_for_fieldset_entry.spec.php b/spec/errors/analysis/missing_name_for_fieldset_entry.spec.php
index 1cd62f6..e1882d1 100644
--- a/spec/errors/analysis/missing_name_for_fieldset_entry.spec.php
+++ b/spec/errors/analysis/missing_name_for_fieldset_entry.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Analysis::missingNameForFieldsetEntry', function() {
   beforeAll(function() {
diff --git a/spec/errors/analysis/missing_name_for_list_item.spec.php b/spec/errors/analysis/missing_name_for_list_item.spec.php
index 753843d..9104a5f 100644
--- a/spec/errors/analysis/missing_name_for_list_item.spec.php
+++ b/spec/errors/analysis/missing_name_for_list_item.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Analysis::missingNameForListItem', function() {
   beforeAll(function() {
diff --git a/spec/errors/analysis/section_hierarchy_layer_skip.spec.php b/spec/errors/analysis/section_hierarchy_layer_skip.spec.php
index 5edddcb..e675e53 100644
--- a/spec/errors/analysis/section_hierarchy_layer_skip.spec.php
+++ b/spec/errors/analysis/section_hierarchy_layer_skip.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Analysis::sectionHierarchyLayerSkip', function() {
   beforeAll(function() {
diff --git a/spec/errors/error.spec.php b/spec/errors/error.spec.php
index 6c1b790..36be6b4 100644
--- a/spec/errors/error.spec.php
+++ b/spec/errors/error.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\Error;
+use Eno\Errors\Error;
 
 describe('Error', function() {
   given('text', function() { return 'My error'; });
diff --git a/spec/errors/parse_error.spec.php b/spec/errors/parse_error.spec.php
index 4735d3d..cb145a0 100644
--- a/spec/errors/parse_error.spec.php
+++ b/spec/errors/parse_error.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, ParseError};
+use Eno\{Errors\Error, Errors\ParseError};
 
 describe('ParseError', function() {
   given('text', function() { return 'My error'; });
@@ -32,7 +32,7 @@
     expect($this->error->cursor)->toEqual($this->cursor);
   });
 
-  it('is generically catchable as an Eno\\Error when thrown', function() {
+  it('is generically catchable as an Eno\\Errors\\Error when thrown', function() {
     $caught = false;
 
     try {
diff --git a/spec/errors/resolution/copying_block_into_fieldset.spec.php b/spec/errors/resolution/copying_block_into_fieldset.spec.php
index a94f2c4..9dfa283 100644
--- a/spec/errors/resolution/copying_block_into_fieldset.spec.php
+++ b/spec/errors/resolution/copying_block_into_fieldset.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Resolution::copyingBlockIntoFieldset', function() {
   beforeAll(function() {
diff --git a/spec/errors/resolution/copying_block_into_list.spec.php b/spec/errors/resolution/copying_block_into_list.spec.php
index 54724bd..e383535 100644
--- a/spec/errors/resolution/copying_block_into_list.spec.php
+++ b/spec/errors/resolution/copying_block_into_list.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Resolution::copyingBlockIntoList', function() {
   beforeAll(function() {
diff --git a/spec/errors/resolution/copying_block_into_section.spec.php b/spec/errors/resolution/copying_block_into_section.spec.php
index 822c455..f904e14 100644
--- a/spec/errors/resolution/copying_block_into_section.spec.php
+++ b/spec/errors/resolution/copying_block_into_section.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Resolution::copyingBlockIntoSection', function() {
   beforeAll(function() {
diff --git a/spec/errors/resolution/copying_field_into_fieldset.spec.php b/spec/errors/resolution/copying_field_into_fieldset.spec.php
index ec590cc..c1cb0fa 100644
--- a/spec/errors/resolution/copying_field_into_fieldset.spec.php
+++ b/spec/errors/resolution/copying_field_into_fieldset.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Resolution::copyingFieldIntoFieldset', function() {
   beforeAll(function() {
diff --git a/spec/errors/resolution/copying_field_into_list.spec.php b/spec/errors/resolution/copying_field_into_list.spec.php
index d83edb3..da35e58 100644
--- a/spec/errors/resolution/copying_field_into_list.spec.php
+++ b/spec/errors/resolution/copying_field_into_list.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Resolution::copyingFieldIntoList', function() {
   beforeAll(function() {
diff --git a/spec/errors/resolution/copying_field_into_section.spec.php b/spec/errors/resolution/copying_field_into_section.spec.php
index 56602cc..0ffdb3c 100644
--- a/spec/errors/resolution/copying_field_into_section.spec.php
+++ b/spec/errors/resolution/copying_field_into_section.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Resolution::copyingFieldIntoSection', function() {
   beforeAll(function() {
diff --git a/spec/errors/resolution/copying_fieldset_into_field.spec.php b/spec/errors/resolution/copying_fieldset_into_field.spec.php
index 13588c5..1727b0a 100644
--- a/spec/errors/resolution/copying_fieldset_into_field.spec.php
+++ b/spec/errors/resolution/copying_fieldset_into_field.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Resolution::copyingFieldsetIntoField', function() {
   beforeAll(function() {
diff --git a/spec/errors/resolution/copying_fieldset_into_list.spec.php b/spec/errors/resolution/copying_fieldset_into_list.spec.php
index 786ab56..38e9118 100644
--- a/spec/errors/resolution/copying_fieldset_into_list.spec.php
+++ b/spec/errors/resolution/copying_fieldset_into_list.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Resolution::copyingFieldsetIntoList', function() {
   beforeAll(function() {
diff --git a/spec/errors/resolution/copying_fieldset_into_section.spec.php b/spec/errors/resolution/copying_fieldset_into_section.spec.php
index de735de..5d70de5 100644
--- a/spec/errors/resolution/copying_fieldset_into_section.spec.php
+++ b/spec/errors/resolution/copying_fieldset_into_section.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Resolution::copyingFieldsetIntoSection', function() {
   beforeAll(function() {
diff --git a/spec/errors/resolution/copying_list_into_field.spec.php b/spec/errors/resolution/copying_list_into_field.spec.php
index 4111a3d..89af25e 100644
--- a/spec/errors/resolution/copying_list_into_field.spec.php
+++ b/spec/errors/resolution/copying_list_into_field.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Resolution::copyingListIntoField', function() {
   beforeAll(function() {
diff --git a/spec/errors/resolution/copying_list_into_fieldset.spec.php b/spec/errors/resolution/copying_list_into_fieldset.spec.php
index b043c73..80b5967 100644
--- a/spec/errors/resolution/copying_list_into_fieldset.spec.php
+++ b/spec/errors/resolution/copying_list_into_fieldset.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Resolution::copyingListIntoFieldset', function() {
   beforeAll(function() {
diff --git a/spec/errors/resolution/copying_list_into_section.spec.php b/spec/errors/resolution/copying_list_into_section.spec.php
index 6e8091a..e80fda6 100644
--- a/spec/errors/resolution/copying_list_into_section.spec.php
+++ b/spec/errors/resolution/copying_list_into_section.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Resolution::copyingListIntoSection', function() {
   beforeAll(function() {
diff --git a/spec/errors/resolution/copying_section_into_empty.spec.php b/spec/errors/resolution/copying_section_into_empty.spec.php
index e8a8dd3..9eb9113 100644
--- a/spec/errors/resolution/copying_section_into_empty.spec.php
+++ b/spec/errors/resolution/copying_section_into_empty.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Resolution::copyingSectionIntoEmpty', function() {
   beforeAll(function() {
diff --git a/spec/errors/resolution/copying_section_into_field.spec.php b/spec/errors/resolution/copying_section_into_field.spec.php
index d0dc584..bc08df1 100644
--- a/spec/errors/resolution/copying_section_into_field.spec.php
+++ b/spec/errors/resolution/copying_section_into_field.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Resolution::copyingSectionIntoField', function() {
   beforeAll(function() {
diff --git a/spec/errors/resolution/copying_section_into_fieldset.spec.php b/spec/errors/resolution/copying_section_into_fieldset.spec.php
index cf013ac..14839c0 100644
--- a/spec/errors/resolution/copying_section_into_fieldset.spec.php
+++ b/spec/errors/resolution/copying_section_into_fieldset.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Resolution::copyingSectionIntoFieldset', function() {
   beforeAll(function() {
diff --git a/spec/errors/resolution/copying_section_into_list.spec.php b/spec/errors/resolution/copying_section_into_list.spec.php
index 577a4ae..dea1ba2 100644
--- a/spec/errors/resolution/copying_section_into_list.spec.php
+++ b/spec/errors/resolution/copying_section_into_list.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Resolution::copyingSectionIntoList', function() {
   beforeAll(function() {
diff --git a/spec/errors/resolution/cyclic_dependency.spec.php b/spec/errors/resolution/cyclic_dependency.spec.php
index 651ae84..733bac6 100644
--- a/spec/errors/resolution/cyclic_dependency.spec.php
+++ b/spec/errors/resolution/cyclic_dependency.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Resolution::cyclicDependency', function() {
   given('scenarios', function() {
diff --git a/spec/errors/resolution/multiple_templates_found.spec.php b/spec/errors/resolution/multiple_templates_found.spec.php
index 1b9ef43..2768932 100644
--- a/spec/errors/resolution/multiple_templates_found.spec.php
+++ b/spec/errors/resolution/multiple_templates_found.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Resolution::multipleTemplatesFound', function() {
   beforeAll(function() {
diff --git a/spec/errors/resolution/template_not_found.spec.php b/spec/errors/resolution/template_not_found.spec.php
index d5ae5d2..2397cda 100644
--- a/spec/errors/resolution/template_not_found.spec.php
+++ b/spec/errors/resolution/template_not_found.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, Parser};
+use Eno\{Errors\Error, Parser};
 
 describe('Resolution::templateNotFound', function() {
   beforeAll(function() {
diff --git a/spec/errors/tokenization/invalid_line.spec.php b/spec/errors/tokenization/invalid_line.spec.php
index 5c92dd3..6766184 100644
--- a/spec/errors/tokenization/invalid_line.spec.php
+++ b/spec/errors/tokenization/invalid_line.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{ParseError, Parser};
+use Eno\{Errors\ParseError, Parser};
 
 describe('Tokenization::invalidLine', function() {
   beforeAll(function() {
diff --git a/spec/errors/tokenization/unterminated_block.spec.php b/spec/errors/tokenization/unterminated_block.spec.php
index 549d784..de3d1db 100644
--- a/spec/errors/tokenization/unterminated_block.spec.php
+++ b/spec/errors/tokenization/unterminated_block.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{ParseError, Parser};
+use Eno\{Errors\ParseError, Parser};
 
 describe('Tokenization::unterminatedBlock', function() {
   beforeAll(function() {
diff --git a/spec/errors/tokenization/unterminated_escaped_name.spec.php b/spec/errors/tokenization/unterminated_escaped_name.spec.php
index d7c5b0a..11f6803 100644
--- a/spec/errors/tokenization/unterminated_escaped_name.spec.php
+++ b/spec/errors/tokenization/unterminated_escaped_name.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{ParseError, Parser};
+use Eno\{Errors\ParseError, Parser};
 
 describe('Tokenization::unterminatedEscapedName', function() {
   beforeAll(function() {
diff --git a/spec/errors/validation_error.spec.php b/spec/errors/validation_error.spec.php
index 49bb3db..4275cc4 100644
--- a/spec/errors/validation_error.spec.php
+++ b/spec/errors/validation_error.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{Error, ValidationError};
+use Eno\{Errors\Error, Errors\ValidationError};
 
 describe('ValidationError', function() {
   given('text', function() { return 'My error'; });
@@ -32,7 +32,7 @@
     expect($this->error->cursor)->toEqual($this->cursor);
   });
 
-  it('is generically catchable as an Eno\\Error when thrown', function() {
+  it('is generically catchable as an Eno\\Errors\\Error when thrown', function() {
     $caught = false;
 
     try {
diff --git a/spec/loaders/bootstrapping.spec.php b/spec/loaders/bootstrapping.spec.php
index 656367a..7966a71 100644
--- a/spec/loaders/bootstrapping.spec.php
+++ b/spec/loaders/bootstrapping.spec.php
@@ -37,7 +37,7 @@
       it('passes them on', function() {
         $this->result = $this->ratings->number('excellent', [ 'with_element' => true ]);
 
-        expect($this->result['element'])->toBeAnInstanceOf('Eno\\Field');
+        expect($this->result['element'])->toBeAnInstanceOf('Eno\\Elements\\Field');
         expect($this->result['value'])->toBe(1);
       });
     });
@@ -57,7 +57,7 @@
         $items = $this->color_list->colorItems([ 'with_elements' => true ]);
 
         foreach($items as $item) {
-          expect($item['element'])->toBeAnInstanceOf('Eno\\Field');
+          expect($item['element'])->toBeAnInstanceOf('Eno\\Elements\\Field');
           expect($item['value'])->toBeA('string');
         }
       });
@@ -74,7 +74,7 @@
         it('passes them on', function() {
           $this->result = $this->document->email('email', [ 'with_element' => true ]);
 
-          expect($this->result['element'])->toBeAnInstanceOf('Eno\\Field');
+          expect($this->result['element'])->toBeAnInstanceOf('Eno\\Elements\\Field');
           expect($this->result['value'])->toEqual('jane.doe@eno-lang.org');
         });
       });
@@ -90,7 +90,7 @@
           $items = $this->document->colorList('colors', [ 'with_elements' => true ]);
 
           foreach($items as $item) {
-            expect($item['element'])->toBeAnInstanceOf('Eno\\Field');
+            expect($item['element'])->toBeAnInstanceOf('Eno\\Elements\\Field');
             expect($item['value'])->toBeA('string');
           }
         });
diff --git a/spec/matchers/ToMatchErrorSnapshot.php b/spec/matchers/ToMatchErrorSnapshot.php
index 06de463..a86d54f 100644
--- a/spec/matchers/ToMatchErrorSnapshot.php
+++ b/spec/matchers/ToMatchErrorSnapshot.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 namespace Eno\Matchers;
-use Eno\Error;
+use Eno\Errors\Error;
 
 class ToMatchErrorSnapshot extends ToMatchSnapshot
 {
diff --git a/spec/parse.spec.php b/spec/parse.spec.php
index f3fd797..6d3536b 100644
--- a/spec/parse.spec.php
+++ b/spec/parse.spec.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{ParseError, Parser};
+use Eno\{Errors\ParseError, Parser};
 
 describe('Parser', function() {
   describe('parse()', function() {
diff --git a/spec/util.php b/spec/util.php
index a935fbf..3d93093 100644
--- a/spec/util.php
+++ b/spec/util.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-use Eno\{ParseError, ValidationError};
+use Eno\{Errors\ParseError, Errors\ValidationError};
 
 function interceptParseError(callable $callback) : ParseError {
   $error = null;
diff --git a/src/elements/EmptyElement.php b/src/Elements/EmptyElement.php
similarity index 92%
rename from src/elements/EmptyElement.php
rename to src/Elements/EmptyElement.php
index f44dde0..22e152b 100644
--- a/src/elements/EmptyElement.php
+++ b/src/Elements/EmptyElement.php
@@ -1,8 +1,9 @@
 <?php declare(strict_types=1);
 
-namespace Eno;
+namespace Eno\Elements;
+use Eno\Elements\Section;
 use Eno\Errors\Validation;
-use Eno\ValidationError;
+use Eno\Errors\ValidationError;
 use \stdClass;
 
 class EmptyElement {
diff --git a/src/elements/Field.php b/src/Elements/Field.php
similarity index 97%
rename from src/elements/Field.php
rename to src/Elements/Field.php
index 66591da..777e1e6 100644
--- a/src/elements/Field.php
+++ b/src/Elements/Field.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Eno;
+namespace Eno\Elements;
 
 use \BadMethodCallException;
 use \Closure;
@@ -8,7 +8,7 @@
 use \ReflectionFunction;
 use \stdClass;
 use Eno\Errors\Validation;
-use Eno\ValidationError;
+use Eno\Errors\ValidationError;
 
 class Field {
   public $touched;
@@ -77,7 +77,7 @@ public function __call($function_name, $arguments) {
     if(method_exists('Eno\Loaders', $function_name)) {
       return $this->value(Closure::fromCallable(['Eno\\Loaders', $function_name]), ...$arguments);
     } else {
-      throw new BadMethodCallException("Call to undefined method Eno\\Field::{$function_name}()");
+      throw new BadMethodCallException("Call to undefined method Eno\\Elements\\Field::{$function_name}()");
     }
   }
 
@@ -157,7 +157,7 @@ public function value(...$optional) {
     if($this->value !== null) {
       if($loader) {
         try {
-          $info = new ReflectionFunction($loader);
+          $info = new \ReflectionFunction($loader);
 
           switch ($info->getNumberOfParameters()) {
             case 3:
diff --git a/src/elements/Fieldset.php b/src/Elements/Fieldset.php
similarity index 97%
rename from src/elements/Fieldset.php
rename to src/Elements/Fieldset.php
index 72e84c1..2e3bfdd 100644
--- a/src/elements/Fieldset.php
+++ b/src/Elements/Fieldset.php
@@ -1,6 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace Eno;
+namespace Eno\Elements;
+use Eno\Elements\Field;
+use Eno\Elements\Section;
 use Eno\Errors\Validation;
 use \BadMethodCallException;
 use \Closure;
@@ -46,7 +48,7 @@ public function __call($function_name, $arguments) {
 
       return $this->entry($name, Closure::fromCallable(['Eno\\Loaders', $function_name]), ...$optional);
     } else {
-      throw new BadMethodCallException("Call to undefined method Eno\\Fieldset::{$function_name}()");
+      throw new BadMethodCallException("Call to undefined method Eno\\Elements\\Fieldset::{$function_name}()");
     }
   }
 
diff --git a/src/elements/ListElement.php b/src/Elements/ListElement.php
similarity index 95%
rename from src/elements/ListElement.php
rename to src/Elements/ListElement.php
index 9566640..b53b6d7 100644
--- a/src/elements/ListElement.php
+++ b/src/Elements/ListElement.php
@@ -1,7 +1,9 @@
 <?php declare(strict_types=1);
 
-namespace Eno;
-use Eno\ValidationError;
+namespace Eno\Elements;
+use Eno\Elements\Field;
+use Eno\Elements\Section;
+use Eno\Errors\ValidationError;
 use \BadMethodCallException;
 use \Closure;
 use \stdClass;
@@ -38,7 +40,7 @@ public function __call($function_name, $arguments) {
     if(method_exists('Eno\Loaders', $function_name)) {
       return $this->items(Closure::fromCallable(['Eno\\Loaders', $function_name]), ...$arguments);
     } else {
-      throw new BadMethodCallException("Call to undefined method Eno\\Section::{$function_name}()");
+      throw new BadMethodCallException("Call to undefined method Eno\\Elements\\Section::{$function_name}()");
     }
   }
 
diff --git a/src/elements/Section.php b/src/Elements/Section.php
similarity index 99%
rename from src/elements/Section.php
rename to src/Elements/Section.php
index 2b46c71..eb6ef45 100644
--- a/src/elements/Section.php
+++ b/src/Elements/Section.php
@@ -1,9 +1,14 @@
 <?php declare(strict_types=1);
 
-namespace Eno;
+namespace Eno\Elements;
+
+use Eno\Elements\EmptyElement;
 use Eno\Errors\Validation;
 use \BadMethodCallException;
 use \Closure;
+use Eno\Elements\Field;
+use Eno\Elements\Fieldset;
+use Eno\Elements\ListElement;
 use \stdClass;
 
 // TODO: Here and elsewhere - declare private properties private
@@ -73,7 +78,7 @@ public function __call($function_name, $arguments) {
         return $this->list($name, $loader, ...$optional);
       }
     } else {
-      throw new BadMethodCallException("Call to undefined method Eno\\Section::{$function_name}()");
+      throw new BadMethodCallException("Call to undefined method Eno\\Elements\\Section::{$function_name}()");
     }
   }
 
diff --git a/src/errors/Analysis.php b/src/Errors/Analysis.php
similarity index 99%
rename from src/errors/Analysis.php
rename to src/Errors/Analysis.php
index a0b38ab..178363b 100644
--- a/src/errors/Analysis.php
+++ b/src/Errors/Analysis.php
@@ -1,11 +1,10 @@
 <?php declare(strict_types=1);
 
 namespace Eno\Errors;
-use Eno\ParseError;
 use \stdClass;
 
-class Analysis {
-
+class Analysis
+{
   public static function fieldsetEntryInField(stdClass $context, stdClass $entry_instruction, stdClass $field_instruction) : ParseError {
     $message = $context->messages['analysis']['fieldset_entry_in_field'](
       $entry_instruction->line + $context->indexing
diff --git a/src/errors/Error.php b/src/Errors/Error.php
similarity index 93%
rename from src/errors/Error.php
rename to src/Errors/Error.php
index 54aa657..4a5801a 100644
--- a/src/errors/Error.php
+++ b/src/Errors/Error.php
@@ -1,9 +1,11 @@
 <?php declare(strict_types=1);
 
-namespace Eno;
+namespace Eno\Errors;
+
 use Exception;
 
-class Error extends Exception {
+class Error extends Exception
+{
   public $cursor;
   public $message;
   public $selection;
diff --git a/src/errors/ParseError.php b/src/Errors/ParseError.php
similarity index 75%
rename from src/errors/ParseError.php
rename to src/Errors/ParseError.php
index bf38de9..98bf740 100644
--- a/src/errors/ParseError.php
+++ b/src/Errors/ParseError.php
@@ -1,5 +1,5 @@
 <?php declare(strict_types=1);
 
-namespace Eno;
+namespace Eno\Errors;
 
 class ParseError extends Error { }
diff --git a/src/errors/Resolution.php b/src/Errors/Resolution.php
similarity index 99%
rename from src/errors/Resolution.php
rename to src/Errors/Resolution.php
index 45c1302..67b0af4 100644
--- a/src/errors/Resolution.php
+++ b/src/Errors/Resolution.php
@@ -1,10 +1,11 @@
 <?php declare(strict_types=1);
 
 namespace Eno\Errors;
-use Eno\ParseError;
+use Eno\Errors\ParseError;
 use \stdClass;
 
-class Resolution {
+class Resolution
+{
   public static function copyingBlockIntoFieldset(stdClass $context, stdClass $instruction) : ParseError {
     $message = $context->messages['resolution']['copying_block_into_fieldset'](
       $instruction->line + $context->indexing
diff --git a/src/errors/Tokenization.php b/src/Errors/Tokenization.php
similarity index 98%
rename from src/errors/Tokenization.php
rename to src/Errors/Tokenization.php
index f259056..fcaecb3 100644
--- a/src/errors/Tokenization.php
+++ b/src/Errors/Tokenization.php
@@ -1,10 +1,11 @@
 <?php declare(strict_types=1);
 
 namespace Eno\Errors;
-use Eno\ParseError;
+
 use \stdClass;
 
-class Tokenization {
+class Tokenization
+{
   private const UNTERMINATED_ESCAPED_NAME = "/^\s*(`+)(?!`)((?:(?!\1).)+)$/";
 
   // ```name: value
diff --git a/src/errors/Validation.php b/src/Errors/Validation.php
similarity index 99%
rename from src/errors/Validation.php
rename to src/Errors/Validation.php
index 02a09b6..d78f0a3 100644
--- a/src/errors/Validation.php
+++ b/src/Errors/Validation.php
@@ -1,13 +1,13 @@
 <?php declare(strict_types=1);
 
 namespace Eno\Errors;
-use Eno\ValidationError;
+
 use \stdClass;
 
 function deepExpandInstruction(stdClass $instruction) : array {
   $result = [$instruction];
 
-  if(array_key_exists('subinstructions', $instruction)) {
+  if(property_exists($instruction, 'subinstructions')) {
     foreach($instruction->subinstructions as $subinstruction) {
       $result = array_merge($result, deepExpandInstruction($subinstruction));
     }
@@ -30,7 +30,8 @@ function expandInstructions(array $instructions) : array {
   return $result;
 }
 
-class Validation {
+class Validation
+{
   public static function exactCountNotMet(stdClass $context, stdClass $instruction, int $exact_count) : ValidationError {
     $message = $context->messages['validation']['exact_count_not_met'](
       $instruction->name,
diff --git a/src/errors/ValidationError.php b/src/Errors/ValidationError.php
similarity index 76%
rename from src/errors/ValidationError.php
rename to src/Errors/ValidationError.php
index c056514..8f136f5 100644
--- a/src/errors/ValidationError.php
+++ b/src/Errors/ValidationError.php
@@ -1,5 +1,5 @@
 <?php declare(strict_types=1);
 
-namespace Eno;
+namespace Eno\Errors;
 
 class ValidationError extends Error { }
diff --git a/src/Parser.php b/src/Parser.php
index 25a3ac7..94d82c1 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -2,7 +2,7 @@
 
 namespace Eno;
 use \OutOfRangeException;
-use Eno\Section;
+use Eno\Elements\Section;
 use Eno\Reporters\Reporter;
 
 require_once(__DIR__ . '/analyzer.php'); // TODO: Class (?)
@@ -12,10 +12,10 @@
 class Parser {
   public static function parse(string $input, array $options = []) : Section {
     $default_options = [
-      'locale' => 'en',
-      'reporter' => new Reporters\Text,
-      'source_label' => null,
-      'zero_indexing' => false
+        'locale' => 'en',
+        'reporter' => new Reporters\Text,
+        'source_label' => null,
+        'zero_indexing' => false
     ];
 
     $options = array_merge($default_options, $options);
diff --git a/src/reporters/HTML.php b/src/Reporters/HTML.php
similarity index 100%
rename from src/reporters/HTML.php
rename to src/Reporters/HTML.php
diff --git a/src/reporters/Reporter.php b/src/Reporters/Reporter.php
similarity index 100%
rename from src/reporters/Reporter.php
rename to src/Reporters/Reporter.php
diff --git a/src/reporters/Terminal.php b/src/Reporters/Terminal.php
similarity index 100%
rename from src/reporters/Terminal.php
rename to src/Reporters/Terminal.php
diff --git a/src/reporters/Text.php b/src/Reporters/Text.php
similarity index 100%
rename from src/reporters/Text.php
rename to src/Reporters/Text.php
diff --git a/src/analyzer.php b/src/analyzer.php
index de02450..3f1e361 100644
--- a/src/analyzer.php
+++ b/src/analyzer.php
@@ -75,11 +75,11 @@ function analyze(stdClass $context) : void {
       $last_continuable_instruction = $instruction;
       $last_name_instruction = $instruction;
 
-      if(array_key_exists('template', $instruction)) {
+      if(property_exists($instruction, 'template')) {
         $context->unresolved_instructions[] = $instruction;
       }
 
-      if(!array_key_exists('template', $instruction) || $instruction->name !== $instruction->template) {
+      if(!property_exists($instruction, 'template') || $instruction->name !== $instruction->template) {
         if(array_key_exists($instruction->name, $context->template_index)) {
           $context->template_index[$instruction->name][] = $instruction;
         } else {