Task reorg 1 cleanup

I believe that @philschatz prefers a more flat representation of these fields.  Also I think this way we'll get away with not ever showing the `Resource` model in the API (it really is just useful from the DB perspective)