Added more utilities, and did a bit more re-org.