voyage : refac: Merge modules

This ecosystem sucks. Everytime I touch something random parts will break

https://github.com/dluvian/voyage/commit/fd9765b168a11f33fcc45da7c74aab5def1bdaa1