Added more scaffolding and fixed some paths