Reverted parts of "Refactor all OBC, libs, and NMS into versioned
packages."
Renamed "Spigot" to "Surge" in versions string.