Rename and cleanup. I think we can officially call
rust-2 the true model now.