diff --git a/packages/flame_jenny/jenny/lib/jenny.dart b/packages/flame_jenny/jenny/lib/jenny.dart
index 4d18f0d96..9227e781c 100644
--- a/packages/flame_jenny/jenny/lib/jenny.dart
+++ b/packages/flame_jenny/jenny/lib/jenny.dart
@@ -1,10 +1,15 @@
+export 'src/command_storage.dart' show CommandStorage;
 export 'src/dialogue_runner.dart' show DialogueRunner;
 export 'src/dialogue_view.dart' show DialogueView;
 export 'src/errors.dart' show SyntaxError, NameError, TypeError, DialogueError;
+export 'src/function_storage.dart' show FunctionStorage;
+export 'src/localization.dart' show Localization, localizationInfo;
+export 'src/structure/commands/user_defined_command.dart'
+    show UserDefinedCommand;
 export 'src/structure/dialogue_choice.dart' show DialogueChoice;
 export 'src/structure/dialogue_line.dart' show DialogueLine;
 export 'src/structure/dialogue_option.dart' show DialogueOption;
-export 'src/structure/expressions/expression.dart' show ExpressionType;
+export 'src/structure/markup_attribute.dart' show MarkupAttribute;
 export 'src/structure/node.dart' show Node;
 export 'src/variable_storage.dart' show VariableStorage;
 export 'src/yarn_project.dart' show YarnProject;
diff --git a/packages/flame_jenny/jenny/lib/src/command_storage.dart b/packages/flame_jenny/jenny/lib/src/command_storage.dart
index e010b9c9e..38a38ad0c 100644
--- a/packages/flame_jenny/jenny/lib/src/command_storage.dart
+++ b/packages/flame_jenny/jenny/lib/src/command_storage.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 
 import 'package:jenny/jenny.dart';
 import 'package:jenny/src/parse/ascii.dart';
-import 'package:jenny/src/structure/commands/user_defined_command.dart';
 import 'package:meta/meta.dart';
 
 /// [CommandStorage] is the repository of user-defined commands known to the
diff --git a/packages/flame_jenny/jenny/lib/src/structure/dialogue_line.dart b/packages/flame_jenny/jenny/lib/src/structure/dialogue_line.dart
index 5026c5f29..e21659353 100644
--- a/packages/flame_jenny/jenny/lib/src/structure/dialogue_line.dart
+++ b/packages/flame_jenny/jenny/lib/src/structure/dialogue_line.dart
@@ -1,8 +1,6 @@
 import 'package:jenny/jenny.dart';
-import 'package:jenny/src/dialogue_runner.dart';
 import 'package:jenny/src/structure/dialogue_entry.dart';
 import 'package:jenny/src/structure/line_content.dart';
-import 'package:jenny/src/structure/markup_attribute.dart';
 
 /// [DialogueLine] is a single line of "normal" text within the dialogue.
 ///
diff --git a/packages/flame_jenny/jenny/test/dialogue_view_test.dart b/packages/flame_jenny/jenny/test/dialogue_view_test.dart
index f6889cd43..dfd559a52 100644
--- a/packages/flame_jenny/jenny/test/dialogue_view_test.dart
+++ b/packages/flame_jenny/jenny/test/dialogue_view_test.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:jenny/jenny.dart';
-import 'package:jenny/src/structure/commands/user_defined_command.dart';
 import 'package:test/test.dart';
 
 import 'test_scenario.dart';
diff --git a/packages/flame_jenny/jenny/test/function_storage_test.dart b/packages/flame_jenny/jenny/test/function_storage_test.dart
index 17da32a78..993c5b8a1 100644
--- a/packages/flame_jenny/jenny/test/function_storage_test.dart
+++ b/packages/flame_jenny/jenny/test/function_storage_test.dart
@@ -1,5 +1,4 @@
 import 'package:jenny/jenny.dart';
-import 'package:jenny/src/function_storage.dart';
 import 'package:test/test.dart';
 
 import 'test_scenario.dart';
diff --git a/packages/flame_jenny/jenny/test/structure/commands/declare_command_test.dart b/packages/flame_jenny/jenny/test/structure/commands/declare_command_test.dart
index 4ed5c43e9..dbbc317dd 100644
--- a/packages/flame_jenny/jenny/test/structure/commands/declare_command_test.dart
+++ b/packages/flame_jenny/jenny/test/structure/commands/declare_command_test.dart
@@ -2,6 +2,7 @@ import 'package:jenny/jenny.dart';
 import 'package:jenny/src/parse/token.dart';
 import 'package:jenny/src/parse/tokenize.dart';
 import 'package:jenny/src/structure/commands/declare_command.dart';
+import 'package:jenny/src/structure/expressions/expression.dart';
 import 'package:test/test.dart';
 
 import '../../utils.dart';
diff --git a/packages/flame_jenny/jenny/test/structure/commands/user_defined_command_test.dart b/packages/flame_jenny/jenny/test/structure/commands/user_defined_command_test.dart
index 8edb93ffc..3cc04f9ff 100644
--- a/packages/flame_jenny/jenny/test/structure/commands/user_defined_command_test.dart
+++ b/packages/flame_jenny/jenny/test/structure/commands/user_defined_command_test.dart
@@ -1,7 +1,6 @@
 import 'package:jenny/jenny.dart';
 import 'package:jenny/src/parse/token.dart';
 import 'package:jenny/src/parse/tokenize.dart';
-import 'package:jenny/src/structure/commands/user_defined_command.dart';
 import 'package:test/test.dart';
 
 import '../../test_scenario.dart';
diff --git a/packages/flame_jenny/jenny/test/structure/dialogue_line_test.dart b/packages/flame_jenny/jenny/test/structure/dialogue_line_test.dart
index d4a16135c..2b1e190a7 100644
--- a/packages/flame_jenny/jenny/test/structure/dialogue_line_test.dart
+++ b/packages/flame_jenny/jenny/test/structure/dialogue_line_test.dart
@@ -1,6 +1,5 @@
 import 'package:jenny/jenny.dart';
 import 'package:jenny/src/structure/line_content.dart';
-import 'package:jenny/src/structure/markup_attribute.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/packages/flame_jenny/jenny/test/test_scenario.dart b/packages/flame_jenny/jenny/test/test_scenario.dart
index acbd91a7b..959222040 100644
--- a/packages/flame_jenny/jenny/test/test_scenario.dart
+++ b/packages/flame_jenny/jenny/test/test_scenario.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:jenny/jenny.dart';
-import 'package:jenny/src/structure/commands/user_defined_command.dart';
 import 'package:meta/meta.dart';
 import 'package:test/test.dart';
 
diff --git a/packages/flame_jenny/jenny/test/variable_storage_test.dart b/packages/flame_jenny/jenny/test/variable_storage_test.dart
index e22a01e1e..aa744116f 100644
--- a/packages/flame_jenny/jenny/test/variable_storage_test.dart
+++ b/packages/flame_jenny/jenny/test/variable_storage_test.dart
@@ -1,4 +1,5 @@
 import 'package:jenny/jenny.dart';
+import 'package:jenny/src/structure/expressions/expression.dart';
 import 'package:test/test.dart';
 
 import 'utils.dart';