Gurpreet, D3 | #1604 | Moved granular services to domain package