Feature/re scaffold