Complete restructure.