Readded Project scaffolding