reorganize modules, update angular