Use new scaffolding and grunt files