System nutupane: reorganize angular functionality into modules.