Moved files out of scaffolding dir