scaffold restructure