Move Kahuna into its own module