New Scaffolds, rearrange db migrations