refactored into Akira package