Add initial scaffolding