diff --git a/lib/src/otf/otf.dart b/lib/src/otf/otf.dart
index a59cdef..40410e5 100644
--- a/lib/src/otf/otf.dart
+++ b/lib/src/otf/otf.dart
@@ -5,9 +5,22 @@ import 'package:icon_font/src/common/binary_codable.dart';
 import 'package:icon_font/src/common/calculatable_offsets.dart';
 import 'package:icon_font/src/common/generic_glyph.dart';
 import 'package:icon_font/src/common/outline.dart';
-import 'package:icon_font/src/otf/table/all.dart';
+import 'package:icon_font/src/otf/table/abstract.dart';
 import 'package:icon_font/src/otf/table/cff1.dart';
 import 'package:icon_font/src/otf/table/cff2.dart';
+import 'package:icon_font/src/otf/table/cmap.dart';
+import 'package:icon_font/src/otf/table/glyf.dart';
+import 'package:icon_font/src/otf/table/gsub.dart';
+import 'package:icon_font/src/otf/table/head.dart';
+import 'package:icon_font/src/otf/table/hhea.dart';
+import 'package:icon_font/src/otf/table/hmtx.dart';
+import 'package:icon_font/src/otf/table/loca.dart';
+import 'package:icon_font/src/otf/table/maxp.dart';
+import 'package:icon_font/src/otf/table/name.dart';
+import 'package:icon_font/src/otf/table/offset.dart';
+import 'package:icon_font/src/otf/table/os2.dart';
+import 'package:icon_font/src/otf/table/post.dart';
+import 'package:icon_font/src/otf/table/table_record_entry.dart';
 import 'package:icon_font/src/utils/constants.dart';
 import 'package:icon_font/src/utils/exceptions.dart';
 import 'package:icon_font/src/utils/extensions.dart';
diff --git a/lib/src/otf/reader.dart b/lib/src/otf/reader.dart
index 5679e1a..3f99881 100644
--- a/lib/src/otf/reader.dart
+++ b/lib/src/otf/reader.dart
@@ -1,7 +1,21 @@
 import 'dart:typed_data';
 
 import 'package:icon_font/src/otf/otf.dart';
-import 'package:icon_font/src/otf/table/all.dart';
+import 'package:icon_font/src/otf/table/abstract.dart';
+import 'package:icon_font/src/otf/table/cff.dart';
+import 'package:icon_font/src/otf/table/cmap.dart';
+import 'package:icon_font/src/otf/table/glyf.dart';
+import 'package:icon_font/src/otf/table/gsub.dart';
+import 'package:icon_font/src/otf/table/head.dart';
+import 'package:icon_font/src/otf/table/hhea.dart';
+import 'package:icon_font/src/otf/table/hmtx.dart';
+import 'package:icon_font/src/otf/table/loca.dart';
+import 'package:icon_font/src/otf/table/maxp.dart';
+import 'package:icon_font/src/otf/table/name.dart';
+import 'package:icon_font/src/otf/table/offset.dart';
+import 'package:icon_font/src/otf/table/os2.dart';
+import 'package:icon_font/src/otf/table/post.dart';
+import 'package:icon_font/src/otf/table/table_record_entry.dart';
 import 'package:icon_font/src/utils/constants.dart';
 import 'package:icon_font/src/utils/exceptions.dart';
 import 'package:icon_font/src/utils/logger.dart';
diff --git a/lib/src/otf/table/all.dart b/lib/src/otf/table/all.dart
deleted file mode 100644
index 5f4efe5..0000000
--- a/lib/src/otf/table/all.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-export 'abstract.dart';
-export 'cff.dart';
-export 'cmap.dart';
-export 'coverage.dart';
-export 'feature_list.dart';
-export 'glyf.dart';
-export 'gsub.dart';
-export 'head.dart';
-export 'hhea.dart';
-export 'hmtx.dart';
-export 'language_system.dart';
-export 'loca.dart';
-export 'lookup.dart';
-export 'maxp.dart';
-export 'name.dart';
-export 'offset.dart';
-export 'os2.dart';
-export 'post.dart';
-export 'script_list.dart';
-export 'table_record_entry.dart';
diff --git a/lib/src/otf/table/head.dart b/lib/src/otf/table/head.dart
index 698bc2d..c74b28b 100644
--- a/lib/src/otf/table/head.dart
+++ b/lib/src/otf/table/head.dart
@@ -2,7 +2,9 @@ import 'dart:math' as math;
 import 'dart:typed_data';
 
 import 'package:icon_font/src/common/generic_glyph.dart';
-import 'package:icon_font/src/otf/table/all.dart';
+import 'package:icon_font/src/otf/table/abstract.dart';
+import 'package:icon_font/src/otf/table/glyf.dart';
+import 'package:icon_font/src/otf/table/table_record_entry.dart';
 import 'package:icon_font/src/utils/constants.dart';
 import 'package:icon_font/src/utils/otf_utils.dart';