few scaffolding fixes/keeping files in order