#10 move tokens to the root namespace for discoverability. upgrade xunit versions. there is a bug with test discovery for stringtokenizertests

src/UglyToad.PdfPig.Tests/Filters/Ascii85FilterTests.cs

@@ -4,7 +4,7 @@
     using System.Collections.Generic;
     using System.Text;
     using PdfPig.Filters;
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
     using Xunit;
 
     public class Ascii85FilterTests

src/UglyToad.PdfPig.Tests/Filters/AsciiHexDecodeFilterTests.cs

@@ -4,7 +4,7 @@
     using System.Collections.Generic;
     using System.Text;
     using PdfPig.Filters;
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
     using Xunit;
 
     public class AsciiHexDecodeFilterTests

src/UglyToad.PdfPig.Tests/Filters/DecodeParameterResolverTests.cs

@@ -2,9 +2,8 @@
 {
     using System;
     using System.Collections.Generic;
-    using Parser.Parts;
     using PdfPig.Filters;
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
     using Xunit;
 
     public class DecodeParameterResolverTests

src/UglyToad.PdfPig.Tests/Filters/RunLengthFilterTests.cs

@@ -2,7 +2,7 @@
 {
     using System.Collections.Generic;
     using PdfPig.Filters;
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
     using Xunit;
 
     public class RunLengthFilterTests

src/UglyToad.PdfPig.Tests/Fonts/Cmap/CodespaceRangeTests.cs

@@ -3,7 +3,7 @@
     using System;
     using System.Linq;
     using PdfPig.Fonts.Cmap;
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
     using Xunit;
 
     public class CodespaceRangeTests

src/UglyToad.PdfPig.Tests/Fonts/Parser/Parts/BaseFontRangeParserTests.cs

@@ -2,7 +2,7 @@
 {
     using PdfPig.Fonts.Cmap;
     using PdfPig.Fonts.Parser.Parts;
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
     using Xunit;
 
     public class BaseFontRangeParserTests

src/UglyToad.PdfPig.Tests/Graphics/Operations/TextState/SetFontAndSizeTests.cs

@@ -2,7 +2,7 @@
 {
     using System;
     using PdfPig.Graphics.Operations.TextState;
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
     using Xunit;
 
     public class SetFontAndSizeTests

src/UglyToad.PdfPig.Tests/Graphics/TestOperationContext.cs

@@ -5,7 +5,7 @@
     using PdfPig.Fonts;
     using PdfPig.Graphics;
     using PdfPig.IO;
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
 
     internal class TestOperationContext : IOperationContext
     {

src/UglyToad.PdfPig.Tests/Integration/PdfParserTests.cs

@@ -7,7 +7,7 @@
     using System.Linq;
     using System.Text;
     using PdfPig.Filters;
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
     using Xunit;
 
     /*

src/UglyToad.PdfPig.Tests/Parser/PageContentParserTests.cs

@@ -8,7 +8,7 @@
     using PdfPig.Graphics.Operations.TextShowing;
     using PdfPig.Graphics.Operations.TextState;
     using PdfPig.Parser;
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
     using Xunit;
 
     public class PageContentParserTests

src/UglyToad.PdfPig.Tests/TestFilterProvider.cs

@@ -2,7 +2,7 @@
 {
     using System.Collections.Generic;
     using PdfPig.Filters;
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
 
     internal class TestFilterProvider : IFilterProvider
     {

src/UglyToad.PdfPig.Tests/TestObjectLocationProvider.cs

@@ -3,7 +3,7 @@
     using System.Collections.Generic;
     using PdfPig.ContentStream;
     using PdfPig.Tokenization.Scanner;
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
 
     internal class TestObjectLocationProvider : IObjectLocationProvider
     {

src/UglyToad.PdfPig.Tests/Tokenization/ArrayTokenizerTests.cs

@@ -2,7 +2,7 @@
 {
     using System.Collections.Generic;
     using PdfPig.Tokenization;
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
     using Xunit;
 
     public class ArrayTokenizerTests

src/UglyToad.PdfPig.Tests/Tokenization/CommentTokenizerTests.cs

@@ -1,7 +1,7 @@
 namespace UglyToad.PdfPig.Tests.Tokenization
 {
     using PdfPig.Tokenization;
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
     using Xunit;
 
     public class CommentTokenizerTests

src/UglyToad.PdfPig.Tests/Tokenization/DictionaryTokenizerTests.cs

@@ -5,7 +5,7 @@ namespace UglyToad.PdfPig.Tests.Tokenization
     using System.Collections.Generic;
     using PdfPig.ContentStream;
     using PdfPig.Tokenization;
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
     using Xunit;
 
     public class DictionaryTokenizerTests

src/UglyToad.PdfPig.Tests/Tokenization/EndOfLineTokenizerTests.cs

@@ -1,7 +1,7 @@
 namespace UglyToad.PdfPig.Tests.Tokenization
 {
     using PdfPig.Tokenization;
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
     using Xunit;
 
     public class EndOfLineTokenizerTests

src/UglyToad.PdfPig.Tests/Tokenization/HexTokenizerTests.cs

@@ -1,7 +1,7 @@
 namespace UglyToad.PdfPig.Tests.Tokenization
 {
     using PdfPig.Tokenization;
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
     using Xunit;
 
     public class HexTokenizerTests

src/UglyToad.PdfPig.Tests/Tokenization/NameTokenizerTests.cs

@@ -1,7 +1,7 @@
 namespace UglyToad.PdfPig.Tests.Tokenization
 {
     using PdfPig.Tokenization;
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
     using Xunit;
 
     public class NameTokenizerTests

src/UglyToad.PdfPig.Tests/Tokenization/NumericTokenizerTests.cs

@@ -2,7 +2,7 @@
 {
     using System.Collections.Generic;
     using PdfPig.Tokenization;
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
     using Xunit;
 
     public class NumericTokenizerTests

src/UglyToad.PdfPig.Tests/Tokenization/PlainTokenizerTests.cs

@@ -1,7 +1,7 @@
 namespace UglyToad.PdfPig.Tests.Tokenization
 {
     using PdfPig.Tokenization;
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
     using Xunit;
 
     public class PlainTokenizerTests

src/UglyToad.PdfPig.Tests/Tokenization/Scanner/CoreTokenScannerTests.cs

@@ -5,7 +5,7 @@ namespace UglyToad.PdfPig.Tests.Tokenization.Scanner
     using System.Collections.Generic;
     using PdfPig.IO;
     using PdfPig.Tokenization.Scanner;
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
     using Xunit;
 
     public class CoreTokenScannerTests

src/UglyToad.PdfPig.Tests/Tokenization/Scanner/PdfTokenScannerTests.cs

@@ -6,7 +6,7 @@
     using PdfPig.ContentStream;
     using PdfPig.IO;
     using PdfPig.Tokenization.Scanner;
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
     using PdfPig.Util;
     using Xunit;
 

src/UglyToad.PdfPig.Tests/Tokenization/StringTokenizerTests.cs

@@ -2,7 +2,7 @@
 {
     using PdfPig.IO;
     using PdfPig.Tokenization;
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
     using Xunit;
 
     public class StringTokenizerTests
@@ -29,11 +29,11 @@
         [InlineData(' ')]
         [InlineData('y')]
         [InlineData('^')]
-        public void DoesNotStartWithOpenBracket_ReturnsFalse(byte firstByte)
+        public void DoesNotStartWithOpenBracket_ReturnsFalse(char firstByte)
         {
-            var input = new ByteArrayInputBytes(new[] {firstByte});
+            var input = new ByteArrayInputBytes(new[] {(byte)firstByte});
 
-            var result = tokenizer.TryTokenize(firstByte, input, out var token);
+            var result = tokenizer.TryTokenize((byte)firstByte, input, out var token);
 
             Assert.False(result);
             Assert.Null(token);

src/UglyToad.PdfPig.Tests/Tokens/ArrayTokenTests.cs

@@ -1,7 +1,7 @@
-namespace UglyToad.PdfPig.Tests.Tokenization.Tokens
+namespace UglyToad.PdfPig.Tests.Tokens
 {
     using System;
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
     using Xunit;
 
     public class ArrayTokenTests

src/UglyToad.PdfPig.Tests/Tokens/DictionaryTokenTests.cs

@@ -1,9 +1,9 @@
 // ReSharper disable ObjectCreationAsStatement
-namespace UglyToad.PdfPig.Tests.Tokenization.Tokens
+namespace UglyToad.PdfPig.Tests.Tokens
 {
     using System;
     using System.Collections.Generic;
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
     using Xunit;
 
     public class DictionaryTokenTests

src/UglyToad.PdfPig.Tests/Tokens/HexTokenTests.cs

@@ -1,6 +1,6 @@
-namespace UglyToad.PdfPig.Tests.Tokenization.Tokens
+namespace UglyToad.PdfPig.Tests.Tokens
 {
-    using PdfPig.Tokenization.Tokens;
+    using PdfPig.Tokens;
     using Xunit;
 
     public class HexTokenTests

src/UglyToad.PdfPig.Tests/UglyToad.PdfPig.Tests.csproj

@@ -48,9 +48,12 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="System.Drawing.Common" Version="4.5.0-preview2-26406-04" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.extensibility.execution" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

src/UglyToad.PdfPig/Content/Catalog.cs

@@ -1,7 +1,7 @@
 namespace UglyToad.PdfPig.Content
 {
     using System;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class Catalog
     {

src/UglyToad.PdfPig/Content/IPageFactory.cs

@@ -1,6 +1,6 @@
 namespace UglyToad.PdfPig.Content
 {
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal interface IPageFactory
     {

src/UglyToad.PdfPig/Content/IResourceStore.cs

@@ -1,7 +1,7 @@
 namespace UglyToad.PdfPig.Content
 {
     using Fonts;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal interface IResourceStore
     {

src/UglyToad.PdfPig/Content/Pages.cs

@@ -6,7 +6,7 @@
     using Logging;
     using Parser.Parts;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
     using Util;
 
     internal class Pages

src/UglyToad.PdfPig/Content/ResourceContainer.cs

@@ -6,7 +6,7 @@
     using Fonts;
     using Parser.Parts;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class ResourceContainer : IResourceStore
     {

src/UglyToad.PdfPig/Cos/CrossReferenceTable.cs

@@ -3,7 +3,7 @@
     using System;
     using System.Collections.Generic;
     using ContentStream;
-    using Tokenization.Tokens;
+    using Tokens;
     using Util.JetBrains.Annotations;
 
     internal class CrossReferenceTable

src/UglyToad.PdfPig/Cos/CrossReferenceTableBuilder.cs

@@ -5,7 +5,7 @@
     using System.Linq;
     using ContentStream;
     using Logging;
-    using Tokenization.Tokens;
+    using Tokens;
 
     /// <summary>
     /// 

src/UglyToad.PdfPig/Cos/CrossReferenceTablePart.cs

@@ -2,7 +2,7 @@
 {
     using System.Collections.Generic;
     using ContentStream;
-    using Tokenization.Tokens;
+    using Tokens;
 
     /// <summary>
     /// 

src/UglyToad.PdfPig/Cos/CrossReferenceTablePartBuilder.cs

@@ -2,7 +2,7 @@
 {
     using System.Collections.Generic;
     using ContentStream;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class CrossReferenceTablePartBuilder
     {

src/UglyToad.PdfPig/Filters/Ascii85Filter.cs

@@ -2,7 +2,7 @@
 {
     using System;
     using System.IO;
-    using Tokenization.Tokens;
+    using Tokens;
 
     /// <summary>
     /// ASCII 85 (Base85) is a binary to text encoding using 5 ASCII characters per 4 bytes of data.

src/UglyToad.PdfPig/Filters/AsciiHexDecodeFilter.cs

@@ -2,7 +2,7 @@
 {
     using System;
     using System.IO;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class AsciiHexDecodeFilter : IFilter
     {

src/UglyToad.PdfPig/Filters/DctDecodeFilter.cs

@@ -1,7 +1,7 @@
 namespace UglyToad.PdfPig.Filters
 {
     using System;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class DctDecodeFilter : IFilter
     {

src/UglyToad.PdfPig/Filters/DecodeParameterResolver.cs

@@ -3,7 +3,7 @@
     using System;
     using System.Collections.Generic;
     using Logging;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class DecodeParameterResolver : IDecodeParameterResolver
     {

src/UglyToad.PdfPig/Filters/FlateFilter.cs

@@ -5,7 +5,7 @@
     using System.IO;
     using System.IO.Compression;
     using Logging;
-    using Tokenization.Tokens;
+    using Tokens;
     using Util;
 
     /// <summary>

src/UglyToad.PdfPig/Filters/IDecodeParameterResolver.cs

@@ -1,6 +1,6 @@
 namespace UglyToad.PdfPig.Filters
 {
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal interface IDecodeParameterResolver
     {

src/UglyToad.PdfPig/Filters/IFilter.cs

@@ -1,6 +1,6 @@
 namespace UglyToad.PdfPig.Filters
 {
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal interface IFilter
     {

src/UglyToad.PdfPig/Filters/IFilterProvider.cs

@@ -1,7 +1,7 @@
 namespace UglyToad.PdfPig.Filters
 {
     using System.Collections.Generic;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal interface IFilterProvider
     {

src/UglyToad.PdfPig/Filters/MemoryFilterProvider.cs

@@ -5,7 +5,7 @@
     using System.Linq;
     using Exceptions;
     using Logging;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class MemoryFilterProvider : IFilterProvider
     {

src/UglyToad.PdfPig/Filters/RunLengthFilter.cs

@@ -1,7 +1,7 @@
 namespace UglyToad.PdfPig.Filters
 {
     using System.IO;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class RunLengthFilter : IFilter
     {

src/UglyToad.PdfPig/Fonts/CidFonts/ICidFont.cs

@@ -2,7 +2,7 @@
 {
     using Core;
     using Geometry;
-    using Tokenization.Tokens;
+    using Tokens;
 
     /// <summary>
     /// A CID font contains glyph descriptions accessed by 

src/UglyToad.PdfPig/Fonts/CidFonts/Type0CidFont.cs

@@ -2,7 +2,7 @@
 {
     using Core;
     using Geometry;
-    using Tokenization.Tokens;
+    using Tokens;
 
     /// <inheritdoc/>
     /// <summary>

src/UglyToad.PdfPig/Fonts/CidFonts/Type2CidFont.cs

@@ -3,7 +3,7 @@
     using System.Collections.Generic;
     using Core;
     using Geometry;
-    using Tokenization.Tokens;
+    using Tokens;
 
     /// <inheritdoc />
     /// <summary>

src/UglyToad.PdfPig/Fonts/Composite/Type0Font.cs

@@ -6,7 +6,7 @@
     using Core;
     using Geometry;
     using IO;
-    using Tokenization.Tokens;
+    using Tokens;
     using Util.JetBrains.Annotations;
 
     /// <summary>

src/UglyToad.PdfPig/Fonts/DescriptorFontFile.cs

@@ -1,6 +1,6 @@
 namespace UglyToad.PdfPig.Fonts
 {
-    using Tokenization.Tokens;
+    using Tokens;
 
     /// <summary>
     /// The bytes of the stream containing the font program.

src/UglyToad.PdfPig/Fonts/Encodings/Encoding.cs

@@ -2,7 +2,7 @@
 {
     using System;
     using System.Collections.Generic;
-    using Tokenization.Tokens;
+    using Tokens;
 
     /// <summary>
     /// Maps character codes to glyph names from a PostScript encoding.

src/UglyToad.PdfPig/Fonts/FontDescriptor.cs

@@ -1,7 +1,7 @@
 namespace UglyToad.PdfPig.Fonts
 {
     using Geometry;
-    using Tokenization.Tokens;
+    using Tokens;
     using Util.JetBrains.Annotations;
 
     /// <summary>

src/UglyToad.PdfPig/Fonts/FontFactory.cs

@@ -5,7 +5,7 @@
     using Exceptions;
     using Logging;
     using Parser.Handlers;
-    using Tokenization.Tokens;
+    using Tokens;
     using Util;
 
     internal class FontFactory : IFontFactory

src/UglyToad.PdfPig/Fonts/FontStretchExtensions.cs

@@ -1,6 +1,6 @@
 namespace UglyToad.PdfPig.Fonts
 {
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal static class FontStretchExtensions
     {

src/UglyToad.PdfPig/Fonts/IFont.cs

@@ -3,7 +3,7 @@
     using Core;
     using Geometry;
     using IO;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal interface IFont
     {

src/UglyToad.PdfPig/Fonts/IFontFactory.cs

@@ -1,6 +1,6 @@
 namespace UglyToad.PdfPig.Fonts
 {
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal interface IFontFactory
     {

src/UglyToad.PdfPig/Fonts/Parser/CMapParser.cs

@@ -7,7 +7,7 @@
     using IO;
     using Parts;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class CMapParser
     {

src/UglyToad.PdfPig/Fonts/Parser/EncodingReader.cs

@@ -5,7 +5,7 @@
     using Exceptions;
     using PdfPig.Parser.Parts;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
     using Util;
 
     internal class EncodingReader : IEncodingReader

src/UglyToad.PdfPig/Fonts/Parser/FontDictionaryAccessHelper.cs

@@ -4,7 +4,7 @@
     using Parts;
     using PdfPig.Parser.Parts;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal static class FontDictionaryAccessHelper
     {

src/UglyToad.PdfPig/Fonts/Parser/Handlers/IFontHandler.cs

@@ -1,6 +1,6 @@
 namespace UglyToad.PdfPig.Fonts.Parser.Handlers
 {
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal interface IFontHandler
     {

src/UglyToad.PdfPig/Fonts/Parser/Handlers/TrueTypeFontHandler.cs

@@ -11,7 +11,7 @@
     using PdfPig.Parser.Parts;
     using Simple;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
     using TrueType;
     using TrueType.Parser;
 

src/UglyToad.PdfPig/Fonts/Parser/Handlers/Type0FontHandler.cs

@@ -10,7 +10,7 @@
     using Parts;
     using PdfPig.Parser.Parts;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
     using Util;
 
     internal class Type0FontHandler : IFontHandler

src/UglyToad.PdfPig/Fonts/Parser/Handlers/Type1FontHandler.cs

@@ -11,7 +11,7 @@
     using PdfPig.Parser.Parts;
     using Simple;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
     using Type1;
     using Type1.Parser;
 

src/UglyToad.PdfPig/Fonts/Parser/Handlers/Type3FontHandler.cs

@@ -10,7 +10,7 @@
     using PdfPig.Parser.Parts;
     using Simple;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
     using Util;
 
     internal class Type3FontHandler : IFontHandler

src/UglyToad.PdfPig/Fonts/Parser/IEncodingReader.cs

@@ -1,7 +1,7 @@
 namespace UglyToad.PdfPig.Fonts.Parser
 {
     using Encodings;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal interface IEncodingReader
     {

src/UglyToad.PdfPig/Fonts/Parser/Parts/BaseFontCharacterParser.cs

@@ -3,7 +3,7 @@
     using System;
     using Cmap;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class BaseFontCharacterParser : ICidFontPartParser<NumericToken>
     {

src/UglyToad.PdfPig/Fonts/Parser/Parts/BaseFontRangeParser.cs

@@ -6,7 +6,7 @@
     using Cmap;
     using Exceptions;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
 
     /// <summary>
     /// The beginbfrange and endbfrange operators map i ranges of input codes to the corresponding output code range.

src/UglyToad.PdfPig/Fonts/Parser/Parts/CidCharacterParser.cs

@@ -4,7 +4,7 @@
     using System.Collections.Generic;
     using Cmap;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class CidCharacterParser : ICidFontPartParser<NumericToken>
     {

src/UglyToad.PdfPig/Fonts/Parser/Parts/CidFontFactory.cs

@@ -9,7 +9,7 @@
     using IO;
     using PdfPig.Parser.Parts;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
     using TrueType;
     using TrueType.Parser;
     using Util;

src/UglyToad.PdfPig/Fonts/Parser/Parts/CidFontNameParser.cs

@@ -4,7 +4,7 @@
     using System.Globalization;
     using Cmap;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class CidFontNameParser : ICidFontPartParser<NameToken>
     {

src/UglyToad.PdfPig/Fonts/Parser/Parts/CidRangeParser.cs

@@ -3,7 +3,7 @@
     using Cmap;
     using Exceptions;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class CidRangeParser : ICidFontPartParser<NumericToken>
     {

src/UglyToad.PdfPig/Fonts/Parser/Parts/CodespaceRangeParser.cs

@@ -4,7 +4,7 @@
     using System.Collections.Generic;
     using Cmap;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class CodespaceRangeParser : ICidFontPartParser<NumericToken>
     {

src/UglyToad.PdfPig/Fonts/Parser/Parts/FontDescriptorFactory.cs

@@ -4,7 +4,7 @@
     using Geometry;
     using PdfPig.Parser.Parts;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
     using Util;
     using Util.JetBrains.Annotations;
 

src/UglyToad.PdfPig/Fonts/Simple/TrueTypeSimpleFont.cs

@@ -6,7 +6,7 @@
     using Encodings;
     using Geometry;
     using IO;
-    using Tokenization.Tokens;
+    using Tokens;
     using TrueType;
     using Util.JetBrains.Annotations;
 

src/UglyToad.PdfPig/Fonts/Simple/Type1FontSimple.cs

@@ -6,7 +6,7 @@
     using Encodings;
     using Geometry;
     using IO;
-    using Tokenization.Tokens;
+    using Tokens;
     using Type1;
 
     /// <summary>

src/UglyToad.PdfPig/Fonts/Simple/Type1Standard14Font.cs

@@ -5,7 +5,7 @@
     using Encodings;
     using Geometry;
     using IO;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class Type1Standard14Font: IFont
     {

src/UglyToad.PdfPig/Fonts/Simple/Type3Font.cs

@@ -7,7 +7,7 @@
     using Exceptions;
     using Geometry;
     using IO;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class Type3Font : IFont
     {

src/UglyToad.PdfPig/Fonts/Type1/Parser/Type1EncryptedPortionParser.cs

@@ -6,7 +6,7 @@
     using CharStrings;
     using IO;
     using PdfPig.Parser.Parts;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class Type1EncryptedPortionParser
     {

src/UglyToad.PdfPig/Fonts/Type1/Parser/Type1FontParser.cs

@@ -7,7 +7,7 @@
     using IO;
     using Tokenization;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class Type1FontParser
     {

src/UglyToad.PdfPig/Fonts/Type1/Type1FontProgram.cs

@@ -5,7 +5,7 @@
     using System.Diagnostics;
     using CharStrings;
     using Geometry;
-    using Tokenization.Tokens;
+    using Tokens;
     using Util.JetBrains.Annotations;
 
     /// <summary>

src/UglyToad.PdfPig/Graphics/ContentStreamProcessor.cs

@@ -10,7 +10,7 @@
     using Operations;
     using PdfPig.Core;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
     using Util;
     using XObject;
 

src/UglyToad.PdfPig/Graphics/CurrentFontState.cs

@@ -3,7 +3,7 @@ namespace UglyToad.PdfPig.Graphics
 {
     using Core;
     using PdfPig.Core;
-    using Tokenization.Tokens;
+    using Tokens;
 
     /// <summary>
     /// The current state of text related parameters for a content stream.

src/UglyToad.PdfPig/Graphics/IGraphicsStateOperationFactory.cs

@@ -2,7 +2,7 @@
 {
     using System.Collections.Generic;
     using Operations;
-    using Tokenization.Tokens;
+    using Tokens;
     using Util.JetBrains.Annotations;
 
     internal interface IGraphicsStateOperationFactory

src/UglyToad.PdfPig/Graphics/IOperationContext.cs

@@ -2,7 +2,7 @@
 {
     using System.Collections.Generic;
     using IO;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal interface IOperationContext
     {

src/UglyToad.PdfPig/Graphics/Operations/InvokeNamedXObject.cs

@@ -1,7 +1,7 @@
 namespace UglyToad.PdfPig.Graphics.Operations
 {
     using Content;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class InvokeNamedXObject : IGraphicsStateOperation
     {

src/UglyToad.PdfPig/Graphics/Operations/TextShowing/ShowTextsWithPositioning.cs

@@ -3,7 +3,7 @@
     using System;
     using System.Collections.Generic;
     using Content;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class ShowTextsWithPositioning : IGraphicsStateOperation
     {

src/UglyToad.PdfPig/Graphics/Operations/TextState/SetFontAndSize.cs

@@ -2,7 +2,7 @@
 {
     using System;
     using Content;
-    using Tokenization.Tokens;
+    using Tokens;
     using Util.JetBrains.Annotations;
 
     internal class SetFontAndSize : IGraphicsStateOperation

src/UglyToad.PdfPig/Graphics/ReflectionGraphicsStateOperationFactory.cs

@@ -9,7 +9,7 @@ namespace UglyToad.PdfPig.Graphics
     using Operations;
     using Operations.TextShowing;
     using Operations.TextState;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class ReflectionGraphicsStateOperationFactory : IGraphicsStateOperationFactory
     {

src/UglyToad.PdfPig/Graphics/XObjectContentRecord.cs

@@ -2,7 +2,7 @@
 {
     using System;
     using PdfPig.Core;
-    using Tokenization.Tokens;
+    using Tokens;
     using Util.JetBrains.Annotations;
     using XObject;
 

src/UglyToad.PdfPig/Parser/CatalogFactory.cs

@@ -5,7 +5,7 @@
     using Exceptions;
     using Parts;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class CatalogFactory
     {

src/UglyToad.PdfPig/Parser/DocumentInformationFactory.cs

@@ -4,7 +4,7 @@
     using IO;
     using Parts;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class DocumentInformationFactory
     {

src/UglyToad.PdfPig/Parser/FileStructure/CrossReferenceParser.cs

@@ -8,7 +8,7 @@
     using Logging;
     using Parts.CrossReference;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class CrossReferenceParser
     {

src/UglyToad.PdfPig/Parser/FileStructure/CrossReferenceTableParser.cs

@@ -7,7 +7,7 @@
     using Parts.CrossReference;
     using Tokenization;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class CrossReferenceTableParser
     {

src/UglyToad.PdfPig/Parser/FileStructure/FileHeaderParser.cs

@@ -6,7 +6,7 @@
     using Exceptions;
     using Logging;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
     using Util.JetBrains.Annotations;
 
     /// <summary>

src/UglyToad.PdfPig/Parser/FileStructure/FileTrailerParser.cs

@@ -5,7 +5,7 @@
     using Exceptions;
     using IO;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
 
     /*
      * The trailer of a PDF file allows us to quickly find the cross-reference table and other special objects. 

src/UglyToad.PdfPig/Parser/FileStructure/XrefOffsetValidator.cs

@@ -6,7 +6,7 @@
     using Logging;
     using Parts;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class XrefOffsetValidator
     {

src/UglyToad.PdfPig/Parser/PageContentParser.cs

@@ -5,7 +5,7 @@
     using Graphics.Operations;
     using IO;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
 
     internal class PageContentParser : IPageContentParser
     {

src/UglyToad.PdfPig/Parser/PageFactory.cs

@@ -10,7 +10,7 @@
     using IO;
     using Parts;
     using Tokenization.Scanner;
-    using Tokenization.Tokens;
+    using Tokens;
     using Util;
     using XObject;
 

src/UglyToad.PdfPig/Parser/Parts/CrossReference/CrossReferenceStreamFieldSize.cs

@@ -2,7 +2,7 @@
 {
     using System;
     using Exceptions;
-    using Tokenization.Tokens;
+    using Tokens;
     using Util;
 
     /// <summary>