Gurpreet, D3 | #1604 | Moved files to ui-helper module