restructure + corrections - requires packaging