D3/Shruthi | #1604 | Restructured files within app framework