diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0712a7..dc606ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.0-dev
+
+- Refactor the package to strictly follow the `Converter<S, T>` interface established in `dart:convert` and clean up the API as a result.
+
 ## 0.1.0
 
 - Initial version.
diff --git a/README.md b/README.md
index 7f7e158..d2fc3d2 100644
--- a/README.md
+++ b/README.md
@@ -23,11 +23,11 @@ with the prefix `xn--`.
 
 * **RFC 3492 Compliant:** Implements the Punycode encoding and decoding
     algorithms as specified in the standard.
-* **IDNA Helpers:** Provides convenient methods (`toAscii`, `toUnicode`) for
-    converting full domain names or email addresses, automatically handling
-    the `xn--` prefix and processing only the necessary parts of the string.
-* **Core Codec:** Offers direct access to the raw Punycode `encode` and `decode`
-    operations via `PunycodeCodec` for advanced use cases.
+* **IDNA Friendly:** Provides convenient ways of converting full domain names or 
+    email addresses, automatically handling the `xn--` prefix and processing 
+    only the necessary parts of the string.
+* **Idiomatic Dart:** This package implements the `Converter<S, T>` interface 
+    defined in `dart:convert` to make working with Punycode easy and familiar.
 * **Efficient and Tested:** Based on a port of the well-regarded Punycode.js
     library, including tests based on official RFC examples.
 
@@ -54,41 +54,27 @@ The easiest way to handle domain names or emails is using the singleton
 import 'package:punycoder/punycoder.dart';
 
 void main() {
-  // Use the singleton encoder/decoder for common IDNA tasks
-  const encoder = punycodeEncoder;
-  const decoder = punycodeDecoder;
-
-  // --- Convert domains/emails TO ASCII (ACE format) ---
-  final domainsToEncode = ['bücher.example', 'example.com', '你好.test'];
-  print('Encoding to ASCII:');
-  for (final domain in domainsToEncode) {
-    final asciiVersion = encoder.toAscii(domain);
-    // toAscii adds 'xn--' prefix only if encoding actually happens
-    print('"$domain"  ->  "$asciiVersion"');
-    // Output:
-    // "bücher.example"  ->  "xn--bcher-kva.example"
-    // "example.com"  ->  "example.com"
-    // "你好.test"  ->  "xn--6qq79v.test"
-  }
-
-  // --- Convert domains/emails FROM ASCII (ACE format) ---
-  final domainsToDecode = ['xn--bcher-kva.example', 'example.com', 'xn--6qq79v.test'];
-   print('Decoding from ASCII:');
-  for (final domain in domainsToDecode) {
-    final unicodeVersion = decoder.toUnicode(domain);
-    // toUnicode decodes labels starting with 'xn--'
-    print('"$domain"  ->  "$unicodeVersion"');
-    // Output:
-    // "xn--bcher-kva.example"  ->  "bücher.example"
-    // "example.com"  ->  "example.com"
-    // "xn--6qq79v.test"  ->  "你好.test"
-  }
-
-  // --- Raw Encoding/Decoding (Advanced) ---
-  // For direct encoding/decoding without automatic prefix handling or domain splitting:
-  final codec = PunycodeCodec();
-  final rawEncoded = codec.encode('bücher'); // -> 'bcher-kva' (no prefix)
-  final rawDecoded = codec.decode('bcher-kva'); // -> 'bücher'
-  print('\nRaw codec example: "$rawDecoded"');
+  // Designed to be used with domains and emails which have special rules
+  const domainCodec = PunycodeCodec();
+  // Designed to work with simple strings
+  const simpleCodec = PunycodeCodec.simple();
+
+  final encodedString = simpleCodec.encode('münchen');
+  final encodedDomain = domainCodec.encode('münchen.com');
+  final encodedEmail = domainCodec.encode('münchen@münchen.com');
+
+  stdout.writeln(encodedString); // Output: mnchen-3ya
+  // Uses the correct prefix for the domain
+  stdout.writeln(encodedDomain); // Output: xn--mnchen-3ya.com
+  // Only the domain should be encoded
+  stdout.writeln(encodedEmail); // Output: münchen@xn--mnchen-3ya.com
+
+  final decodedString = simpleCodec.decode('mnchen-3ya');
+  final decodecDomain = domainCodec.decode('xn--mnchen-3ya.com');
+  final decodedEmail = domainCodec.decode('münchen@xn--mnchen-3ya.com');
+
+  stdout.writeln(decodedString); // Output: münchen
+  stdout.writeln(decodecDomain); // Output: münchen.com
+  stdout.writeln(decodedEmail); // Output: münchen@münchen.com
 }
 ```
\ No newline at end of file
diff --git a/doc/api/__404error.html b/doc/api/__404error.html
index a0fdf29..ca7d993 100644
--- a/doc/api/__404error.html
+++ b/doc/api/__404error.html
@@ -76,7 +76,7 @@ <h5><span class="package-name">punycoder</span> <span class="package-kind">packa
 <footer>
   <span class="no-break">
     punycoder
-      0.1.0-dev
+      0.1.0
   </span>
   
 </footer>
diff --git a/doc/api/index.html b/doc/api/index.html
index 974022e..e30c334 100644
--- a/doc/api/index.html
+++ b/doc/api/index.html
@@ -44,7 +44,8 @@
       
 <section class="desc markdown">
   <p><a href="https://pub.dev/packages/punycoder"><img src="https://img.shields.io/pub/v/punycoder.svg" alt="pub package"></a>
-<a href="https://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/License-MIT-green.svg" alt="License: MIT"></a></p>
+<a href="https://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/License-MIT-green.svg" alt="License: MIT"></a>
+<a href="https://studio.firebase.google.com/import?url=https%3A%2F%2Fgithub.com%2Fdropbear-software%2Fpunycoder"><img src="https://cdn.firebasestudio.dev/btn/open_light_20.svg" alt="Open in Firebase Studio"></a></p>
 <h1 id="punycoder">Punycoder</h1>
 <p>A Dart implementation of the Punycode (RFC 3492) encoding algorithm used for
 Internationalized Domain Names in Applications (IDNA).</p>
@@ -63,11 +64,11 @@ <h2 id="features">Features</h2>
 <ul>
 <li><strong>RFC 3492 Compliant:</strong> Implements the Punycode encoding and decoding
   algorithms as specified in the standard.</li>
-<li><strong>IDNA Helpers:</strong> Provides convenient methods (<code>toAscii</code>, <code>toUnicode</code>) for
-  converting full domain names or email addresses, automatically handling
-  the <code>xn--</code> prefix and processing only the necessary parts of the string.</li>
-<li><strong>Core Codec:</strong> Offers direct access to the raw Punycode <code>encode</code> and <code>decode</code>
-  operations via <code>PunycodeCodec</code> for advanced use cases.</li>
+<li><strong>IDNA Friendly:</strong> Provides convenient ways of converting full domain names or
+  email addresses, automatically handling the <code>xn--</code> prefix and processing
+  only the necessary parts of the string.</li>
+<li><strong>Idiomatic Dart:</strong> This package implements the <code>Converter&lt;S, T&gt;</code> interface
+  defined in <code>dart:convert</code> to make working with Punycode easy and familiar.</li>
 <li><strong>Efficient and Tested:</strong> Based on a port of the well-regarded Punycode.js
   library, including tests based on official RFC examples.</li>
 </ul>
@@ -85,42 +86,28 @@ <h2 id="usage">Usage</h2>
 <pre class="language-dart"><code class="language-dart">import 'package:punycoder/punycoder.dart';
 
 void main() {
-  // Use the singleton encoder/decoder for common IDNA tasks
-  const encoder = punycodeEncoder;
-  const decoder = punycodeDecoder;
-
-  // --- Convert domains/emails TO ASCII (ACE format) ---
-  final domainsToEncode = ['bücher.example', 'example.com', '你好.test'];
-  print('Encoding to ASCII:');
-  for (final domain in domainsToEncode) {
-    final asciiVersion = encoder.toAscii(domain);
-    // toAscii adds 'xn--' prefix only if encoding actually happens
-    print('"$domain"  -&gt;  "$asciiVersion"');
-    // Output:
-    // "bücher.example"  -&gt;  "xn--bcher-kva.example"
-    // "example.com"  -&gt;  "example.com"
-    // "你好.test"  -&gt;  "xn--6qq79v.test"
-  }
-
-  // --- Convert domains/emails FROM ASCII (ACE format) ---
-  final domainsToDecode = ['xn--bcher-kva.example', 'example.com', 'xn--6qq79v.test'];
-   print('Decoding from ASCII:');
-  for (final domain in domainsToDecode) {
-    final unicodeVersion = decoder.toUnicode(domain);
-    // toUnicode decodes labels starting with 'xn--'
-    print('"$domain"  -&gt;  "$unicodeVersion"');
-    // Output:
-    // "xn--bcher-kva.example"  -&gt;  "bücher.example"
-    // "example.com"  -&gt;  "example.com"
-    // "xn--6qq79v.test"  -&gt;  "你好.test"
-  }
-
-  // --- Raw Encoding/Decoding (Advanced) ---
-  // For direct encoding/decoding without automatic prefix handling or domain splitting:
-  final codec = PunycodeCodec();
-  final rawEncoded = codec.encode('bücher'); // -&gt; 'bcher-kva' (no prefix)
-  final rawDecoded = codec.decode('bcher-kva'); // -&gt; 'bücher'
-  print('\nRaw codec example: "$rawDecoded"');
+  // Designed to be used with domains and emails which have special rules
+  const domainCodec = PunycodeCodec();
+  // Designed to work with simple strings
+  const simpleCodec = PunycodeCodec.simple();
+
+  final encodedString = simpleCodec.encode('münchen');
+  final encodedDomain = domainCodec.encode('münchen.com');
+  final encodedEmail = domainCodec.encode('münchen@münchen.com');
+
+  stdout.writeln(encodedString); // Output: mnchen-3ya
+  // Uses the correct prefix for the domain
+  stdout.writeln(encodedDomain); // Output: xn--mnchen-3ya.com
+  // Only the domain should be encoded
+  stdout.writeln(encodedEmail); // Output: münchen@xn--mnchen-3ya.com
+
+  final decodedString = simpleCodec.decode('mnchen-3ya');
+  final decodecDomain = domainCodec.decode('xn--mnchen-3ya.com');
+  final decodedEmail = domainCodec.decode('münchen@xn--mnchen-3ya.com');
+
+  stdout.writeln(decodedString); // Output: münchen
+  stdout.writeln(decodecDomain); // Output: münchen.com
+  stdout.writeln(decodedEmail); // Output: münchen@münchen.com
 }
 </code></pre>
 </section>
@@ -164,7 +151,7 @@ <h5 class="hidden-xs"><span class="package-name">punycoder</span> <span class="p
 <footer>
   <span class="no-break">
     punycoder
-      0.1.0-dev
+      0.1.0
   </span>
   
 </footer>
diff --git a/doc/api/index.json b/doc/api/index.json
index c465fc6..50deb4b 100644
--- a/doc/api/index.json
+++ b/doc/api/index.json
@@ -1 +1 @@
-[{"name":"punycoder","qualifiedName":"punycoder","href":"punycoder/","kind":9,"packageRank":0,"desc":"Provides a Dart implementation of the Punycode encoding algorithm\nspecified in RFC 3492."},{"name":"PunycodeCodec","qualifiedName":"punycoder.PunycodeCodec","href":"punycoder/PunycodeCodec-class.html","kind":3,"packageRank":0,"desc":"A codec for encoding and decoding strings using the Punycode algorithm.","enclosedBy":{"name":"punycoder","kind":9,"href":"punycoder/"}},{"name":"PunycodeCodec.new","qualifiedName":"punycoder.PunycodeCodec.PunycodeCodec.new","href":"punycoder/PunycodeCodec/PunycodeCodec.html","kind":2,"packageRank":0,"desc":"Creates a new instance of the Punycode codec.","enclosedBy":{"name":"PunycodeCodec","kind":3,"href":"punycoder/PunycodeCodec-class.html"}},{"name":"decoder","qualifiedName":"punycoder.PunycodeCodec.decoder","href":"punycoder/PunycodeCodec/decoder.html","kind":16,"overriddenDepth":0,"packageRank":0,"desc":"Returns the decoder of this, converting from T to S.","enclosedBy":{"name":"PunycodeCodec","kind":3,"href":"punycoder/PunycodeCodec-class.html"}},{"name":"encoder","qualifiedName":"punycoder.PunycodeCodec.encoder","href":"punycoder/PunycodeCodec/encoder.html","kind":16,"overriddenDepth":0,"packageRank":0,"desc":"Returns the encoder from S to T.","enclosedBy":{"name":"PunycodeCodec","kind":3,"href":"punycoder/PunycodeCodec-class.html"}},{"name":"PunycodeDecoder","qualifiedName":"punycoder.PunycodeDecoder","href":"punycoder/PunycodeDecoder-class.html","kind":3,"packageRank":0,"desc":"Converts a Punycode string of ASCII-only symbols to a string of\nUnicode symbols.","enclosedBy":{"name":"punycoder","kind":9,"href":"punycoder/"}},{"name":"convert","qualifiedName":"punycoder.PunycodeDecoder.convert","href":"punycoder/PunycodeDecoder/convert.html","kind":10,"overriddenDepth":1,"packageRank":0,"desc":"Converts input and returns the result of the conversion.","enclosedBy":{"name":"PunycodeDecoder","kind":3,"href":"punycoder/PunycodeDecoder-class.html"}},{"name":"toUnicode","qualifiedName":"punycoder.PunycodeDecoder.toUnicode","href":"punycoder/PunycodeDecoder/toUnicode.html","kind":10,"overriddenDepth":0,"packageRank":0,"desc":"Converts a Punycode string representing a domain name or an email address\nto Unicode. Only the Punycoded parts of the input will be converted, i.e.\nit doesn't matter if you call it on a string that has already been\nconverted to Unicode.","enclosedBy":{"name":"PunycodeDecoder","kind":3,"href":"punycoder/PunycodeDecoder-class.html"}},{"name":"PunycodeEncoder","qualifiedName":"punycoder.PunycodeEncoder","href":"punycoder/PunycodeEncoder-class.html","kind":3,"packageRank":0,"desc":"Converts a string of Unicode symbols (e.g. a domain name label) to a\nPunycode string of ASCII-only symbols.","enclosedBy":{"name":"punycoder","kind":9,"href":"punycoder/"}},{"name":"convert","qualifiedName":"punycoder.PunycodeEncoder.convert","href":"punycoder/PunycodeEncoder/convert.html","kind":10,"overriddenDepth":1,"packageRank":0,"desc":"Converts input and returns the result of the conversion.","enclosedBy":{"name":"PunycodeEncoder","kind":3,"href":"punycoder/PunycodeEncoder-class.html"}},{"name":"toAscii","qualifiedName":"punycoder.PunycodeEncoder.toAscii","href":"punycoder/PunycodeEncoder/toAscii.html","kind":10,"overriddenDepth":0,"packageRank":0,"desc":"Converts a Unicode string representing a domain name or an email address\nto Punycode. Only the non-ASCII parts of the domain name will be\nconverted, i.e. it doesn't matter if you call it with a domain that's\nalready in ASCII","enclosedBy":{"name":"PunycodeEncoder","kind":3,"href":"punycoder/PunycodeEncoder-class.html"}},{"name":"punycodeDecoder","qualifiedName":"punycoder.punycodeDecoder","href":"punycoder/punycodeDecoder-constant.html","kind":19,"packageRank":0,"desc":"The canonical version of the Punycode Decoder","enclosedBy":{"name":"punycoder","kind":9,"href":"punycoder/"}},{"name":"punycodeEncoder","qualifiedName":"punycoder.punycodeEncoder","href":"punycoder/punycodeEncoder-constant.html","kind":19,"packageRank":0,"desc":"The canonical version of the Punycode Encoder","enclosedBy":{"name":"punycoder","kind":9,"href":"punycoder/"}}]
+[{"name":"punycoder","qualifiedName":"punycoder","href":"punycoder/","kind":9,"packageRank":0,"desc":"Provides a Dart implementation of the Punycode encoding algorithm\nspecified in RFC 3492."},{"name":"PunycodeCodec","qualifiedName":"punycoder.PunycodeCodec","href":"punycoder/PunycodeCodec-class.html","kind":3,"packageRank":0,"desc":"A codec for encoding and decoding strings using the Punycode algorithm.","enclosedBy":{"name":"punycoder","kind":9,"href":"punycoder/"}},{"name":"PunycodeCodec.new","qualifiedName":"punycoder.PunycodeCodec.PunycodeCodec.new","href":"punycoder/PunycodeCodec/PunycodeCodec.html","kind":2,"packageRank":0,"desc":"Creates a new instance of the Punycode codec designed\nfor working with domains and email addresses where\nadditional rules apply about how it is converted","enclosedBy":{"name":"PunycodeCodec","kind":3,"href":"punycoder/PunycodeCodec-class.html"}},{"name":"PunycodeCodec.simple","qualifiedName":"punycoder.PunycodeCodec.PunycodeCodec.simple","href":"punycoder/PunycodeCodec/PunycodeCodec.simple.html","kind":2,"packageRank":0,"desc":"Creates a new instance of the Punycode codec just designed\nfor working with simple strings","enclosedBy":{"name":"PunycodeCodec","kind":3,"href":"punycoder/PunycodeCodec-class.html"}},{"name":"decoder","qualifiedName":"punycoder.PunycodeCodec.decoder","href":"punycoder/PunycodeCodec/decoder.html","kind":16,"overriddenDepth":0,"packageRank":0,"desc":"Returns the decoder of this, converting from T to S.","enclosedBy":{"name":"PunycodeCodec","kind":3,"href":"punycoder/PunycodeCodec-class.html"}},{"name":"encoder","qualifiedName":"punycoder.PunycodeCodec.encoder","href":"punycoder/PunycodeCodec/encoder.html","kind":16,"overriddenDepth":0,"packageRank":0,"desc":"Returns the encoder from S to T.","enclosedBy":{"name":"PunycodeCodec","kind":3,"href":"punycoder/PunycodeCodec-class.html"}}]
diff --git a/doc/api/punycoder/PunycodeCodec-class-sidebar.html b/doc/api/punycoder/PunycodeCodec-class-sidebar.html
index 247c95b..6aa7384 100644
--- a/doc/api/punycoder/PunycodeCodec-class-sidebar.html
+++ b/doc/api/punycoder/PunycodeCodec-class-sidebar.html
@@ -2,6 +2,7 @@
 
       <li class="section-title"><a href="punycoder/PunycodeCodec-class.html#constructors">Constructors</a></li>
         <li><a href="punycoder/PunycodeCodec/PunycodeCodec.html">new</a></li>
+        <li><a href="punycoder/PunycodeCodec/PunycodeCodec.simple.html">simple</a></li>
 
 
     
diff --git a/doc/api/punycoder/PunycodeCodec-class.html b/doc/api/punycoder/PunycodeCodec-class.html
index 0d44106..b27ade8 100644
--- a/doc/api/punycoder/PunycodeCodec-class.html
+++ b/doc/api/punycoder/PunycodeCodec-class.html
@@ -64,11 +64,28 @@ <h1><span class="kind-class">PunycodeCodec</span> class
 <pre class="language-dart"><code class="language-dart">import 'package:punycoder/punycoder.dart';
 
 void main() {
-  const codec = PunycodeCodec();
-  final encoded = codec.encoder.convert('münchen');
-  print(encoded); // Output: mnchen-3ya
-  final decoded = codec.decoder.convert('mnchen-3ya');
-  print(decoded); // Output: münchen
+ // Designed to be used with domains and emails which have special rules
+ const domainCodec = PunycodeCodec();
+ // Designed to work with simple strings
+ const simpleCodec = PunycodeCodec.simple();
+
+ final encodedString = simpleCodec.encode('münchen');
+ final encodedDomain = domainCodec.encode('münchen.com');
+ final encodedEmail = domainCodec.encode('münchen@münchen.com');
+
+ print(encodedString); // Output: mnchen-3ya
+ // Uses the correct prefix for the domain
+ print(encodedDomain); // Output: xn--mnchen-3ya.com
+ // Only the domain should be encoded
+ print(encodedEmail); // Output: münchen@xn--mnchen-3ya.com
+
+ final decodedString = simpleCodec.decode('mnchen-3ya');
+ final decodecDomain = domainCodec.decode('xn--mnchen-3ya.com');
+ final decodedEmail = domainCodec.decode('münchen@xn--mnchen-3ya.com');
+
+ print(decodedString); // Output: münchen
+ print(decodecDomain); // Output: münchen.com
+ print(decodedEmail); // Output: münchen@münchen.com
 }
 </code></pre>
 </section>
@@ -105,7 +122,17 @@ <h2>Constructors</h2>
           <span class="name"><a href="../punycoder/PunycodeCodec/PunycodeCodec.html">PunycodeCodec.new</a></span><span class="signature">()</span>
         </dt>
         <dd>
-          Creates a new instance of the Punycode codec.
+          Creates a new instance of the Punycode codec designed
+for working with domains and email addresses where
+additional rules apply about how it is converted
+            <div class="constructor-modifier features">const</div>
+        </dd>
+        <dt id="PunycodeCodec.simple" class="callable">
+          <span class="name"><a href="../punycoder/PunycodeCodec/PunycodeCodec.simple.html">PunycodeCodec.simple</a></span><span class="signature">()</span>
+        </dt>
+        <dd>
+          Creates a new instance of the Punycode codec just designed
+for working with simple strings
             <div class="constructor-modifier features">const</div>
         </dd>
     </dl>
@@ -300,7 +327,7 @@ <h5>punycoder library</h5>
 <footer>
   <span class="no-break">
     punycoder
-      0.1.0-dev
+      0.1.0
   </span>
   
 </footer>
diff --git a/doc/api/punycoder/PunycodeCodec/PunycodeCodec.html b/doc/api/punycoder/PunycodeCodec/PunycodeCodec.html
index fea63fc..42fd62c 100644
--- a/doc/api/punycoder/PunycodeCodec/PunycodeCodec.html
+++ b/doc/api/punycoder/PunycodeCodec/PunycodeCodec.html
@@ -58,14 +58,18 @@ <h1><span class="kind-constructor">PunycodeCodec</span> constructor
     </section>
     
 <section class="desc markdown">
-  <p>Creates a new instance of the Punycode codec.</p>
+  <p>Creates a new instance of the Punycode codec designed
+for working with domains and email addresses where
+additional rules apply about how it is converted</p>
 </section>
 
 
     
 <section class="summary source-code" id="source">
   <h2><span>Implementation</span></h2>
-  <pre class="language-dart"><code class="language-dart">const PunycodeCodec();</code></pre>
+  <pre class="language-dart"><code class="language-dart">const PunycodeCodec()
+  : _encoder = const PunycodeEncoder(),
+    _decoder = const PunycodeDecoder();</code></pre>
 </section>
 
 
@@ -93,7 +97,7 @@ <h5>PunycodeCodec class</h5>
 <footer>
   <span class="no-break">
     punycoder
-      0.1.0-dev
+      0.1.0
   </span>
   
 </footer>
diff --git a/doc/api/punycoder/PunycodeCodec/PunycodeCodec.simple.html b/doc/api/punycoder/PunycodeCodec/PunycodeCodec.simple.html
new file mode 100644
index 0000000..f740515
--- /dev/null
+++ b/doc/api/punycoder/PunycodeCodec/PunycodeCodec.simple.html
@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable=no">
+  <meta name="description" content="API docs for the PunycodeCodec.simple constructor from Class PunycodeCodec from the punycoder library, for the Dart programming language.">
+  <title>PunycodeCodec.simple constructor - PunycodeCodec - punycoder library - Dart API</title>
+
+
+  
+  <link rel="preconnect" href="https://fonts.gstatic.com">
+  <link href="https://fonts.googleapis.com/css2?family=Roboto+Mono:ital,wght@0,300;0,400;0,500;0,700;1,400&display=swap" rel="stylesheet">
+  <link href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@24,400,0,0" rel="stylesheet">
+  
+  <link rel="stylesheet" href="../../static-assets/github.css?v1">
+  <link rel="stylesheet" href="../../static-assets/styles.css?v1">
+  <link rel="icon" href="../../static-assets/favicon.png?v1">
+  
+</head>
+
+<body data-base-href="../../" data-using-base-href="false" class="light-theme">
+<div id="overlay-under-drawer"></div>
+<header id="title">
+  <span id="sidenav-left-toggle" class="material-symbols-outlined" role="button" tabindex="0">menu</span>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="../../index.html">punycoder</a></li>
+    <li><a href="../../punycoder/">punycoder.dart</a></li>
+    <li><a href="../../punycoder/PunycodeCodec-class.html">PunycodeCodec</a></li>
+    <li class="self-crumb">PunycodeCodec.simple const constructor</li>
+  </ol>
+  <div class="self-name">PunycodeCodec.simple</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+  <button class="toggle" id="theme-button" title="Toggle between light and dark mode" aria-label="Light and dark mode toggle">
+    <span id="dark-theme-button" class="material-symbols-outlined" aria-hidden="true">
+      dark_mode
+    </span>
+    <span id="light-theme-button" class="material-symbols-outlined" aria-hidden="true">
+      light_mode
+    </span>
+  </button>
+</header>
+<main>
+  <div
+      id="dartdoc-main-content"
+      class="main-content"
+      data-above-sidebar="punycoder&#47;PunycodeCodec-class-sidebar.html"
+      data-below-sidebar="">
+      <div>
+<h1><span class="kind-constructor">PunycodeCodec.simple</span> constructor 
+</h1></div>
+
+    <section class="multi-line-signature">
+      const
+      <span class="name ">PunycodeCodec.simple</span>(<wbr>)
+    </section>
+    
+<section class="desc markdown">
+  <p>Creates a new instance of the Punycode codec just designed
+for working with simple strings</p>
+</section>
+
+
+    
+<section class="summary source-code" id="source">
+  <h2><span>Implementation</span></h2>
+  <pre class="language-dart"><code class="language-dart">const PunycodeCodec.simple()
+  : _encoder = const PunycodeEncoder.simple(),
+    _decoder = const PunycodeDecoder.simple();</code></pre>
+</section>
+
+
+  </div> <!-- /.main-content -->
+  <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
+    <!-- The search input and breadcrumbs below are only responsively visible at low resolutions. -->
+<header id="header-search-sidebar" class="hidden-l">
+  <form class="search-sidebar" role="search">
+    <input type="text" id="search-sidebar" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+<ol class="breadcrumbs gt-separated dark hidden-l" id="sidebar-nav">
+    <li><a href="../../index.html">punycoder</a></li>
+    <li><a href="../../punycoder/">punycoder</a></li>
+    <li><a href="../../punycoder/PunycodeCodec-class.html">PunycodeCodec</a></li>
+    <li class="self-crumb">PunycodeCodec.simple const constructor</li>
+</ol>
+
+    <h5>PunycodeCodec class</h5>
+    <div id="dartdoc-sidebar-left-content"></div>
+  </div><!--/.sidebar-offcanvas-left-->
+  <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+</main>
+<footer>
+  <span class="no-break">
+    punycoder
+      0.1.0
+  </span>
+  
+</footer>
+
+
+<script src="../../static-assets/highlight.pack.js?v1"></script>
+<script src="../../static-assets/docs.dart.js"></script>
+
+</body>
+</html>
+
diff --git a/doc/api/punycoder/PunycodeCodec/decoder.html b/doc/api/punycoder/PunycodeCodec/decoder.html
index 95ca6e0..8008229 100644
--- a/doc/api/punycoder/PunycodeCodec/decoder.html
+++ b/doc/api/punycoder/PunycodeCodec/decoder.html
@@ -80,7 +80,7 @@ <h1><span class="kind-property">decoder</span> property
 <section class="summary source-code" id="source">
   <h2><span>Implementation</span></h2>
   <pre class="language-dart"><code class="language-dart">@override
-Converter&lt;String, String&gt; get decoder =&gt; punycodeDecoder;</code></pre>
+Converter&lt;String, String&gt; get decoder =&gt; _decoder;</code></pre>
 </section>
 
   </section>
@@ -110,7 +110,7 @@ <h5>PunycodeCodec class</h5>
 <footer>
   <span class="no-break">
     punycoder
-      0.1.0-dev
+      0.1.0
   </span>
   
 </footer>
diff --git a/doc/api/punycoder/PunycodeCodec/encoder.html b/doc/api/punycoder/PunycodeCodec/encoder.html
index ae5aedd..ef8bd3e 100644
--- a/doc/api/punycoder/PunycodeCodec/encoder.html
+++ b/doc/api/punycoder/PunycodeCodec/encoder.html
@@ -80,7 +80,7 @@ <h1><span class="kind-property">encoder</span> property
 <section class="summary source-code" id="source">
   <h2><span>Implementation</span></h2>
   <pre class="language-dart"><code class="language-dart">@override
-Converter&lt;String, String&gt; get encoder =&gt; punycodeEncoder;</code></pre>
+Converter&lt;String, String&gt; get encoder =&gt; _encoder;</code></pre>
 </section>
 
   </section>
@@ -110,7 +110,7 @@ <h5>PunycodeCodec class</h5>
 <footer>
   <span class="no-break">
     punycoder
-      0.1.0-dev
+      0.1.0
   </span>
   
 </footer>
diff --git a/doc/api/punycoder/index.html b/doc/api/punycoder/index.html
index 5e5288e..2f31577 100644
--- a/doc/api/punycoder/index.html
+++ b/doc/api/punycoder/index.html
@@ -68,48 +68,28 @@ <h1>
 string suitable for host name labels, using only letters, digits,
 and hyphens. This library allows encoding Unicode strings to Punycode
 ASCII strings and decoding them back to Unicode.</p>
-<p>This library exports the main <a href="../punycoder/PunycodeCodec-class.html">PunycodeCodec</a> which provides convenient
-access to both the <a href="../punycoder/PunycodeEncoder-class.html">PunycodeEncoder</a> and <a href="../punycoder/PunycodeDecoder-class.html">PunycodeDecoder</a>. You can
-use the codec directly or instantiate the encoder/decoder separately.</p>
+<p>This library exports the main <a href="../punycoder/PunycodeCodec-class.html">PunycodeCodec</a> which follows the
+standard codec interface from <code>dart:convert</code> to help ensure a
+smooth and idomatic Dart experience when encoding and decoding.</p>
 <h2 id="usage">Usage</h2>
 <pre class="language-dart"><code class="language-dart">import 'package:punycoder/punycoder.dart';
 
 void main() {
-  // 1. Use the codec directly
   final codec = PunycodeCodec();
 
   // Encode a Unicode string (e.g., a domain label)
   final encoded = codec.encode('bücher');
   print(encoded); // Output: bcher-kva
 
-  // Decode a Punycode string (typically prefixed with 'xn--' in IDNA)
-  // Note: The decoder itself expects the raw Punycode without the prefix.
+  // Decode a Punycode string
   final decoded = codec.decode('egbpdaj6bu4bxfgehfvwxn');
   print(decoded); // Output: ليهماابتكلموشعربي؟
-
-  // 2. Use the encoder/decoder individually
-  const encoder = punycodeEncoder; // Access the singleton instance
-  const decoder = punycodeDecoder; // Access the singleton instance
-
-  // The encoder/decoder also provide helpers for domain/email processing
-  // These handle the 'xn--' prefix and apply encoding/decoding only where needed.
-  final encodedDomain = encoder.toAscii('mañana.com');
-  print(encodedDomain); // Output: xn--maana-pta.com
-
-  final decodedDomain = decoder.toUnicode('xn--ls8h.la');
-  print(decodedDomain); // Output: 💩.la
-
-  final email = 'bücher@xn--bcher-kva.com';
-  final decodedEmail = decoder.toUnicode(email);
-  print(decodedEmail); // Output: bücher@bücher.com
 }
 </code></pre>
 <p>See also:</p>
 <ul>
 <li><a href="https://www.rfc-editor.org/rfc/rfc3492.html">RFC 3492: Punycode</a></li>
 <li><a href="../punycoder/PunycodeCodec-class.html">PunycodeCodec</a>, the main codec combining encoder and decoder.</li>
-<li><a href="../punycoder/PunycodeEncoder-class.html">PunycodeEncoder</a>, for encoding Unicode to Punycode.</li>
-<li><a href="../punycoder/PunycodeDecoder-class.html">PunycodeDecoder</a>, for decoding Punycode to Unicode.</li>
 </ul>
 </section>
 
@@ -125,24 +105,6 @@ <h2>Classes</h2>
   A codec for encoding and decoding strings using the Punycode algorithm.
 </dd>
 
-          <dt id="PunycodeDecoder">
-  <span class="name "><a href="../punycoder/PunycodeDecoder-class.html">PunycodeDecoder</a></span> 
-
-</dt>
-<dd>
-  Converts a Punycode string of ASCII-only symbols to a string of
-Unicode symbols.
-</dd>
-
-          <dt id="PunycodeEncoder">
-  <span class="name "><a href="../punycoder/PunycodeEncoder-class.html">PunycodeEncoder</a></span> 
-
-</dt>
-<dd>
-  Converts a string of Unicode symbols (e.g. a domain name label) to a
-Punycode string of ASCII-only symbols.
-</dd>
-
       </dl>
     </section>
 
@@ -150,35 +112,6 @@ <h2>Classes</h2>
 
 
 
-    <section class="summary offset-anchor" id="constants">
-      <h2>Constants</h2>
-      <dl class="properties">
-          <dt id="punycodeDecoder" class="constant">
-    <span class="name "><a href="../punycoder/punycodeDecoder-constant.html">punycodeDecoder</a></span>
-  <span class="signature">&#8594; const <a href="../punycoder/PunycodeDecoder-class.html">PunycodeDecoder</a></span>
-  
-
-</dt>
-<dd>
-  The canonical version of the Punycode Decoder
-  
-
-</dd>
-
-          <dt id="punycodeEncoder" class="constant">
-    <span class="name "><a href="../punycoder/punycodeEncoder-constant.html">punycodeEncoder</a></span>
-  <span class="signature">&#8594; const <a href="../punycoder/PunycodeEncoder-class.html">PunycodeEncoder</a></span>
-  
-
-</dt>
-<dd>
-  The canonical version of the Punycode Encoder
-  
-
-</dd>
-
-      </dl>
-    </section>
 
 
 
@@ -210,7 +143,7 @@ <h5>punycoder library</h5>
 <footer>
   <span class="no-break">
     punycoder
-      0.1.0-dev
+      0.1.0
   </span>
   
 </footer>
diff --git a/doc/api/punycoder/punycoder-library-sidebar.html b/doc/api/punycoder/punycoder-library-sidebar.html
index 734b9de..2b1a29e 100644
--- a/doc/api/punycoder/punycoder-library-sidebar.html
+++ b/doc/api/punycoder/punycoder-library-sidebar.html
@@ -1,15 +1,10 @@
 <ol>
       <li class="section-title"><a href="punycoder/#classes">Classes</a></li>
         <li><a href="punycoder/PunycodeCodec-class.html">PunycodeCodec</a></li>
-        <li><a href="punycoder/PunycodeDecoder-class.html">PunycodeDecoder</a></li>
-        <li><a href="punycoder/PunycodeEncoder-class.html">PunycodeEncoder</a></li>
 
 
 
 
-      <li class="section-title"><a href="punycoder/#constants">Constants</a></li>
-        <li><a href="punycoder/punycodeDecoder-constant.html">punycodeDecoder</a></li>
-        <li><a href="punycoder/punycodeEncoder-constant.html">punycodeEncoder</a></li>
 
 
 
diff --git a/doc/api/search.html b/doc/api/search.html
index 795275b..1bab340 100644
--- a/doc/api/search.html
+++ b/doc/api/search.html
@@ -68,7 +68,7 @@ <h5 class="hidden-xs"><span class="package-name">punycoder</span> <span class="p
 <footer>
   <span class="no-break">
     punycoder
-      0.1.0-dev
+      0.1.0
   </span>
   
 </footer>
diff --git a/example/punycoder_example.dart b/example/punycoder_example.dart
index e45ff07..f7db9ef 100644
--- a/example/punycoder_example.dart
+++ b/example/punycoder_example.dart
@@ -1,44 +1,28 @@
-
 import 'dart:io';
 
 import 'package:punycoder/punycoder.dart';
 
 void main() {
-  // Use the singleton encoder/decoder for common IDNA tasks
-  const encoder = punycodeEncoder;
-  const decoder = punycodeDecoder;
+  // Designed to be used with domains and emails which have special rules
+  const domainCodec = PunycodeCodec();
+  // Designed to work with simple strings
+  const simpleCodec = PunycodeCodec.simple();
+
+  final encodedString = simpleCodec.encode('münchen');
+  final encodedDomain = domainCodec.encode('münchen.com');
+  final encodedEmail = domainCodec.encode('münchen@münchen.com');
 
-  // --- Convert domains/emails TO ASCII (ACE format) ---
-  final domainsToEncode = ['bücher.example', 'example.com', '你好.test'];
-  stdout.writeln('Encoding to ASCII:');
-  for (final domain in domainsToEncode) {
-    final asciiVersion = encoder.toAscii(domain);
-    // toAscii adds 'xn--' prefix only if encoding actually happens
-    stdout.writeln('"$domain"  ->  "$asciiVersion"');
-    // Output:
-    // "bücher.example"  ->  "xn--bcher-kva.example"
-    // "example.com"  ->  "example.com"
-    // "你好.test"  ->  "xn--6qq79v.test"
-  }
+  stdout.writeln(encodedString); // Output: mnchen-3ya
+  // Uses the correct prefix for the domain
+  stdout.writeln(encodedDomain); // Output: xn--mnchen-3ya.com
+  // Only the domain should be encoded
+  stdout.writeln(encodedEmail); // Output: münchen@xn--mnchen-3ya.com
 
-  // --- Convert domains/emails FROM ASCII (ACE format) ---
-  final domainsToDecode = ['xn--bcher-kva.example', 'example.com', 'xn--6qq79v.test'];
-   stdout.writeln('\nDecoding from ASCII:');
-  for (final domain in domainsToDecode) {
-    final unicodeVersion = decoder.toUnicode(domain);
-    // toUnicode decodes labels starting with 'xn--'
-    stdout.writeln('"$domain"  ->  "$unicodeVersion"');
-    // Output:
-    // "xn--bcher-kva.example"  ->  "bücher.example"
-    // "example.com"  ->  "example.com"
-    // "xn--6qq79v.test"  ->  "你好.test"
-  }
+  final decodedString = simpleCodec.decode('mnchen-3ya');
+  final decodecDomain = domainCodec.decode('xn--mnchen-3ya.com');
+  final decodedEmail = domainCodec.decode('münchen@xn--mnchen-3ya.com');
 
-  // --- Raw Encoding/Decoding (Advanced) ---
-  // For direct encoding/decoding without automatic prefix handling or domain splitting:
-  final codec = PunycodeCodec();
-  final rawEncoded = codec.encode('bücher'); // -> 'bcher-kva' (no prefix)
-  final rawDecoded = codec.decode('bcher-kva'); // -> 'bücher'
-  stdout.writeln('\nRaw codec example (Decoded): "$rawDecoded"');
-  stdout.writeln('Raw codec example (Encoded): "$rawEncoded"');
-}
\ No newline at end of file
+  stdout.writeln(decodedString); // Output: münchen
+  stdout.writeln(decodecDomain); // Output: münchen.com
+  stdout.writeln(decodedEmail); // Output: münchen@münchen.com
+}
diff --git a/lib/punycoder.dart b/lib/punycoder.dart
index f634d34..1a2dc07 100644
--- a/lib/punycoder.dart
+++ b/lib/punycoder.dart
@@ -8,9 +8,9 @@
 /// and hyphens. This library allows encoding Unicode strings to Punycode
 /// ASCII strings and decoding them back to Unicode.
 ///
-/// This library exports the main [PunycodeCodec] which provides convenient
-/// access to both the [PunycodeEncoder] and [PunycodeDecoder]. You can
-/// use the codec directly or instantiate the encoder/decoder separately.
+/// This library exports the main [PunycodeCodec] which follows the 
+/// standard codec interface from `dart:convert` to help ensure a 
+/// smooth and idomatic Dart experience when encoding and decoding.
 ///
 /// ## Usage
 ///
@@ -18,43 +18,21 @@
 /// import 'package:punycoder/punycoder.dart';
 ///
 /// void main() {
-///   // 1. Use the codec directly
 ///   final codec = PunycodeCodec();
 ///
 ///   // Encode a Unicode string (e.g., a domain label)
 ///   final encoded = codec.encode('bücher');
 ///   print(encoded); // Output: bcher-kva
 ///
-///   // Decode a Punycode string (typically prefixed with 'xn--' in IDNA)
-///   // Note: The decoder itself expects the raw Punycode without the prefix.
+///   // Decode a Punycode string
 ///   final decoded = codec.decode('egbpdaj6bu4bxfgehfvwxn');
 ///   print(decoded); // Output: ليهماابتكلموشعربي؟
-///
-///   // 2. Use the encoder/decoder individually
-///   const encoder = punycodeEncoder; // Access the singleton instance
-///   const decoder = punycodeDecoder; // Access the singleton instance
-///
-///   // The encoder/decoder also provide helpers for domain/email processing
-///   // These handle the 'xn--' prefix and apply encoding/decoding only where needed.
-///   final encodedDomain = encoder.toAscii('mañana.com');
-///   print(encodedDomain); // Output: xn--maana-pta.com
-///
-///   final decodedDomain = decoder.toUnicode('xn--ls8h.la');
-///   print(decodedDomain); // Output: 💩.la
-///
-///   final email = 'bücher@xn--bcher-kva.com';
-///   final decodedEmail = decoder.toUnicode(email);
-///   print(decodedEmail); // Output: bücher@bücher.com
 /// }
 /// ```
 ///
 /// See also:
 /// * [RFC 3492: Punycode](https://www.rfc-editor.org/rfc/rfc3492.html)
 /// * [PunycodeCodec], the main codec combining encoder and decoder.
-/// * [PunycodeEncoder], for encoding Unicode to Punycode.
-/// * [PunycodeDecoder], for decoding Punycode to Unicode.
 library;
 
-export 'src/decoder.dart';
-export 'src/encoder.dart';
-export 'src/punycoder_base.dart';
+export 'src/codec.dart';
diff --git a/lib/src/codec.dart b/lib/src/codec.dart
new file mode 100644
index 0000000..0467ed8
--- /dev/null
+++ b/lib/src/codec.dart
@@ -0,0 +1,66 @@
+import 'dart:convert';
+
+import 'package:punycoder/src/decoder.dart' show PunycodeDecoder;
+import 'package:punycoder/src/encoder.dart';
+
+/// A codec for encoding and decoding strings using the Punycode algorithm.
+///
+/// Punycode is a character encoding scheme used to represent Unicode
+/// characters in ASCII strings. It is commonly used for Internationalized
+/// Domain Names (IDNs).
+///
+/// This codec provides methods to convert between Unicode strings and their
+/// Punycode representations.
+///
+/// Example:
+/// ```dart
+/// import 'package:punycoder/punycoder.dart';
+///
+/// void main() {
+///  // Designed to be used with domains and emails which have special rules
+///  const domainCodec = PunycodeCodec();
+///  // Designed to work with simple strings
+///  const simpleCodec = PunycodeCodec.simple();
+///
+///  final encodedString = simpleCodec.encode('münchen');
+///  final encodedDomain = domainCodec.encode('münchen.com');
+///  final encodedEmail = domainCodec.encode('münchen@münchen.com');
+///
+///  print(encodedString); // Output: mnchen-3ya
+///  // Uses the correct prefix for the domain
+///  print(encodedDomain); // Output: xn--mnchen-3ya.com
+///  // Only the domain should be encoded
+///  print(encodedEmail); // Output: münchen@xn--mnchen-3ya.com
+///
+///  final decodedString = simpleCodec.decode('mnchen-3ya');
+///  final decodecDomain = domainCodec.decode('xn--mnchen-3ya.com');
+///  final decodedEmail = domainCodec.decode('münchen@xn--mnchen-3ya.com');
+///
+///  print(decodedString); // Output: münchen
+///  print(decodecDomain); // Output: münchen.com
+///  print(decodedEmail); // Output: münchen@münchen.com
+/// }
+/// ```
+class PunycodeCodec extends Codec<String, String> {
+  final Converter<String, String> _encoder;
+  final Converter<String, String> _decoder;
+
+  /// Creates a new instance of the Punycode codec designed
+  /// for working with domains and email addresses where
+  /// additional rules apply about how it is converted
+  const PunycodeCodec()
+    : _encoder = const PunycodeEncoder(),
+      _decoder = const PunycodeDecoder();
+
+  /// Creates a new instance of the Punycode codec just designed
+  /// for working with simple strings
+  const PunycodeCodec.simple()
+    : _encoder = const PunycodeEncoder.simple(),
+      _decoder = const PunycodeDecoder.simple();
+
+  @override
+  Converter<String, String> get decoder => _decoder;
+
+  @override
+  Converter<String, String> get encoder => _encoder;
+}
diff --git a/lib/src/decoder.dart b/lib/src/decoder.dart
index 0214c4e..9bd0690 100644
--- a/lib/src/decoder.dart
+++ b/lib/src/decoder.dart
@@ -1,32 +1,37 @@
 // SPDX-License-Identifier: MIT
 //
-// This code is based on a port of the Punycode.js library by Mathias Bynens.
+// This code is partially based on the Punycode.js library by Mathias Bynens.
 // Original library: https://github.com/mathiasbynens/punycode.js/
 // Original library license: MIT
 
 import 'dart:convert';
 
-import 'package:punycoder/src/shared.dart';
-
-/// The canonical version of the Punycode Decoder
-const punycodeDecoder = PunycodeDecoder._();
+import 'package:punycoder/src/punycode_helper.dart';
 
 /// Converts a Punycode string of ASCII-only symbols to a string of
 /// Unicode symbols.
 class PunycodeDecoder extends Converter<String, String> {
-  const PunycodeDecoder._();
-
-  /// Converts a Punycode string representing a domain name or an email address
-  /// to Unicode. Only the Punycoded parts of the input will be converted, i.e.
-  /// it doesn't matter if you call it on a string that has already been
-  /// converted to Unicode.
-  String toUnicode(String input) {
-    return _mapDomain(input);
+  final bool _simpleMode;
+  
+  /// Creates a Punycode Decoder designed to work with the nuances
+  /// of how Punycode encodes domains and emails
+  const PunycodeDecoder() : _simpleMode = false;
+  
+  /// Creates a Punycode Decoder which just works with simple 
+  /// strings and doesn't attempt to account for nuances in 
+  /// how Punycode encodes domains and emails
+  const PunycodeDecoder.simple() : _simpleMode = true;
+
+  @override
+  String convert(String input) {
+    if (_simpleMode) {
+      return _decodeString(input);
+    } else {
+      return _decodeDomain(input);
+    }
   }
 
-  /// A simple `map`-like function to work with domain name strings or email
-  /// addresses.
-  String _mapDomain(String input) {
+  String _decodeDomain(String input) {
     var result = '';
     final parts = input.split('@');
 
@@ -37,22 +42,21 @@ class PunycodeDecoder extends Converter<String, String> {
       input = parts[1];
     }
 
-    final labels = input.split(punycodeRegex.regexSeparators);
+    final labels = punycodeHelper.getLabelsFromString(input);
     final encodedLabels = labels.map(_encodeLabel).toList();
     final encoded = encodedLabels.join('.');
     return result + encoded;
   }
 
   String _encodeLabel(String label) {
-    if (punycodeRegex.regexPunycode.hasMatch(label)) {
-      return convert(label.substring(4).toLowerCase());
+    if (punycodeHelper.isPunycodeDomain(label)) {
+      return _decodeString(label.substring(4).toLowerCase());
     } else {
       return label;
     }
   }
 
-  @override
-  String convert(String input) {
+  String _decodeString(String input) {
     final output = <int>[];
     final inputLength = input.length;
     var i = 0;
@@ -96,7 +100,7 @@ class PunycodeDecoder extends Converter<String, String> {
           throw FormatException('Invalid input: Incomplete Punycode sequence');
         }
 
-        final digit = basicToDigit(input.codeUnitAt(index++));
+        final digit = punycodeHelper.basicToDigit(input.codeUnitAt(index++));
 
         if (digit >= bootstrapValues.base) {
           throw FormatException(
@@ -104,7 +108,7 @@ class PunycodeDecoder extends Converter<String, String> {
           );
         }
 
-        if (digit > ((maxInt - i) ~/ w)) {
+        if (digit > ((punycodeHelper.maxInt - i) ~/ w)) {
           throw FormatException(
             'Overflow: input needs wider integers to process',
           );
@@ -124,7 +128,7 @@ class PunycodeDecoder extends Converter<String, String> {
 
         final baseMinusT = bootstrapValues.base - t;
 
-        if (w > (maxInt ~/ baseMinusT)) {
+        if (w > (punycodeHelper.maxInt ~/ baseMinusT)) {
           throw FormatException(
             'Overflow: input needs wider integers to process',
           );
@@ -134,11 +138,15 @@ class PunycodeDecoder extends Converter<String, String> {
       }
 
       final out = output.length + 1;
-      bias = adapt(delta: i - oldi, numPoints: out, firstTime: oldi == 0);
+      bias = punycodeHelper.adapt(
+        delta: i - oldi,
+        numPoints: out,
+        firstTime: oldi == 0,
+      );
 
       // `i` was supposed to wrap around from `out` to `0`,
       // incrementing `n` each time, so we'll fix that now:
-      if ((i ~/ out) > (maxInt - n)) {
+      if ((i ~/ out) > (punycodeHelper.maxInt - n)) {
         throw FormatException(
           'Overflow: input needs wider integers to process',
         );
diff --git a/lib/src/encoder.dart b/lib/src/encoder.dart
index c4afdd9..9b51f71 100644
--- a/lib/src/encoder.dart
+++ b/lib/src/encoder.dart
@@ -1,32 +1,37 @@
 // SPDX-License-Identifier: MIT
 //
-// This code is based on a port of the Punycode.js library by Mathias Bynens.
+// This code is partially based on the Punycode.js library by Mathias Bynens.
 // Original library: https://github.com/mathiasbynens/punycode.js/
 // Original library license: MIT
 
 import 'dart:convert';
 
-import 'package:punycoder/src/shared.dart';
+import 'package:punycoder/src/punycode_helper.dart';
 
-/// The canonical version of the Punycode Encoder
-const punycodeEncoder = PunycodeEncoder._();
+/// Converts a string of Unicode symbols to a Punycode 
+/// string of ASCII-only symbols
+final class PunycodeEncoder extends Converter<String, String> {
+  final bool _simpleMode;
 
-/// Converts a string of Unicode symbols (e.g. a domain name label) to a
-/// Punycode string of ASCII-only symbols.
-class PunycodeEncoder extends Converter<String, String> {
-  const PunycodeEncoder._();
+  /// Creates a Punycode Encoder designed to work with the nuances
+  /// of how Punycode encodes domains and emails
+  const PunycodeEncoder() : _simpleMode = false;
 
-  /// Converts a Unicode string representing a domain name or an email address
-  /// to Punycode. Only the non-ASCII parts of the domain name will be
-  /// converted, i.e. it doesn't matter if you call it with a domain that's
-  /// already in ASCII
-  String toAscii(String input) {
-    return _mapDomain(input);
+  /// Creates a Punycode Encoder which just works with simple 
+  /// strings and doesn't attempt to account for nuances in 
+  /// how Punycode encodes domains and emails
+  const PunycodeEncoder.simple() : _simpleMode = true;
+
+  @override
+  String convert(String input) {
+    if (_simpleMode) {
+      return _encodeString(input);
+    } else {
+      return _encodeDomain(input);
+    }
   }
 
-  /// A simple `map`-like function to work with domain name strings or email
-  /// addresses.
-  String _mapDomain(String input) {
+  String _encodeDomain(String input) {
     var result = '';
     final parts = input.split('@');
 
@@ -37,22 +42,21 @@ class PunycodeEncoder extends Converter<String, String> {
       input = parts[1];
     }
 
-    final labels = input.split(punycodeRegex.regexSeparators);
+    final labels = punycodeHelper.getLabelsFromString(input);
     final encodedLabels = labels.map(_encodeLabel).toList();
     final encoded = encodedLabels.join('.');
     return result + encoded;
   }
 
-  String _encodeLabel(String label) {
-    if (punycodeRegex.regexNonASCII.hasMatch(label)) {
-      return 'xn--${convert(label)}';
+  String _encodeLabel(String input) {
+    if (punycodeHelper.isNonAscii(input)) {
+      return 'xn--${_encodeString(input)}';
     } else {
-      return label;
+      return input;
     }
   }
 
-  @override
-  String convert(String input) {
+  String _encodeString(String input) {
     final output = <int>[];
 
     // Convert the input to an array of Unicode code points.
@@ -90,7 +94,7 @@ class PunycodeEncoder extends Converter<String, String> {
     while (handledCPCount < inputLength) {
       // All non-basic code points < n have been handled already. Find the next
       // larger one:
-      var m = maxInt;
+      var m = punycodeHelper.maxInt;
 
       for (final currentValue in decodedInput) {
         if (currentValue >= n && currentValue < m) {
@@ -102,7 +106,8 @@ class PunycodeEncoder extends Converter<String, String> {
       // but guard against overflow.
       final handledCPCountPlusOne = handledCPCount + 1;
 
-      if (m - n > ((maxInt - delta) / handledCPCountPlusOne).floor()) {
+      if (m - n >
+          ((punycodeHelper.maxInt - delta) / handledCPCountPlusOne).floor()) {
         throw FormatException(
           'Overflow: input needs wider integers to process',
         );
@@ -114,7 +119,7 @@ class PunycodeEncoder extends Converter<String, String> {
       for (final currentValue in decodedInput) {
         if (currentValue < n) {
           delta++;
-          if (delta > maxInt) {
+          if (delta > punycodeHelper.maxInt) {
             throw FormatException(
               'Overflow: input needs wider integers to process',
             );
@@ -139,12 +144,14 @@ class PunycodeEncoder extends Converter<String, String> {
 
             final qMinusT = q - t;
             final baseMinusT = bootstrapValues.base - t;
-            output.add(digitToBasic(t + (qMinusT % baseMinusT), 0));
+            output.add(
+              punycodeHelper.digitToBasic(t + (qMinusT % baseMinusT), 0),
+            );
             q = qMinusT ~/ baseMinusT;
           }
 
-          output.add(digitToBasic(q, 0));
-          bias = adapt(
+          output.add(punycodeHelper.digitToBasic(q, 0));
+          bias = punycodeHelper.adapt(
             delta: delta,
             numPoints: handledCPCountPlusOne,
             firstTime: handledCPCount == basicLength,
diff --git a/lib/src/punycode_helper.dart b/lib/src/punycode_helper.dart
new file mode 100644
index 0000000..d415ff4
--- /dev/null
+++ b/lib/src/punycode_helper.dart
@@ -0,0 +1,150 @@
+// SPDX-License-Identifier: MIT
+//
+// This code is partially based on the Punycode.js library by Mathias Bynens.
+// Original library: https://github.com/mathiasbynens/punycode.js/
+// Original library license: MIT
+
+/// Bootstring parameters & constants from the Punycode
+/// specification (RFC 3492)
+const bootstrapValues = (
+  base: 36,
+  tMin: 1,
+  tMax: 26,
+  skew: 38,
+  damp: 700,
+  initialBias: 72,
+  initialN: 128, // 0x80
+  delimiter: '-', // '\x2D'
+);
+
+const punycodeHelper = _PunycodeHelper._();
+
+final class _PunycodeHelper {
+  const _PunycodeHelper._();
+
+  ///  Highest positive signed 32-bit float value
+  int get maxInt => 2147483647; // aka. 0x7FFFFFFF or 2^31-1
+
+  List<String> getLabelsFromString(String input) {
+    // RFC 3490 separators
+    final seperators = RegExp(r'[\x2E\u3002\uFF0E\uFF61]');
+    return input.split(seperators);
+  }
+
+  bool isNonAscii(String input) {
+    // Note: U+007F DEL is excluded too.
+    final nonAsciiRegex = RegExp(r'[^\x00-\x7F]');
+    return nonAsciiRegex.hasMatch(input);
+  }
+
+  bool isPunycodeDomain(String input) {
+    final punycodeRegex = RegExp('^xn--');
+    return punycodeRegex.hasMatch(input);
+  }
+
+  /// Converts a digit/integer into a basic code point.
+  ///
+  /// See `basicToDigit()`
+  ///
+  /// Args:
+  ///   digit: The numeric value of a basic code point.  Must be in the range
+  ///     `0` to `base - 1` (where `base` is presumably 36, but this function
+  ///     doesn't depend on that).
+  ///   flag: If non-zero, the uppercase form is used; else, the lowercase form
+  ///     is used.
+  ///
+  /// Returns:
+  ///   The basic code point (an integer representing a Unicode code point)
+  ///   whose value (when used for representing integers) is `digit`.
+  ///
+  /// Throws:
+  ///    ArgumentError: if digit is outside of the range 0-35.
+  int digitToBasic(int digit, int flag) {
+    //  0..25 map to ASCII a..z or A..Z
+    // 26..35 map to ASCII 0..9
+    if (digit < 0 || digit > 35) {
+      throw ArgumentError.value(digit, 'digit', 'must be between 0 and 35');
+    }
+    if (digit < 26) {
+      // a-z or A-Z
+      if (flag != 0) {
+        return 'A'.codeUnitAt(0) + digit; // Uppercase
+      } else {
+        return 'a'.codeUnitAt(0) + digit; // Lowercase
+      }
+    } else {
+      // 0-9
+      return '0'.codeUnitAt(0) + (digit - 26);
+    }
+  }
+
+  /// Converts a basic code point (ASCII character) to its corresponding digit value.
+  ///
+  /// This function maps ASCII characters representing digits (0-9) and letters (A-Z, a-z)
+  /// to their corresponding integer values used in Punycode encoding.
+  ///
+  /// Args:
+  ///   codePoint: The ASCII code point to convert.
+  ///
+  /// Returns:
+  ///   The integer value of the code point, or `bootstrapValues.base` if the
+  ///   code point is not a valid basic code point.
+  ///   - 0-25: Represents 'a' to 'z' (or 'A' to 'Z').
+  ///   - 26-35: Represents '0' to '9'.
+  ///   - `bootstrapValues.base`: Represents an invalid code point.
+  int basicToDigit(int codePoint) {
+    if (codePoint >= 0x30 && codePoint < 0x3A) {
+      return 26 + (codePoint - 0x30);
+    }
+    if (codePoint >= 0x41 && codePoint < 0x5B) {
+      return codePoint - 0x41;
+    }
+    if (codePoint >= 0x61 && codePoint < 0x7B) {
+      return codePoint - 0x61;
+    }
+    return bootstrapValues.base;
+  }
+
+  /// Bias adaptation function as per section 3.4 of RFC 3492.
+  /// https://www.ietf.org/html/rfc3492#section-3.4
+  ///
+  /// Args:
+  ///   delta: The delta value.
+  ///   numPoints: The total number of code points encoded/decoded so far.
+  ///   firstTime: True if this is the very first delta, false otherwise.
+  ///
+  /// Returns:
+  ///   The adapted bias.
+  int adapt({
+    required int delta,
+    required int numPoints,
+    required bool firstTime,
+  }) {
+    var k = 0;
+
+    // 1. Delta scaling (avoid overflow)
+    delta =
+        firstTime
+            ? (delta ~/ bootstrapValues.damp)
+            : (delta ~/ 2); // Integer division
+
+    // 2. Delta increase (compensate for longer string)
+    delta += delta ~/ numPoints; // Integer division
+
+    // 3. Delta division (predict minimum digits)
+    while (delta >
+        (((bootstrapValues.base - bootstrapValues.tMin) *
+                bootstrapValues.tMax) ~/
+            2)) {
+      delta =
+          delta ~/
+          (bootstrapValues.base - bootstrapValues.tMin); // Integer division
+      k += bootstrapValues.base;
+    }
+
+    // 4. Bias calculation
+    return k +
+        ((((bootstrapValues.base - bootstrapValues.tMin) + 1) * delta) ~/
+            (delta + bootstrapValues.skew));
+  }
+}
diff --git a/lib/src/punycoder_base.dart b/lib/src/punycoder_base.dart
deleted file mode 100644
index 8538e3a..0000000
--- a/lib/src/punycoder_base.dart
+++ /dev/null
@@ -1,42 +0,0 @@
-// SPDX-License-Identifier: MIT
-//
-// This code is based on a port of the Punycode.js library by Mathias Bynens.
-// Original library: https://github.com/mathiasbynens/punycode.js/
-// Original library license: MIT
-
-import 'dart:convert';
-
-import 'package:punycoder/src/decoder.dart';
-import 'package:punycoder/src/encoder.dart';
-
-/// A codec for encoding and decoding strings using the Punycode algorithm.
-///
-/// Punycode is a character encoding scheme used to represent Unicode
-/// characters in ASCII strings. It is commonly used for Internationalized
-/// Domain Names (IDNs).
-///
-/// This codec provides methods to convert between Unicode strings and their
-/// Punycode representations.
-///
-/// Example:
-/// ```dart
-/// import 'package:punycoder/punycoder.dart';
-///
-/// void main() {
-///   const codec = PunycodeCodec();
-///   final encoded = codec.encoder.convert('münchen');
-///   print(encoded); // Output: mnchen-3ya
-///   final decoded = codec.decoder.convert('mnchen-3ya');
-///   print(decoded); // Output: münchen
-/// }
-/// ```
-class PunycodeCodec extends Codec<String, String> {
-  /// Creates a new instance of the Punycode codec.
-  const PunycodeCodec();
-
-  @override
-  Converter<String, String> get decoder => punycodeDecoder;
-
-  @override
-  Converter<String, String> get encoder => punycodeEncoder;
-}
\ No newline at end of file
diff --git a/lib/src/shared.dart b/lib/src/shared.dart
deleted file mode 100644
index c5e3903..0000000
--- a/lib/src/shared.dart
+++ /dev/null
@@ -1,133 +0,0 @@
-// SPDX-License-Identifier: MIT
-//
-// This code is based on a port of the Punycode.js library by Mathias Bynens.
-// Original library: https://github.com/mathiasbynens/punycode.js/
-// Original library license: MIT
-
-/// Bootstring parameters & constants from the Punycode
-/// specification (RFC 3492)
-const bootstrapValues = (
-  base: 36,
-  tMin: 1,
-  tMax: 26,
-  skew: 38,
-  damp: 700,
-  initialBias: 72,
-  initialN: 128, // 0x80
-  delimiter: '-', // '\x2D'
-);
-
-///  Highest positive signed 32-bit float value
-const maxInt = 2147483647; // aka. 0x7FFFFFFF or 2^31-1
-
-/// Bias adaptation function as per section 3.4 of RFC 3492.
-/// https://www.ietf.org/html/rfc3492#section-3.4
-///
-/// Args:
-///   delta: The delta value.
-///   numPoints: The total number of code points encoded/decoded so far.
-///   firstTime: True if this is the very first delta, false otherwise.
-///
-/// Returns:
-///   The adapted bias.
-int adapt({
-  required int delta,
-  required int numPoints,
-  required bool firstTime,
-}) {
-  var k = 0;
-
-  // 1. Delta scaling (avoid overflow)
-  delta =
-      firstTime
-          ? (delta ~/ bootstrapValues.damp)
-          : (delta ~/ 2); // Integer division
-
-  // 2. Delta increase (compensate for longer string)
-  delta += delta ~/ numPoints; // Integer division
-
-  // 3. Delta division (predict minimum digits)
-  while (delta >
-      (((bootstrapValues.base - bootstrapValues.tMin) * bootstrapValues.tMax) ~/
-          2)) {
-    delta =
-        delta ~/
-        (bootstrapValues.base - bootstrapValues.tMin); // Integer division
-    k += bootstrapValues.base;
-  }
-
-  // 4. Bias calculation
-  return k +
-      ((((bootstrapValues.base - bootstrapValues.tMin) + 1) * delta) ~/
-          (delta + bootstrapValues.skew));
-}
-
-/// Converts a digit/integer into a basic code point.
-///
-/// See `basicToDigit()`
-///
-/// Args:
-///   digit: The numeric value of a basic code point.  Must be in the range
-///     `0` to `base - 1` (where `base` is presumably 36, but this function
-///     doesn't depend on that).
-///   flag: If non-zero, the uppercase form is used; else, the lowercase form
-///     is used.
-///
-/// Returns:
-///   The basic code point (an integer representing a Unicode code point)
-///   whose value (when used for representing integers) is `digit`.
-///
-/// Throws:
-///    ArgumentError: if digit is outside of the range 0-35.
-int digitToBasic(int digit, int flag) {
-  //  0..25 map to ASCII a..z or A..Z
-  // 26..35 map to ASCII 0..9
-  if (digit < 0 || digit > 35) {
-    throw ArgumentError.value(digit, 'digit', 'must be between 0 and 35');
-  }
-  if (digit < 26) {
-    // a-z or A-Z
-    if (flag != 0) {
-      return 'A'.codeUnitAt(0) + digit; // Uppercase
-    } else {
-      return 'a'.codeUnitAt(0) + digit; // Lowercase
-    }
-  } else {
-    // 0-9
-    return '0'.codeUnitAt(0) + (digit - 26);
-  }
-}
-
-/// Converts a basic code point (ASCII character) to its corresponding digit value.
-///
-/// This function maps ASCII characters representing digits (0-9) and letters (A-Z, a-z)
-/// to their corresponding integer values used in Punycode encoding.
-///
-/// Args:
-///   codePoint: The ASCII code point to convert.
-///
-/// Returns:
-///   The integer value of the code point, or `bootstrapValues.base` if the
-///   code point is not a valid basic code point.
-///   - 0-25: Represents 'a' to 'z' (or 'A' to 'Z').
-///   - 26-35: Represents '0' to '9'.
-///   - `bootstrapValues.base`: Represents an invalid code point.
-int basicToDigit(int codePoint) {
-  if (codePoint >= 0x30 && codePoint < 0x3A) {
-    return 26 + (codePoint - 0x30);
-  }
-  if (codePoint >= 0x41 && codePoint < 0x5B) {
-    return codePoint - 0x41;
-  }
-  if (codePoint >= 0x61 && codePoint < 0x7B) {
-    return codePoint - 0x61;
-  }
-  return bootstrapValues.base;
-}
-
-/// A record of handy regular expressions to use when working with Punycode
-final punycodeRegex = (
-  regexPunycode: RegExp('^xn--'),
-  regexNonASCII: RegExp(r'[^\x00-\x7F]'), // Note: U+007F DEL is excluded too.
-  regexSeparators: RegExp(r'[\x2E\u3002\uFF0E\uFF61]'), // RFC 3490 separators
-);
diff --git a/pubspec.yaml b/pubspec.yaml
index ac97aea..f2af69a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: punycoder
 description: Punycoder is a well tested Dart implementation of the RFC 3492 Punycode specification
-version: 0.1.0
+version: 0.2.0-dev
 repository: https://github.com/dropbear-software/punycoder/
 issue_tracker: https://github.com/dropbear-software/punycoder/issues
 topics:
diff --git a/test/decoder_test.dart b/test/decoder_test.dart
index af55b12..a3c5f66 100644
--- a/test/decoder_test.dart
+++ b/test/decoder_test.dart
@@ -4,30 +4,32 @@ import 'package:test/test.dart';
 void main() {
   group('PunycodeDecoder', () {
     late PunycodeCodec codec;
+    late PunycodeCodec simpleCodec;
 
     setUp(() {
       codec = PunycodeCodec();
+      simpleCodec = PunycodeCodec.simple();
     });
 
     test('multiple non-ASCII characters', () {
-      expect(codec.decoder.convert('4can8av2009b'), 'üëäö♥');
+      expect(simpleCodec.decode('4can8av2009b'), 'üëäö♥');
     });
 
     test('a single non-ASCII character', () {
-      expect(codec.decoder.convert('tda'), 'ü');
+      expect(simpleCodec.decode('tda'), 'ü');
     });
 
     test('a single basic code point', () {
-      expect(codec.decoder.convert('Bach-'), 'Bach');
+      expect(simpleCodec.decode('Bach-'), 'Bach');
     });
 
     test('mix of ASCII and non-ASCII characters', () {
-      expect(codec.decoder.convert('bcher-kva'), 'bücher');
+      expect(simpleCodec.decode('bcher-kva'), 'bücher');
     });
 
     test('long string with both ASCII and non-ASCII characters', () {
       expect(
-        codec.decoder.convert(
+        simpleCodec.decode(
           'Willst du die Blthe des frhen, die Frchte des spteren Jahres-x9e96lkal',
         ),
         'Willst du die Blüthe des frühen, die Früchte des späteren Jahres',
@@ -38,70 +40,69 @@ void main() {
     group('Official RFC examples', () {
       test('Arabic (Egyptian)', () {
         expect(
-          codec.decoder.convert('egbpdaj6bu4bxfgehfvwxn'),
+          simpleCodec.decode('egbpdaj6bu4bxfgehfvwxn'),
           'ليهمابتكلموشعربي؟',
         );
       });
 
       test('Chinese (simplified)', () {
-        expect(codec.decoder.convert('ihqwcrb4cv8a8dqg056pqjye'), '他们为什么不说中文');
+        expect(simpleCodec.decode('ihqwcrb4cv8a8dqg056pqjye'), '他们为什么不说中文');
       });
 
       test('Chinese (traditional)', () {
         expect(
-          codec.decoder.convert('ihqwctvzc91f659drss3x8bo0yb'),
+          simpleCodec.decode('ihqwctvzc91f659drss3x8bo0yb'),
           '他們爲什麽不說中文',
         );
       });
 
       test('Czech', () {
         expect(
-          codec.decoder.convert('Proprostnemluvesky-uyb24dma41a'),
+          simpleCodec.decode('Proprostnemluvesky-uyb24dma41a'),
           'Pročprostěnemluvíčesky',
         );
       });
 
       test('Hebrew', () {
         expect(
-          codec.decoder.convert('4dbcagdahymbxekheh6e0a7fei0b'),
+          simpleCodec.decode('4dbcagdahymbxekheh6e0a7fei0b'),
           'למההםפשוטלאמדבריםעברית',
         );
       });
 
       test('Hindi (Devanagari)', () {
         expect(
-          codec.decoder.convert('i1baa7eci9glrd9b2ae1bj0hfcgg6iyaf8o0a1dig0cd'),
+         simpleCodec.decode('i1baa7eci9glrd9b2ae1bj0hfcgg6iyaf8o0a1dig0cd'),
           'यहलोगहिन्दीक्योंनहींबोलसकतेहैं',
         );
       });
 
       test('Japanese (kanji and hiragana)', () {
         expect(
-          codec.decoder.convert('n8jok5ay5dzabd5bym9f0cm5685rrjetr6pdxa'),
+          simpleCodec.decode('n8jok5ay5dzabd5bym9f0cm5685rrjetr6pdxa'),
           'なぜみんな日本語を話してくれないのか',
         );
       });
 
       test('Korean (Hangul syllables)', () {
         expect(
-          codec.decoder.convert(
+          simpleCodec.decode(
             '989aomsvi5e83db1d2a355cv1e0vak1dwrv93d5xbh15a0dt30a5jpsd879ccm6fea98c',
           ),
           '세계의모든사람들이한국어를이해한다면얼마나좋을까',
         );
       });
 
-      //  https://github.com/bivens-dev/rdf_dart/issues/13
       test('Russian (Cyrillic)', () {
         expect(
-          codec.decoder.convert('b1abfaaepdrnnbgefbadotcwatmq2g4l'),
+          simpleCodec.decode('b1abfaaepdrnnbgefbadotcwatmq2g4l'),
           'почемужеонинеговорятпорусски',
         );
       });
 
       test('Spanish', () {
         expect(
-          codec.decoder.convert(
+          simpleCodec.decode(
             'PorqunopuedensimplementehablarenEspaol-fmd56a',
           ),
           'PorquénopuedensimplementehablarenEspañol',
@@ -110,56 +111,56 @@ void main() {
 
       test('Vietnamese', () {
         expect(
-          codec.decoder.convert('TisaohkhngthchnitingVit-kjcr8268qyxafd2f1b9g'),
+          simpleCodec.decode('TisaohkhngthchnitingVit-kjcr8268qyxafd2f1b9g'),
           'TạisaohọkhôngthểchỉnóitiếngViệt',
         );
       });
 
       test('3年B組金八先生', () {
         expect(
-          codec.decoder.convert('3B-ww4c5e180e575a65lsy2b'),
+          simpleCodec.decode('3B-ww4c5e180e575a65lsy2b'),
           '3\u5E74B\u7D44\u91D1\u516B\u5148\u751F',
         );
       });
 
       test('安室奈美恵-with-SUPER-MONKEYS', () {
         expect(
-          codec.decoder.convert('-with-SUPER-MONKEYS-pc58ag80a8qai00g7n9n'),
+          simpleCodec.decode('-with-SUPER-MONKEYS-pc58ag80a8qai00g7n9n'),
           '\u5B89\u5BA4\u5948\u7F8E\u6075-with-SUPER-MONKEYS',
         );
       });
 
       test('Hello-Another-Way-それぞれの場所', () {
         expect(
-          codec.decoder.convert('Hello-Another-Way--fc4qua05auwb3674vfr0b'),
+          simpleCodec.decode('Hello-Another-Way--fc4qua05auwb3674vfr0b'),
           'Hello-Another-Way-\u305D\u308C\u305E\u308C\u306E\u5834\u6240',
         );
       });
 
       test('ひとつ屋根の下2', () {
         expect(
-          codec.decoder.convert('2-u9tlzr9756bt3uc0v'),
+          simpleCodec.decode('2-u9tlzr9756bt3uc0v'),
           '\u3072\u3068\u3064\u5C4B\u6839\u306E\u4E0B2',
         );
       });
 
       test('MajiでKoiする5秒前', () {
         expect(
-          codec.decoder.convert('MajiKoi5-783gue6qz075azm5e'),
+          simpleCodec.decode('MajiKoi5-783gue6qz075azm5e'),
           'Maji\u3067Koi\u3059\u308B5\u79D2\u524D',
         );
       });
 
       test('パフィーdeルンバ', () {
         expect(
-          codec.decoder.convert('de-jg4avhby1noc0d'),
+          simpleCodec.decode('de-jg4avhby1noc0d'),
           '\u30D1\u30D5\u30A3\u30FCde\u30EB\u30F3\u30D0',
         );
       });
 
       test('そのスピードで', () {
         expect(
-          codec.decoder.convert('d9juau41awczczp'),
+          simpleCodec.decode('d9juau41awczczp'),
           '\u305D\u306E\u30B9\u30D4\u30FC\u30C9\u3067',
         );
       });
@@ -167,32 +168,32 @@ void main() {
 
     group('domains and emails', () {
       test('With IRI domain', () {
-        expect(punycodeDecoder.toUnicode('xn--maana-pta.com'), 'mañana.com');
-        expect(punycodeDecoder.toUnicode('xn--bcher-kva.com'), 'bücher.com');
-        expect(punycodeDecoder.toUnicode('xn--caf-dma.com'), 'café.com');
-        expect(punycodeDecoder.toUnicode('xn----dqo34k.com'), '☃-⌘.com');
-        expect(punycodeDecoder.toUnicode('xn----dqo34kn65z.com'), '퐀☃-⌘.com');
-        expect(punycodeDecoder.toUnicode('foo\x7F.example'), 'foo\x7F.example');
+        expect(codec.decode('xn--maana-pta.com'), 'mañana.com');
+        expect(codec.decode('xn--bcher-kva.com'), 'bücher.com');
+        expect(codec.decode('xn--caf-dma.com'), 'café.com');
+        expect(codec.decode('xn----dqo34k.com'), '☃-⌘.com');
+        expect(codec.decode('xn----dqo34kn65z.com'), '퐀☃-⌘.com');
+        expect(codec.decode('foo\x7F.example'), 'foo\x7F.example');
       });
 
       test('With non-IRI domain', () {
-        expect(punycodeDecoder.toUnicode('example.com.'), 'example.com.');
+        expect(codec.decode('example.com.'), 'example.com.');
       });
 
       test('With emoji', () {
-        expect(punycodeDecoder.toUnicode('xn--ls8h.la'), '💩.la');
+        expect(codec.decode('xn--ls8h.la'), '💩.la');
       });
 
       test('with non-printable ASCII', () {
         expect(
-          punycodeDecoder.toUnicode('0\x01\x02foo.bar'),
+          codec.decode('0\x01\x02foo.bar'),
           '0\x01\x02foo.bar',
         );
       });
 
       test('with email address', () {
         expect(
-          punycodeDecoder.toUnicode(
+          codec.decode(
             '\u0434\u0436\u0443\u043C\u043B\u0430@xn--p-8sbkgc5ag7bhce.xn--ba-lmcq',
           ),
           '\u0434\u0436\u0443\u043C\u043B\u0430@\u0434\u0436p\u0443\u043C\u043B\u0430\u0442\u0435\u0441\u0442.b\u0440\u0444a',
diff --git a/test/encoder_test.dart b/test/encoder_test.dart
index 51bae61..7825110 100644
--- a/test/encoder_test.dart
+++ b/test/encoder_test.dart
@@ -4,30 +4,32 @@ import 'package:test/test.dart';
 void main() {
   group('PunycodeEncoder', () {
     late PunycodeCodec codec;
+    late PunycodeCodec simpleCodec;
 
     setUp(() {
       codec = PunycodeCodec();
+      simpleCodec = PunycodeCodec.simple();
     });
 
     test('multiple non-ASCII characters', () {
-      expect(codec.encoder.convert('üëäö♥'), '4can8av2009b');
+      expect(simpleCodec.encode('üëäö♥'), '4can8av2009b');
     });
 
     test('a single non-ASCII character', () {
-      expect(codec.encoder.convert('ü'), 'tda');
+      expect(simpleCodec.encode('ü'), 'tda');
     });
 
     test('a single basic code point', () {
-      expect(codec.encoder.convert('Bach'), 'Bach-');
+      expect(simpleCodec.encode('Bach'), 'Bach-');
     });
 
     test('mix of ASCII and non-ASCII characters', () {
-      expect(codec.encoder.convert('bücher'), 'bcher-kva');
+      expect(simpleCodec.encode('bücher'), 'bcher-kva');
     });
 
     test('long string with both ASCII and non-ASCII characters', () {
       expect(
-        codec.encoder.convert(
+        simpleCodec.encode(
           'Willst du die Blüthe des frühen, die Früchte des späteren Jahres',
         ),
         'Willst du die Blthe des frhen, die Frchte des spteren Jahres-x9e96lkal',
@@ -38,53 +40,53 @@ void main() {
     group('Official RFC examples', () {
       test('Arabic (Egyptian)', () {
         expect(
-          codec.encoder.convert('ليهمابتكلموشعربي؟'),
+          simpleCodec.encode('ليهمابتكلموشعربي؟'),
           'egbpdaj6bu4bxfgehfvwxn',
         );
       });
 
       test('Chinese (simplified)', () {
-        expect(codec.encoder.convert('他们为什么不说中文'), 'ihqwcrb4cv8a8dqg056pqjye');
+        expect(simpleCodec.encode('他们为什么不说中文'), 'ihqwcrb4cv8a8dqg056pqjye');
       });
 
       test('Chinese (traditional)', () {
         expect(
-          codec.encoder.convert('他們爲什麽不說中文'),
+          simpleCodec.encode('他們爲什麽不說中文'),
           'ihqwctvzc91f659drss3x8bo0yb',
         );
       });
 
       test('Czech', () {
         expect(
-          codec.encoder.convert('Pročprostěnemluvíčesky'),
+          simpleCodec.encode('Pročprostěnemluvíčesky'),
           'Proprostnemluvesky-uyb24dma41a',
         );
       });
 
       test('Hebrew', () {
         expect(
-          codec.encoder.convert('למההםפשוטלאמדבריםעברית'),
+          simpleCodec.encode('למההםפשוטלאמדבריםעברית'),
           '4dbcagdahymbxekheh6e0a7fei0b',
         );
       });
 
       test('Hindi (Devanagari)', () {
         expect(
-          codec.encoder.convert('यहलोगहिन्दीक्योंनहींबोलसकतेहैं'),
+          simpleCodec.encode('यहलोगहिन्दीक्योंनहींबोलसकतेहैं'),
           'i1baa7eci9glrd9b2ae1bj0hfcgg6iyaf8o0a1dig0cd',
         );
       });
 
       test('Japanese (kanji and hiragana)', () {
         expect(
-          codec.encoder.convert('なぜみんな日本語を話してくれないのか'),
+          simpleCodec.encode('なぜみんな日本語を話してくれないのか'),
           'n8jok5ay5dzabd5bym9f0cm5685rrjetr6pdxa',
         );
       });
 
       test('Korean (Hangul syllables)', () {
         expect(
-          codec.encoder.convert('세계의모든사람들이한국어를이해한다면얼마나좋을까'),
+          simpleCodec.encode('세계의모든사람들이한국어를이해한다면얼마나좋을까'),
           '989aomsvi5e83db1d2a355cv1e0vak1dwrv93d5xbh15a0dt30a5jpsd879ccm6fea98c',
         );
       });
@@ -92,39 +94,39 @@ void main() {
       test('Russian (Cyrillic)', () {
         // https://github.com/bivens-dev/rdf_dart/issues/13
         // expect(
-        //   codec.encoder.convert('почемужеонинеговорятпорусски'),
+        //   simpleCodec.encode('почемужеонинеговорятпорусски'),
         //   'b1abfaaepdrnnbgefbaDotcwatmq2g4l',
         // );
         expect(
-          codec.encoder.convert('почемужеонинеговорятпорусски'),
+          simpleCodec.encode('почемужеонинеговорятпорусски'),
           'b1abfaaepdrnnbgefbadotcwatmq2g4l',
         );
       });
 
       test('Spanish', () {
         expect(
-          codec.encoder.convert('PorquénopuedensimplementehablarenEspañol'),
+          simpleCodec.encode('PorquénopuedensimplementehablarenEspañol'),
           'PorqunopuedensimplementehablarenEspaol-fmd56a',
         );
       });
 
       test('Vietnamese', () {
         expect(
-          codec.encoder.convert('TạisaohọkhôngthểchỉnóitiếngViệt'),
+          simpleCodec.encode('TạisaohọkhôngthểchỉnóitiếngViệt'),
           'TisaohkhngthchnitingVit-kjcr8268qyxafd2f1b9g',
         );
       });
 
       test('3年B組金八先生', () {
         expect(
-          codec.encoder.convert('3\u5E74B\u7D44\u91D1\u516B\u5148\u751F'),
+          simpleCodec.encode('3\u5E74B\u7D44\u91D1\u516B\u5148\u751F'),
           '3B-ww4c5e180e575a65lsy2b',
         );
       });
 
       test('安室奈美恵-with-SUPER-MONKEYS', () {
         expect(
-          codec.encoder.convert(
+          simpleCodec.encode(
             '\u5B89\u5BA4\u5948\u7F8E\u6075-with-SUPER-MONKEYS',
           ),
           '-with-SUPER-MONKEYS-pc58ag80a8qai00g7n9n',
@@ -133,7 +135,7 @@ void main() {
 
       test('Hello-Another-Way-それぞれの場所', () {
         expect(
-          codec.encoder.convert(
+          simpleCodec.encode(
             'Hello-Another-Way-\u305D\u308C\u305E\u308C\u306E\u5834\u6240',
           ),
           'Hello-Another-Way--fc4qua05auwb3674vfr0b',
@@ -142,28 +144,28 @@ void main() {
 
       test('ひとつ屋根の下2', () {
         expect(
-          codec.encoder.convert('\u3072\u3068\u3064\u5C4B\u6839\u306E\u4E0B2'),
+          simpleCodec.encode('\u3072\u3068\u3064\u5C4B\u6839\u306E\u4E0B2'),
           '2-u9tlzr9756bt3uc0v',
         );
       });
 
       test('MajiでKoiする5秒前', () {
         expect(
-          codec.encoder.convert('Maji\u3067Koi\u3059\u308B5\u79D2\u524D'),
+          simpleCodec.encode('Maji\u3067Koi\u3059\u308B5\u79D2\u524D'),
           'MajiKoi5-783gue6qz075azm5e',
         );
       });
 
       test('パフィーdeルンバ', () {
         expect(
-          codec.encoder.convert('\u30D1\u30D5\u30A3\u30FCde\u30EB\u30F3\u30D0'),
+          simpleCodec.encode('\u30D1\u30D5\u30A3\u30FCde\u30EB\u30F3\u30D0'),
           'de-jg4avhby1noc0d',
         );
       });
 
       test('そのスピードで', () {
         expect(
-          codec.encoder.convert('\u305D\u306E\u30B9\u30D4\u30FC\u30C9\u3067'),
+          simpleCodec.encode('\u305D\u306E\u30B9\u30D4\u30FC\u30C9\u3067'),
           'd9juau41awczczp',
         );
       });
@@ -171,35 +173,35 @@ void main() {
 
     group('domains and emails', () {
       test('With IRI domain', () {
-        expect(punycodeEncoder.toAscii('ma\xF1ana.com'), 'xn--maana-pta.com');
-        expect(punycodeEncoder.toAscii('b\xFCcher.com'), 'xn--bcher-kva.com');
-        expect(punycodeEncoder.toAscii('caf\xE9.com'), 'xn--caf-dma.com');
+        expect(codec.encode('ma\xF1ana.com'), 'xn--maana-pta.com');
+        expect(codec.encode('b\xFCcher.com'), 'xn--bcher-kva.com');
+        expect(codec.encode('caf\xE9.com'), 'xn--caf-dma.com');
         expect(
-          punycodeEncoder.toAscii('\u2603-\u2318.com'),
+          codec.encode('\u2603-\u2318.com'),
           'xn----dqo34k.com',
         );
         expect(
-          punycodeEncoder.toAscii('\uD400\u2603-\u2318.com'),
+          codec.encode('\uD400\u2603-\u2318.com'),
           'xn----dqo34kn65z.com',
         );
-        expect(punycodeEncoder.toAscii('foo\x7F.example'), 'foo\x7F.example');
+        expect(codec.encode('foo\x7F.example'), 'foo\x7F.example');
       });
 
       test('With non-IRI domain', () {
-        expect(punycodeEncoder.toAscii('example.com.'), 'example.com.');
+        expect(codec.encode('example.com.'), 'example.com.');
       });
 
       test('With emoji', () {
-        expect(punycodeEncoder.toAscii('\uD83D\uDCA9.la'), 'xn--ls8h.la');
+        expect(codec.encode('\uD83D\uDCA9.la'), 'xn--ls8h.la');
       });
 
       test('with non-printable ASCII', () {
-        expect(punycodeEncoder.toAscii('0\x01\x02foo.bar'), '0\x01\x02foo.bar');
+        expect(codec.encode('0\x01\x02foo.bar'), '0\x01\x02foo.bar');
       });
 
       test('with email address', () {
         expect(
-          punycodeEncoder.toAscii(
+          codec.encode(
             '\u0434\u0436\u0443\u043C\u043B\u0430@\u0434\u0436p\u0443\u043C\u043B\u0430\u0442\u0435\u0441\u0442.b\u0440\u0444a',
           ),
           '\u0434\u0436\u0443\u043C\u043B\u0430@xn--p-8sbkgc5ag7bhce.xn--ba-lmcq',
@@ -210,28 +212,28 @@ void main() {
     group('separators', () {
       test('Using U+002E as separator', () {
         expect(
-          punycodeEncoder.toAscii('ma\xF1ana\x2Ecom'),
+          codec.encode('ma\xF1ana\x2Ecom'),
           'xn--maana-pta.com',
         );
       });
 
       test('Using U+3002 as separator', () {
         expect(
-          punycodeEncoder.toAscii('ma\xF1ana\u3002com'),
+          codec.encode('ma\xF1ana\u3002com'),
           'xn--maana-pta.com',
         );
       });
 
       test('Using U+FF0E as separator', () {
         expect(
-          punycodeEncoder.toAscii('ma\xF1ana\uFF0Ecom'),
+          codec.encode('ma\xF1ana\uFF0Ecom'),
           'xn--maana-pta.com',
         );
       });
 
       test('Using U+FF61 as separator', () {
         expect(
-          punycodeEncoder.toAscii('ma\xF1ana\uFF61com'),
+          codec.encode('ma\xF1ana\uFF61com'),
           'xn--maana-pta.com',
         );
       });