re-org'ed and deleted a bunch of old stuff