Move infoq into its own file