This removes the need for another repository. Furthermore I'll integrate the setup a bit more for hikari.