move more stuff back out of the Jamroot