Reincorporate definitions previously moved to Pax, and rename package back to raft.