Rearranging to put kit below its dependencies