diff --git a/retroload-lib/src/index.ts b/retroload-lib/src/index.ts
index c1c2349..20f2139 100644
--- a/retroload-lib/src/index.ts
+++ b/retroload-lib/src/index.ts
@@ -1,13 +1,20 @@
-export {PcmRecorder} from './encoding/recorder/PcmRecorder.js';
-export {WaveRecorder} from './encoding/recorder/WaveRecorder.js';
+// General
 export {Logger} from './common/logging/Logger.js';
+export * as Exception from './common/Exceptions.js';
 export {BufferAccess} from './common/BufferAccess.js';
+export {formatPosition, type Position} from './common/Positioning.js';
+export {version} from './version.js';
+export {type Annotation} from './encoding/recorder/Annotations.js';
+
+// Encoding
+export {PcmRecorder} from './encoding/recorder/PcmRecorder.js';
+export {WaveRecorder} from './encoding/recorder/WaveRecorder.js';
 export * as AdapterManager from './encoding/AdapterManager.js';
-export * as Exception from './common/Exceptions.js';
+export {type PublicOptionDefinition} from './encoding/Options.js';
+export {type PublicAdapterDefinition} from './encoding/adapter/AdapterDefinition.js';
+
+// Decoding
 export * as DecoderManager from './decoding/DecoderManager.js';
+
+// Tokenization
 export {tokenizers as BasicTokenizers} from './tokenizing/TokenizerProvider.js';
-export {type PublicOptionDefinition} from './encoding/Options.js';
-export {formatPosition, type Position} from './common/Positioning.js';
-export {version} from './version.js';
-export type {PublicAdapterDefinition} from './encoding/adapter/AdapterDefinition.js';
-export type {Annotation} from './encoding/recorder/Annotations.js';