Final restructure