Task reorg 1 cleanup

ok.  at some point we should also collapse our entire schema.rb into a migration.