Cleaning up Terra, moved some stuff out to Cachet, Pool, and Expansion.