Restructured with scaffolding project