Task reorg 1 cleanup

Hah honestly until we deploy you can just skip these extra migrations and modify the original create_resources. I don't mind dropping the database from time to time.