settings restructure