Angular modules reorg - per-file modules