Internal restructure