restructure aliases