orbitalkiller: refactoring, moved forumla for torque to package.scala, continued collision tests