complete restructure of software