Update & restructure system