Complete  restructure