Move Torch to chaos makefile