Second round of scaffold files