Torpedo and Torpedo-controllers are added to the master branch.