D3/Shruthi | #1604 | Removed modules for controllers/services.