Restructured a bunch. Still lots of stuff left in master, like the mailing stuff.