From 4785b01132f79e20bf6b57af529e541b4a549d85 Mon Sep 17 00:00:00 2001
From: Jennifer Taylor <dragonminded@dragonminded.com>
Date: Sun, 30 May 2021 04:16:08 +0000
Subject: [PATCH] Juggle around some imports a little bit after the massive
 refactor.

---
 bemani/format/afp/__init__.py        | 3 +++
 bemani/format/afp/blend/blendcpp.pyx | 2 +-
 bemani/tests/test_afp_decompile.py   | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bemani/format/afp/__init__.py b/bemani/format/afp/__init__.py
index 43b21f0..449872b 100644
--- a/bemani/format/afp/__init__.py
+++ b/bemani/format/afp/__init__.py
@@ -21,6 +21,7 @@ from .swf import (
 from .container import TXP2File, PMAN, Texture, TextureRegion, Unknown1, Unknown2
 from .render import AFPRenderer
 from .types import Matrix, Color, Point, Rectangle, AP2Tag, AP2Action, AP2Object, AP2Pointer
+from .decompile import ByteCode, ByteCodeDecompiler
 
 
 __all__ = [
@@ -58,4 +59,6 @@ __all__ = [
     'AP2Action',
     'AP2Object',
     'AP2Pointer',
+    'ByteCode',
+    'ByteCodeDecompiler',
 ]
diff --git a/bemani/format/afp/blend/blendcpp.pyx b/bemani/format/afp/blend/blendcpp.pyx
index 5d60005..3c7525d 100644
--- a/bemani/format/afp/blend/blendcpp.pyx
+++ b/bemani/format/afp/blend/blendcpp.pyx
@@ -2,7 +2,7 @@ import multiprocessing
 from PIL import Image  # type: ignore
 from typing import Optional, Tuple
 
-from ..types.generic import Color, Matrix, Point
+from ..types import Color, Matrix, Point
 
 cdef extern struct floatcolor_t:
     float r;
diff --git a/bemani/tests/test_afp_decompile.py b/bemani/tests/test_afp_decompile.py
index 2e18554..48fce06 100644
--- a/bemani/tests/test_afp_decompile.py
+++ b/bemani/tests/test_afp_decompile.py
@@ -4,8 +4,8 @@ import unittest
 from typing import Dict, List, Sequence, Tuple, Union
 
 from bemani.tests.helpers import ExtendedTestCase
-from bemani.format.afp.types.ap2 import AP2Action, IfAction, JumpAction, PushAction, AddNumVariableAction, Register
-from bemani.format.afp.decompile import BitVector, ByteCode, ByteCodeChunk, ControlFlow, ByteCodeDecompiler, Statement
+from bemani.format.afp.decompile import ByteCodeDecompiler, ByteCode, BitVector, ByteCodeChunk, ControlFlow
+from bemani.format.afp.types import AP2Action, IfAction, JumpAction, PushAction, AddNumVariableAction, Register, Statement
 
 
 OPEN_BRACKET = "{"